From be6b9fa48d41e1011d5490287c20a9d55e28c837 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Tue, 16 Apr 2002 14:29:30 +0000 Subject: [PATCH] Changes for MPL v2 [SVN r13504] --- include/boost/python/manage_new_object.hpp | 4 ++-- include/boost/python/object/inheritance.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/python/manage_new_object.hpp b/include/boost/python/manage_new_object.hpp index 9c0912ab..2df448c8 100644 --- a/include/boost/python/manage_new_object.hpp +++ b/include/boost/python/manage_new_object.hpp @@ -6,7 +6,7 @@ #ifndef MANAGE_NEW_OBJECT_DWA200222_HPP # define MANAGE_NEW_OBJECT_DWA200222_HPP # include -# include +# include # include # include @@ -29,7 +29,7 @@ struct manage_new_object template struct apply { - typedef typename mpl::select_type< + typedef typename mpl::select_if_c< boost::is_pointer::value , to_python_indirect , detail::manage_new_object_requires_a_pointer_return_type diff --git a/include/boost/python/object/inheritance.hpp b/include/boost/python/object/inheritance.hpp index ceeac8f9..eb7cecb2 100644 --- a/include/boost/python/object/inheritance.hpp +++ b/include/boost/python/object/inheritance.hpp @@ -78,7 +78,7 @@ struct non_polymorphic_id_generator template struct dynamic_id_generator { - typedef typename mpl::select_type< + typedef typename mpl::select_if_c< is_polymorphic::value , polymorphic_id_generator , non_polymorphic_id_generator >::type type; @@ -131,7 +131,7 @@ struct cast_generator is_base_and_derived::value )); - typedef typename mpl::select_type< + typedef typename mpl::select_if_c< is_upcast # if defined(__MWERKS__) && __MWERKS__ <= 0x2406 // grab a few more implicit_cast cases for CodeWarrior