From f57e4fc652d22f46c1431a66893bd3e05e246e42 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 16 Apr 2002 14:29:30 +0000
Subject: [PATCH] Changes for MPL v2

[SVN r13504]
---
 include/boost/python/converter/callback.hpp          | 12 ++++++------
 include/boost/python/converter/from_python_data.hpp  |  4 ++--
 .../python/converter/lvalue_from_python_chain.hpp    |  2 +-
 include/boost/python/converter/type_id.hpp           |  2 +-
 include/boost/python/copy_mutable_reference.hpp      |  4 ++--
 include/boost/python/detail/wrap_function.hpp        |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/boost/python/converter/callback.hpp b/include/boost/python/converter/callback.hpp
index 9e9c694f..d11dfcb1 100644
--- a/include/boost/python/converter/callback.hpp
+++ b/include/boost/python/converter/callback.hpp
@@ -10,7 +10,7 @@
 # include <boost/python/converter/to_python_function.hpp>
 # include <boost/python/converter/pointee_to_python_function.hpp>
 # include <boost/python/converter/from_python.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 # include <boost/python/converter/callback_to_python_base.hpp>
 # include <boost/python/converter/callback_from_python_base.hpp>
 # include <boost/python/converter/builtin_converters.hpp>
@@ -55,10 +55,10 @@ namespace detail
       BOOST_STATIC_CONSTANT(
           bool, ref = is_reference<T>::value);
 
-      typedef typename mpl::select_type<
+      typedef typename mpl::select_if_c<
           ptr
           , pointer_callback_from_python<T>
-          , typename mpl::select_type<
+          , typename mpl::select_if_c<
               ref
               , reference_callback_from_python<T>
               , rvalue_callback_from_python<T>
@@ -113,13 +113,13 @@ namespace detail
       typedef typename unwrap_reference<T>::type unwrapped_referent;
       typedef typename unwrap_pointer<T>::type unwrapped_ptr;
 
-      typedef typename mpl::select_type<
+      typedef typename mpl::select_if_c<
           ptr
           , pointer_deep_callback_to_python<T>
-          , typename mpl::select_type<
+          , typename mpl::select_if_c<
               ptr_wrapper
               , pointer_shallow_callback_to_python<unwrapped_ptr>
-              , typename mpl::select_type<
+              , typename mpl::select_if_c<
                   ref_wrapper
                   , reference_callback_to_python<unwrapped_referent>
                   , value_callback_to_python<T>
diff --git a/include/boost/python/converter/from_python_data.hpp b/include/boost/python/converter/from_python_data.hpp
index b0d8a49f..a71c6548 100644
--- a/include/boost/python/converter/from_python_data.hpp
+++ b/include/boost/python/converter/from_python_data.hpp
@@ -7,7 +7,7 @@
 # define FROM_PYTHON_AUX_DATA_DWA2002128_HPP
 
 # include <boost/python/detail/char_array.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 # include <boost/type_traits/same_traits.hpp>
 # include <boost/type_traits/transform_traits.hpp>
 # include <boost/static_assert.hpp>
@@ -54,7 +54,7 @@ namespace detail
         , void*, function_ptr, member_ptr, member_function_ptr))
 
 # define BOOST_PYTHON_CHOOSE_LOWER_SIZE(R,P,I,T) \
-        typename mpl::select_type< \
+        typename mpl::select_if_c< \
            sizeof(T) <= target, T, char>::type BOOST_PP_CAT(t,I);
            
 # define BOOST_PYTHON_CHOOSE_T(R,P,I,T) T BOOST_PP_CAT(t,I);
diff --git a/include/boost/python/converter/lvalue_from_python_chain.hpp b/include/boost/python/converter/lvalue_from_python_chain.hpp
index 2a86bcfa..a58b4309 100644
--- a/include/boost/python/converter/lvalue_from_python_chain.hpp
+++ b/include/boost/python/converter/lvalue_from_python_chain.hpp
@@ -51,7 +51,7 @@ namespace detail
 
       typedef typename add_reference<typename add_cv<T>::type>::type normalized;
 
-      typedef typename mpl::select_type<
+      typedef typename mpl::select_if_c<
           ptr
           , ptr_or_ptr_ref_lvalue_from_python_chain<normalized>
           , ref_lvalue_from_python_chain<normalized>
diff --git a/include/boost/python/converter/type_id.hpp b/include/boost/python/converter/type_id.hpp
index 015e55e9..f1bfa8a3 100644
--- a/include/boost/python/converter/type_id.hpp
+++ b/include/boost/python/converter/type_id.hpp
@@ -10,7 +10,7 @@
 # include <boost/python/detail/msvc_typeinfo.hpp>
 # include <boost/type_traits/cv_traits.hpp>
 # include <boost/type_traits/composite_traits.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 # include <boost/operators.hpp>
 # include <boost/type.hpp>
 # include <typeinfo>
diff --git a/include/boost/python/copy_mutable_reference.hpp b/include/boost/python/copy_mutable_reference.hpp
index f7594ccd..acf170d0 100644
--- a/include/boost/python/copy_mutable_reference.hpp
+++ b/include/boost/python/copy_mutable_reference.hpp
@@ -6,7 +6,7 @@
 #ifndef COPY_MUTABLE_REFERENCE_DWA2002131_HPP
 # define COPY_MUTABLE_REFERENCE_DWA2002131_HPP
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 # include <boost/python/to_python_value.hpp>
 
 namespace boost { namespace python { 
@@ -28,7 +28,7 @@ struct copy_mutable_reference
     template <class T>
     struct apply
     {
-        typedef typename mpl::select_type<
+        typedef typename mpl::select_if_c<
             detail::is_reference_to_non_const<T>::value
             , to_python_value<T>
             , detail::copy_mutable_reference_expects_a_reference_to_non_const_return_type<T>
diff --git a/include/boost/python/detail/wrap_function.hpp b/include/boost/python/detail/wrap_function.hpp
index 0dcccd70..488f939e 100644
--- a/include/boost/python/detail/wrap_function.hpp
+++ b/include/boost/python/detail/wrap_function.hpp
@@ -11,7 +11,7 @@
 # include <boost/type_traits/composite_traits.hpp>
 # include <boost/type_traits/transform_traits.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 
 namespace boost { namespace python { namespace detail {