From 7068649063d3bd674220c16db2a2d28eb15a90ff 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: Tue, 22 Jun 2004 06:05:22 +0000
Subject: [PATCH] 3rd attempt to reformulate an ugly fix for vacpp 6.0

[SVN r23143]
---
 include/boost/multi_index_container.hpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/boost/multi_index_container.hpp b/include/boost/multi_index_container.hpp
index ad17557..27c8b57 100644
--- a/include/boost/multi_index_container.hpp
+++ b/include/boost/multi_index_container.hpp
@@ -19,6 +19,7 @@
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/find_if.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/multi_index_container_fwd.hpp>
@@ -149,9 +150,11 @@ public:
 
 #if BOOST_WORKAROUND(__IBMCPP__,<=600)
     const ctor_args_list& args_list=
-      BOOST_DEDUCED_TYPENAME multi_index_container::ctor_args_list(),
+      typename mpl::identity<multi_index_container>::type::
+        ctor_args_list(),
     const allocator_type& al=
-      BOOST_DEDUCED_TYPENAME multi_index_container::allocator_type()):
+      typename mpl::identity<multi_index_container>::type::
+        allocator_type()):
 #else
     const ctor_args_list& args_list=ctor_args_list(),
     const allocator_type& al=allocator_type()):
@@ -170,9 +173,11 @@ public:
 
 #if BOOST_WORKAROUND(__IBMCPP__,<=600)
     const ctor_args_list& args_list=
-      BOOST_DEDUCED_TYPENAME multi_index_container::ctor_args_list(),
+      typename mpl::identity<multi_index_container>::type::
+        ctor_args_list(),
     const allocator_type& al=
-      BOOST_DEDUCED_TYPENAME multi_index_container::allocator_type()):
+      typename mpl::identity<multi_index_container>::type::
+        allocator_type()):
 #else
     const ctor_args_list& args_list=ctor_args_list(),
     const allocator_type& al=allocator_type()):