diff options
Diffstat (limited to 'boost/python')
| -rw-r--r-- | boost/python/detail/config.hpp | 4 | ||||
| -rw-r--r-- | boost/python/extract.hpp | 1 | ||||
| -rw-r--r-- | boost/python/instance_holder.hpp | 2 | ||||
| -rw-r--r-- | boost/python/module_init.hpp | 2 | ||||
| -rw-r--r-- | boost/python/object/class.hpp | 1 | ||||
| -rw-r--r-- | boost/python/object_core.hpp | 12 | ||||
| -rw-r--r-- | boost/python/scope.hpp | 1 |
7 files changed, 10 insertions, 13 deletions
diff --git a/boost/python/detail/config.hpp b/boost/python/detail/config.hpp index acafc03747..76595ebbfc 100644 --- a/boost/python/detail/config.hpp +++ b/boost/python/detail/config.hpp @@ -76,13 +76,13 @@ # if BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY # if defined(BOOST_PYTHON_SOURCE) -# define BOOST_PYTHON_DECL __attribute__ ((visibility("default"))) +# define BOOST_PYTHON_DECL __attribute__ ((__visibility__("default"))) # define BOOST_PYTHON_BUILD_DLL # else # define BOOST_PYTHON_DECL # endif # define BOOST_PYTHON_DECL_FORWARD -# define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((visibility("default"))) +# define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default"))) # elif (defined(_WIN32) || defined(__CYGWIN__)) # if defined(BOOST_PYTHON_SOURCE) # define BOOST_PYTHON_DECL __declspec(dllexport) diff --git a/boost/python/extract.hpp b/boost/python/extract.hpp index 4e876f5009..544c61f070 100644 --- a/boost/python/extract.hpp +++ b/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/boost/python/instance_holder.hpp b/boost/python/instance_holder.hpp index 0916348ef6..933f50d1a1 100644 --- a/boost/python/instance_holder.hpp +++ b/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/boost/python/module_init.hpp b/boost/python/module_init.hpp index 54d87e4b41..a9536c88ee 100644 --- a/boost/python/module_init.hpp +++ b/boost/python/module_init.hpp @@ -76,7 +76,7 @@ extern "C" __declspec(dllexport) _BOOST_PYTHON_MODULE_INIT(name) # define BOOST_PYTHON_MODULE_INIT(name) \ void BOOST_PP_CAT(init_module_,name)(); \ -extern "C" __attribute__ ((visibility("default"))) _BOOST_PYTHON_MODULE_INIT(name) +extern "C" __attribute__ ((__visibility__("default"))) _BOOST_PYTHON_MODULE_INIT(name) # else diff --git a/boost/python/object/class.hpp b/boost/python/object/class.hpp index 6aad45e786..f57ceda7bd 100644 --- a/boost/python/object/class.hpp +++ b/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/boost/python/object_core.hpp b/boost/python/object_core.hpp index 4d81e2eae8..9c9dc10bfc 100644 --- a/boost/python/object_core.hpp +++ b/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/boost/python/scope.hpp b/boost/python/scope.hpp index ae9a40a383..8be3e054e0 100644 --- a/boost/python/scope.hpp +++ b/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 { |