From 56862b0bcc367027ffa27e4b477a031606861e95 Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Thu, 2 Sep 2004 15:41:37 +0000
Subject: [PATCH] merge new MPL version from 'mplbook' branch

[SVN r24874]
---
 include/boost/algorithm/string/collection_traits.hpp   |  8 ++++----
 .../algorithm/string/detail/collection_traits.hpp      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/boost/algorithm/string/collection_traits.hpp b/include/boost/algorithm/string/collection_traits.hpp
index 18fb943..b76e0f1 100644
--- a/include/boost/algorithm/string/collection_traits.hpp
+++ b/include/boost/algorithm/string/collection_traits.hpp
@@ -25,7 +25,7 @@
 #include <boost/algorithm/string/config.hpp>
 #include <boost/type_traits/is_array.hpp>
 #include <boost/type_traits/is_pointer.hpp>
-#include <boost/mpl/apply_if.hpp>
+#include <boost/mpl/eval_if.hpp>
 
 // Implementation
 #include <boost/algorithm/string/detail/collection_traits.hpp>
@@ -74,13 +74,13 @@ namespace boost {
         struct collection_traits
         {
         private:
-            typedef BOOST_STRING_TYPENAME ::boost::mpl::apply_if< 
+            typedef BOOST_STRING_TYPENAME ::boost::mpl::eval_if< 
                     ::boost::algorithm::detail::is_pair<T>, 
                         detail::pair_container_traits_selector<T>,
-                        BOOST_STRING_TYPENAME ::boost::mpl::apply_if< 
+                        BOOST_STRING_TYPENAME ::boost::mpl::eval_if< 
                         ::boost::is_array<T>, 
                             detail::array_container_traits_selector<T>,
-                            BOOST_STRING_TYPENAME ::boost::mpl::apply_if<
+                            BOOST_STRING_TYPENAME ::boost::mpl::eval_if<
                             ::boost::is_pointer<T>,
                                 detail::pointer_container_traits_selector<T>,
                                 detail::default_container_traits_selector<T>
diff --git a/include/boost/algorithm/string/detail/collection_traits.hpp b/include/boost/algorithm/string/detail/collection_traits.hpp
index e41bfa3..fa4fdb0 100644
--- a/include/boost/algorithm/string/detail/collection_traits.hpp
+++ b/include/boost/algorithm/string/detail/collection_traits.hpp
@@ -19,7 +19,7 @@
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/mpl/apply_if.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/fold.hpp>
@@ -241,13 +241,13 @@ namespace boost {
             struct array_traits_cv_selector
             {
                 typedef BOOST_STRING_TYPENAME 
-                    ::boost::mpl::apply_if< 
+                    ::boost::mpl::eval_if< 
                         ::boost::is_convertible<T,BaseT*>,
                         array_traits_impl_selector<T,BaseT>,
-                        ::boost::mpl::apply_if< 
+                        ::boost::mpl::eval_if< 
                             ::boost::is_convertible<T,const BaseT*>,
                                 array_traits_impl_selector<T, const BaseT>,
-                                ::boost::mpl::apply_if< 
+                                ::boost::mpl::eval_if< 
                                     ::boost::is_convertible<T, volatile BaseT*>,
                                     array_traits_impl_selector<T, volatile BaseT>,
                                     array_traits_impl_selector<T, const volatile BaseT>
@@ -263,7 +263,7 @@ namespace boost {
                 struct apply
                 {
                     typedef BOOST_STRING_TYPENAME
-                        ::boost::mpl::apply_if< 
+                        ::boost::mpl::eval_if< 
                             ::boost::is_convertible<T,const volatile T2*>,
                             array_traits_cv_selector<T,T2>,
                             ::boost::mpl::identity<T1> >::type type;