diff options
Diffstat (limited to 'boost/python/object/inheritance.hpp')
| -rw-r--r-- | boost/python/object/inheritance.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/boost/python/object/inheritance.hpp b/boost/python/object/inheritance.hpp index b49a0442e2..90e56f0c1d 100644 --- a/boost/python/object/inheritance.hpp +++ b/boost/python/object/inheritance.hpp @@ -8,9 +8,8 @@ # include <boost/python/type_id.hpp> # include <boost/shared_ptr.hpp> # include <boost/mpl/if.hpp> -# include <boost/type_traits/is_polymorphic.hpp> -# include <boost/type_traits/is_base_and_derived.hpp> # include <boost/detail/workaround.hpp> +# include <boost/python/detail/type_traits.hpp> namespace boost { namespace python { namespace objects { @@ -58,7 +57,7 @@ struct non_polymorphic_id_generator template <class T> struct dynamic_id_generator : mpl::if_< - boost::is_polymorphic<T> + boost::python::detail::is_polymorphic<T> , boost::python::objects::polymorphic_id_generator<T> , boost::python::objects::non_polymorphic_id_generator<T> > @@ -104,7 +103,7 @@ struct implicit_cast_generator template <class Source, class Target> struct cast_generator : mpl::if_< - is_base_and_derived<Target,Source> + boost::python::detail::is_base_and_derived<Target,Source> , implicit_cast_generator<Source,Target> , dynamic_cast_generator<Source,Target> > |