From 0b8b88abc701febcf2540069b3dce045a4087231 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@yahoo.com>
Date: Tue, 19 Jun 2012 20:01:25 +0000
Subject: [PATCH] merging current boost/python and libs/python from trunk into
 release branch

[SVN r79011]
---
 include/boost/python/extract.hpp         |  1 -
 include/boost/python/instance_holder.hpp |  2 +-
 include/boost/python/object/class.hpp    |  1 -
 include/boost/python/object_core.hpp     | 12 ++++++------
 include/boost/python/scope.hpp           |  1 -
 5 files changed, 7 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 include/boost/python/instance_holder.hpp

diff --git a/include/boost/python/extract.hpp b/include/boost/python/extract.hpp
index 4e876f50..544c61f0 100644
--- a/include/boost/python/extract.hpp
+++ b/include/boost/python/extract.hpp
@@ -19,7 +19,6 @@
 # include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
 # include <boost/python/detail/void_ptr.hpp>
 # include <boost/python/detail/void_return.hpp>
-# include <boost/utility.hpp>
 # include <boost/call_traits.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(BOOST_INTEL_WIN, <= 900)
diff --git a/include/boost/python/instance_holder.hpp b/include/boost/python/instance_holder.hpp
old mode 100755
new mode 100644
index 0916348e..933f50d1
--- a/include/boost/python/instance_holder.hpp
+++ b/include/boost/python/instance_holder.hpp
@@ -7,7 +7,7 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/utility.hpp>
+# include <boost/noncopyable.hpp>
 # include <boost/python/type_id.hpp>
 # include <cstddef>
 
diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
index 6aad45e7..f57ceda7 100644
--- a/include/boost/python/object/class.hpp
+++ b/include/boost/python/object/class.hpp
@@ -6,7 +6,6 @@
 # define CLASS_DWA20011214_HPP
 
 # include <boost/python/detail/prefix.hpp>
-# include <boost/utility.hpp>
 # include <boost/python/object_core.hpp>
 # include <boost/python/type_id.hpp>
 # include <cstddef>
diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp
index 4d81e2ea..9c9dc10b 100644
--- a/include/boost/python/object_core.hpp
+++ b/include/boost/python/object_core.hpp
@@ -348,12 +348,12 @@ namespace api
   // Macros for forwarding constructors in classes derived from
   // object. Derived classes will usually want these as an
   // implementation detail
-# define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)       \
-    inline explicit derived(python::detail::borrowed_reference p)       \
-        : base(p) {}                                                    \
-    inline explicit derived(python::detail::new_reference p)            \
-        : base(p) {}                                                    \
-    inline explicit derived(python::detail::new_non_null_reference p)   \
+# define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)              \
+    inline explicit derived(::boost::python::detail::borrowed_reference p)     \
+        : base(p) {}                                                           \
+    inline explicit derived(::boost::python::detail::new_reference p)          \
+        : base(p) {}                                                           \
+    inline explicit derived(::boost::python::detail::new_non_null_reference p) \
         : base(p) {}
 
 # if !defined(BOOST_MSVC) || BOOST_MSVC >= 1300
diff --git a/include/boost/python/scope.hpp b/include/boost/python/scope.hpp
index ae9a40a3..8be3e054 100644
--- a/include/boost/python/scope.hpp
+++ b/include/boost/python/scope.hpp
@@ -8,7 +8,6 @@
 # include <boost/python/detail/prefix.hpp>
 # include <boost/python/object.hpp>
 # include <boost/python/refcount.hpp>
-# include <boost/utility.hpp>
 
 namespace boost { namespace python {