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/make_instance.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/make_instance.hpp')
| -rw-r--r-- | boost/python/object/make_instance.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/boost/python/object/make_instance.hpp b/boost/python/object/make_instance.hpp index 5f2630adc7..31ec08f7c3 100644 --- a/boost/python/object/make_instance.hpp +++ b/boost/python/object/make_instance.hpp @@ -9,10 +9,10 @@ # include <boost/python/object/instance.hpp> # include <boost/python/converter/registered.hpp> # include <boost/python/detail/decref_guard.hpp> +# include <boost/python/detail/type_traits.hpp> # include <boost/python/detail/none.hpp> # include <boost/mpl/assert.hpp> # include <boost/mpl/or.hpp> -# include <boost/type_traits/is_union.hpp> namespace boost { namespace python { namespace objects { @@ -24,7 +24,8 @@ struct make_instance_impl template <class Arg> static inline PyObject* execute(Arg& x) { - BOOST_MPL_ASSERT((mpl::or_<is_class<T>, is_union<T> >)); + BOOST_MPL_ASSERT((mpl::or_<boost::python::detail::is_class<T>, + boost::python::detail::is_union<T> >)); PyTypeObject* type = Derived::get_class_object(x); |