From b2deb5ac68e7e954877bdbc26996fea216e86ae5 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/detail/allocator_utilities.hpp | 4 ++--
 include/boost/detail/iterator.hpp            | 2 +-
 include/boost/indirect_reference.hpp         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/boost/detail/allocator_utilities.hpp b/include/boost/detail/allocator_utilities.hpp
index e98657e..1c406cf 100644
--- a/include/boost/detail/allocator_utilities.hpp
+++ b/include/boost/detail/allocator_utilities.hpp
@@ -12,7 +12,7 @@
 #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
 #include <boost/detail/workaround.hpp>
 #include <boost/mpl/aux_/msvc_never_true.hpp>
-#include <boost/mpl/apply_if.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <cstddef>
 #include <memory>
@@ -147,7 +147,7 @@ struct compliant_allocator_rebind_to
 
 template<typename Allocator,typename Type>
 struct rebind_to:
-  mpl::apply_if_c<
+  mpl::eval_if_c<
     is_partial_std_allocator<Allocator>::value,
     partial_std_allocator_rebind_to<Allocator,Type>,
     compliant_allocator_rebind_to<Allocator,Type>
diff --git a/include/boost/detail/iterator.hpp b/include/boost/detail/iterator.hpp
index 70f6b5e..78700b9 100644
--- a/include/boost/detail/iterator.hpp
+++ b/include/boost/detail/iterator.hpp
@@ -144,7 +144,7 @@ struct iterator_traits<T const*>
 # endif
 
 # include <boost/mpl/if.hpp>
-# include <boost/mpl/aux_/has_xxx.hpp>
+# include <boost/mpl/has_xxx.hpp>
 # include <cstddef>
 
 // should be the last #include
diff --git a/include/boost/indirect_reference.hpp b/include/boost/indirect_reference.hpp
index 270cbbd..2e993d9 100755
--- a/include/boost/indirect_reference.hpp
+++ b/include/boost/indirect_reference.hpp
@@ -10,7 +10,7 @@
 # include <boost/detail/is_incrementable.hpp>
 # include <boost/iterator/iterator_traits.hpp>
 # include <boost/type_traits/remove_cv.hpp>
-# include <boost/mpl/apply_if.hpp>
+# include <boost/mpl/eval_if.hpp>
 # include <boost/pointee.hpp>
 
 namespace boost { 
@@ -26,7 +26,7 @@ namespace detail
 
 template <class P>
 struct indirect_reference
-  : mpl::apply_if<
+  : mpl::eval_if<
         detail::is_incrementable<P>
       , iterator_reference<P>
       , detail::smart_ptr_reference<P>