diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/python/converter | |
parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/python/converter')
-rw-r--r-- | boost/python/converter/arg_from_python.hpp | 5 | ||||
-rwxr-xr-x | boost/python/converter/arg_to_python.hpp | 12 | ||||
-rw-r--r-- | boost/python/converter/object_manager.hpp | 2 | ||||
-rw-r--r-- | boost/python/converter/pointer_type_id.hpp | 4 | ||||
-rwxr-xr-x | boost/python/converter/pytype_function.hpp | 9 | ||||
-rw-r--r-- | boost/python/converter/registered.hpp | 8 | ||||
-rw-r--r-- | boost/python/converter/registered_pointee.hpp | 9 | ||||
-rwxr-xr-x | boost/python/converter/return_from_python.hpp | 2 | ||||
-rw-r--r-- | boost/python/converter/rvalue_from_python_data.hpp | 8 |
9 files changed, 26 insertions, 33 deletions
diff --git a/boost/python/converter/arg_from_python.hpp b/boost/python/converter/arg_from_python.hpp index 61bbaad570..0c0daabc1f 100644 --- a/boost/python/converter/arg_from_python.hpp +++ b/boost/python/converter/arg_from_python.hpp @@ -8,8 +8,7 @@ # include <boost/python/detail/prefix.hpp> # include <boost/python/converter/from_python.hpp> # include <boost/python/detail/indirect_traits.hpp> -# include <boost/type_traits/transform_traits.hpp> -# include <boost/type_traits/cv_traits.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/python/converter/rvalue_from_python_data.hpp> # include <boost/mpl/eval_if.hpp> # include <boost/mpl/if.hpp> @@ -106,7 +105,7 @@ struct reference_arg_from_python : arg_lvalue_from_python_base template <class T> struct arg_rvalue_from_python { - typedef typename boost::add_reference< + typedef typename boost::python::detail::add_lvalue_reference< T // We can't add_const here, or it would be impossible to pass // auto_ptr<U> args from Python to C++ diff --git a/boost/python/converter/arg_to_python.hpp b/boost/python/converter/arg_to_python.hpp index 3a19ec4395..bbecae72e5 100755 --- a/boost/python/converter/arg_to_python.hpp +++ b/boost/python/converter/arg_to_python.hpp @@ -24,11 +24,7 @@ # include <boost/python/detail/convertible.hpp> # include <boost/python/detail/string_literal.hpp> # include <boost/python/detail/value_is_shared_ptr.hpp> - -# include <boost/type_traits/cv_traits.hpp> -# include <boost/type_traits/composite_traits.hpp> -# include <boost/type_traits/function_traits.hpp> - +# include <boost/python/detail/type_traits.hpp> # include <boost/mpl/or.hpp> @@ -116,9 +112,9 @@ namespace detail , typename mpl::if_< mpl::or_< - is_function<T> + boost::python::detail::is_function<T> , indirect_traits::is_pointer_to_function<T> - , is_member_function_pointer<T> + , boost::python::detail::is_member_function_pointer<T> > , function_arg_to_python<T> @@ -127,7 +123,7 @@ namespace detail , object_manager_arg_to_python<T> , typename mpl::if_< - is_pointer<T> + boost::python::detail::is_pointer<T> , pointer_deep_arg_to_python<T> , typename mpl::if_< diff --git a/boost/python/converter/object_manager.hpp b/boost/python/converter/object_manager.hpp index 4668245545..b2271a7ea2 100644 --- a/boost/python/converter/object_manager.hpp +++ b/boost/python/converter/object_manager.hpp @@ -8,7 +8,7 @@ # include <boost/python/handle.hpp> # include <boost/python/cast.hpp> # include <boost/python/converter/pyobject_traits.hpp> -# include <boost/type_traits/object_traits.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/mpl/if.hpp> # include <boost/python/detail/indirect_traits.hpp> # include <boost/mpl/bool.hpp> diff --git a/boost/python/converter/pointer_type_id.hpp b/boost/python/converter/pointer_type_id.hpp index 963f58f717..49eeda42cb 100644 --- a/boost/python/converter/pointer_type_id.hpp +++ b/boost/python/converter/pointer_type_id.hpp @@ -6,7 +6,7 @@ # define POINTER_TYPE_ID_DWA2002222_HPP # include <boost/python/type_id.hpp> -# include <boost/type_traits/composite_traits.hpp> +# include <boost/python/detail/type_traits.hpp> namespace boost { namespace python { namespace converter { @@ -59,7 +59,7 @@ template <class T> type_info pointer_type_id(T(*)() = 0) { return detail::pointer_typeid_select< - is_reference<T>::value + boost::python::detail::is_lvalue_reference<T>::value >::execute((T(*)())0); } diff --git a/boost/python/converter/pytype_function.hpp b/boost/python/converter/pytype_function.hpp index 95d0f66d46..8e0a4e7995 100755 --- a/boost/python/converter/pytype_function.hpp +++ b/boost/python/converter/pytype_function.hpp @@ -8,6 +8,7 @@ # include <boost/python/detail/prefix.hpp> # include <boost/python/converter/registered.hpp> # include <boost/python/detail/unwind_type.hpp> +# include <boost/python/detail/type_traits.hpp> namespace boost { namespace python { @@ -53,7 +54,7 @@ inline python::type_info unwind_type_id_(boost::type<void>* = 0, mpl::true_* =0) template <class T> inline python::type_info unwind_type_id(boost::type<T>* p= 0) { - return unwind_type_id_(p, (mpl::bool_<boost::is_void<T>::value >*)0 ); + return unwind_type_id_(p, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 ); } } @@ -64,7 +65,7 @@ struct expected_pytype_for_arg static PyTypeObject const *get_pytype() { const converter::registration *r=converter::registry::query( - detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::is_void<T>::value >*)0 ) + detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 ) ); return r ? r->expected_from_python_type(): 0; } @@ -77,7 +78,7 @@ struct registered_pytype static PyTypeObject const *get_pytype() { const converter::registration *r=converter::registry::query( - detail::unwind_type_id_((boost::type<T>*) 0, (mpl::bool_<boost::is_void<T>::value >*)0 ) + detail::unwind_type_id_((boost::type<T>*) 0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 ) ); return r ? r->m_class_object: 0; } @@ -111,7 +112,7 @@ struct to_python_target_type static PyTypeObject const *get_pytype() { const converter::registration *r=converter::registry::query( - detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::is_void<T>::value >*)0 ) + detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 ) ); return r ? r->to_python_target_type(): 0; } diff --git a/boost/python/converter/registered.hpp b/boost/python/converter/registered.hpp index a622250dca..73f4d98466 100644 --- a/boost/python/converter/registered.hpp +++ b/boost/python/converter/registered.hpp @@ -10,9 +10,7 @@ #include <boost/python/type_id.hpp> #include <boost/python/converter/registry.hpp> #include <boost/python/converter/registrations.hpp> -#include <boost/type_traits/transform_traits.hpp> -#include <boost/type_traits/cv_traits.hpp> -#include <boost/type_traits/is_void.hpp> +#include <boost/python/detail/type_traits.hpp> #include <boost/detail/workaround.hpp> #include <boost/type.hpp> #include <memory> @@ -44,8 +42,8 @@ namespace detail template <class T> struct registered : detail::registered_base< - typename add_reference< - typename add_cv<T>::type + typename boost::python::detail::add_lvalue_reference< + typename boost::python::detail::add_cv<T>::type >::type > { diff --git a/boost/python/converter/registered_pointee.hpp b/boost/python/converter/registered_pointee.hpp index 974cb6d810..28b2988c7f 100644 --- a/boost/python/converter/registered_pointee.hpp +++ b/boost/python/converter/registered_pointee.hpp @@ -7,8 +7,7 @@ # include <boost/python/converter/registered.hpp> # include <boost/python/converter/pointer_type_id.hpp> # include <boost/python/converter/registry.hpp> -# include <boost/type_traits/transform_traits.hpp> -# include <boost/type_traits/cv_traits.hpp> +# include <boost/python/detail/type_traits.hpp> namespace boost { namespace python { namespace converter { @@ -17,9 +16,9 @@ struct registration; template <class T> struct registered_pointee : registered< - typename remove_pointer< - typename remove_cv< - typename remove_reference<T>::type + typename boost::python::detail::remove_pointer< + typename boost::python::detail::remove_cv< + typename boost::python::detail::remove_reference<T>::type >::type >::type > diff --git a/boost/python/converter/return_from_python.hpp b/boost/python/converter/return_from_python.hpp index 5db9748545..a995a2905a 100755 --- a/boost/python/converter/return_from_python.hpp +++ b/boost/python/converter/return_from_python.hpp @@ -14,7 +14,7 @@ # include <boost/python/detail/void_return.hpp> # include <boost/python/errors.hpp> # include <boost/python/handle.hpp> -# include <boost/type_traits/has_trivial_copy.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/mpl/and.hpp> # include <boost/mpl/bool.hpp> diff --git a/boost/python/converter/rvalue_from_python_data.hpp b/boost/python/converter/rvalue_from_python_data.hpp index 471a5255b6..acb38f8498 100644 --- a/boost/python/converter/rvalue_from_python_data.hpp +++ b/boost/python/converter/rvalue_from_python_data.hpp @@ -8,9 +8,8 @@ # include <boost/python/converter/constructor_function.hpp> # include <boost/python/detail/referent_storage.hpp> # include <boost/python/detail/destroy.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/static_assert.hpp> -# include <boost/type_traits/add_reference.hpp> -# include <boost/type_traits/add_cv.hpp> # include <cstddef> // Data management for potential rvalue conversions from Python to C++ @@ -78,7 +77,7 @@ struct rvalue_from_python_storage // Storage for the result, in case an rvalue must be constructed typename python::detail::referent_storage< - typename add_reference<T>::type + typename boost::python::detail::add_lvalue_reference<T>::type >::type storage; }; @@ -110,7 +109,8 @@ struct rvalue_from_python_data : rvalue_from_python_storage<T> // Destroys any object constructed in the storage. ~rvalue_from_python_data(); private: - typedef typename add_reference<typename add_cv<T>::type>::type ref_type; + typedef typename boost::python::detail::add_lvalue_reference< + typename boost::python::detail::add_cv<T>::type>::type ref_type; }; // |