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/object/forward.hpp | |
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/object/forward.hpp')
-rw-r--r-- | boost/python/object/forward.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/boost/python/object/forward.hpp b/boost/python/object/forward.hpp index 30613d8ebd..c6515bb55b 100644 --- a/boost/python/object/forward.hpp +++ b/boost/python/object/forward.hpp @@ -6,11 +6,9 @@ # define FORWARD_DWA20011215_HPP # include <boost/mpl/if.hpp> -# include <boost/type_traits/is_scalar.hpp> -# include <boost/type_traits/add_const.hpp> -# include <boost/type_traits/add_reference.hpp> # include <boost/ref.hpp> # include <boost/python/detail/value_arg.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/python/detail/copy_ctor_mutates_rhs.hpp> # include <boost/mpl/or.hpp> @@ -22,7 +20,8 @@ namespace boost { namespace python { namespace objects { template <class T> struct reference_to_value { - typedef typename add_reference<typename add_const<T>::type>::type reference; + typedef typename boost::python::detail::add_lvalue_reference<typename + boost::python::detail::add_const<T>::type>::type reference; reference_to_value(reference x) : m_value(x) {} reference get() const { return m_value; } @@ -36,7 +35,7 @@ struct reference_to_value template <class T> struct forward : mpl::if_< - mpl::or_<python::detail::copy_ctor_mutates_rhs<T>, is_scalar<T> > + mpl::or_<python::detail::copy_ctor_mutates_rhs<T>, boost::python::detail::is_scalar<T> > , T , reference_to_value<T> > @@ -65,7 +64,7 @@ struct unforward_cref template<typename T> struct unforward_cref<reference_to_value<T> > - : add_reference<typename add_const<T>::type> + : boost::python::detail::add_lvalue_reference<typename boost::python::detail::add_const<T>::type> { }; |