Changeset 79011


Ignore:
Timestamp:
Jun 19, 2012, 8:01:25 PM (6 years ago)
Author:
Ralf W. Grosse-Kunstleve
Message:

merging current boost/python and libs/python from trunk into release branch

Location:
branches/release
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/release/boost/python

  • branches/release/boost/python/extract.hpp

    r30601 r79011  
    2020# include <boost/python/detail/void_ptr.hpp>
    2121# include <boost/python/detail/void_return.hpp>
    22 # include <boost/utility.hpp>
    2322# include <boost/call_traits.hpp>
    2423
  • branches/release/boost/python/instance_holder.hpp

    r43798 r79011  
    88# include <boost/python/detail/prefix.hpp>
    99
    10 # include <boost/utility.hpp>
     10# include <boost/noncopyable.hpp>
    1111# include <boost/python/type_id.hpp>
    1212# include <cstddef>
  • branches/release/boost/python/object/class.hpp

    r26814 r79011  
    77
    88# include <boost/python/detail/prefix.hpp>
    9 # include <boost/utility.hpp>
    109# include <boost/python/object_core.hpp>
    1110# include <boost/python/type_id.hpp>
  • branches/release/boost/python/object_core.hpp

    r61033 r79011  
    349349  // object. Derived classes will usually want these as an
    350350  // implementation detail
    351 # define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)       \
    352     inline explicit derived(python::detail::borrowed_reference p)       \
    353         : base(p) {}                                                    \
    354     inline explicit derived(python::detail::new_reference p)            \
    355         : base(p) {}                                                    \
    356     inline explicit derived(python::detail::new_non_null_reference p)  \
     351# define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)              \
     352    inline explicit derived(::boost::python::detail::borrowed_reference p)     \
     353        : base(p) {}                                                           \
     354    inline explicit derived(::boost::python::detail::new_reference p)          \
     355        : base(p) {}                                                           \
     356    inline explicit derived(::boost::python::detail::new_non_null_reference p) \
    357357        : base(p) {}
    358358
  • branches/release/boost/python/scope.hpp

    r24055 r79011  
    99# include <boost/python/object.hpp>
    1010# include <boost/python/refcount.hpp>
    11 # include <boost/utility.hpp>
    1211
    1312namespace boost { namespace python {
  • branches/release/libs/python

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.