From cc79cde785b23b3ac4b4853ef75a240fd65f8dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20M=2E=20L=C3=B3pez=20Mu=C3=B1oz?=
 <joaquin@tid.es>
Date: Mon, 31 May 2004 09:38:19 +0000
Subject: [PATCH] fixes for VC7.0 by Daniel Wallin

[SVN r22981]
---
 include/boost/multi_index/detail/allocator.hpp | 6 +++---
 include/boost/multi_index/detail/base_type.hpp | 6 ++++--
 include/boost/multi_index/detail/node_type.hpp | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/boost/multi_index/detail/allocator.hpp b/include/boost/multi_index/detail/allocator.hpp
index 38d0cfd..d007de9 100644
--- a/include/boost/multi_index/detail/allocator.hpp
+++ b/include/boost/multi_index/detail/allocator.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/if.hpp>
+#include <boost/mpl/apply_if.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <cstddef>
@@ -147,11 +147,11 @@ struct compliant_allocator_rebind_to
 
 template<typename Allocator,typename Type>
 struct rebind_to:
-  mpl::if_c<
+  mpl::apply_if_c<
     is_partial_std_allocator<Allocator>::value,
     partial_std_allocator_rebind_to<Allocator,Type>,
     compliant_allocator_rebind_to<Allocator,Type>
-  >::type
+  >
 {
 };
 
diff --git a/include/boost/multi_index/detail/base_type.hpp b/include/boost/multi_index/detail/base_type.hpp
index d7fb8a7..4a44b67 100644
--- a/include/boost/multi_index/detail/base_type.hpp
+++ b/include/boost/multi_index/detail/base_type.hpp
@@ -46,9 +46,11 @@ struct index_applier
 struct index_applier
 {
   template<typename IndexSpecifierIterator,typename Super>
-  struct apply:IndexSpecifierIterator::type::
-    BOOST_NESTED_TEMPLATE index_class<Super>
+  struct apply
   {
+    typedef typename IndexSpecifierIterator::type index_specifier;
+    typedef typename index_specifier::
+      BOOST_NESTED_TEMPLATE index_class<Super>::type type;
   }; 
 };
 #endif
diff --git a/include/boost/multi_index/detail/node_type.hpp b/include/boost/multi_index/detail/node_type.hpp
index 88108de..496ea47 100644
--- a/include/boost/multi_index/detail/node_type.hpp
+++ b/include/boost/multi_index/detail/node_type.hpp
@@ -45,9 +45,11 @@ struct index_node_applier
 struct index_node_applier
 {
   template<typename IndexSpecifierIterator,typename Super>
-  struct apply:IndexSpecifierIterator::type::
-    BOOST_NESTED_TEMPLATE node_class<Super>
+  struct apply
   {
+    typedef typename IndexSpecifierIterator::type index_specifier;
+    typedef typename index_specifier::
+      BOOST_NESTED_TEMPLATE node_class<Super>::type type;
   }; 
 };
 #endif