From 33e1caa14ed96f37117a962c21739a898601239c Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Thu, 9 Nov 2006 01:48:15 +0000
Subject: [PATCH] Merge vacpp preprocessor fixes from RC_1_34_0

[SVN r35939]
---
 include/boost/mpl/list/aux_/include_preprocessed.hpp   | 10 +++++++++-
 include/boost/mpl/map/aux_/include_preprocessed.hpp    |  8 +++++++-
 include/boost/mpl/set/aux_/include_preprocessed.hpp    | 10 ++++++++--
 include/boost/mpl/vector/aux_/include_preprocessed.hpp |  9 ++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/include/boost/mpl/list/aux_/include_preprocessed.hpp b/include/boost/mpl/list/aux_/include_preprocessed.hpp
index 598fed8..a4aff60 100644
--- a/include/boost/mpl/list/aux_/include_preprocessed.hpp
+++ b/include/boost/mpl/list/aux_/include_preprocessed.hpp
@@ -1,5 +1,5 @@
 
-// Copyright Aleksey Gurtovoy 2001-2004
+// Copyright Aleksey Gurtovoy 2001-2006
 //
 // Distributed under the Boost Software License, Version 1.0. 
 // (See accompanying file LICENSE_1_0.txt or copy at 
@@ -13,6 +13,8 @@
 
 // NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION!
 
+#include <boost/mpl/aux_/config/workaround.hpp>
+
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
@@ -20,7 +22,13 @@
     aux_/preprocessed/plain/BOOST_MPL_PREPROCESSED_HEADER \
 /**/
 
+#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/list/AUX778076_HEADER)
+#   include AUX778076_INCLUDE_STRING
+#   undef AUX778076_INCLUDE_STRING
+#else
 #   include BOOST_PP_STRINGIZE(boost/mpl/list/AUX778076_HEADER)
+#endif
 
 #   undef AUX778076_HEADER
 
diff --git a/include/boost/mpl/map/aux_/include_preprocessed.hpp b/include/boost/mpl/map/aux_/include_preprocessed.hpp
index 047ed8a..40260d5 100644
--- a/include/boost/mpl/map/aux_/include_preprocessed.hpp
+++ b/include/boost/mpl/map/aux_/include_preprocessed.hpp
@@ -16,6 +16,7 @@
 #include <boost/mpl/aux_/config/typeof.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 #include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
@@ -38,8 +39,13 @@
 /**/
 #endif
 
-
+#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/map/aux_/preprocessed/AUX778076_HEADER)
+#   include AUX778076_INCLUDE_STRING
+#   undef AUX778076_INCLUDE_STRING
+#else
 #   include BOOST_PP_STRINGIZE(boost/mpl/map/aux_/preprocessed/AUX778076_HEADER)
+#endif
 
 #   undef AUX778076_HEADER
 #   undef AUX778076_INCLUDE_DIR
diff --git a/include/boost/mpl/set/aux_/include_preprocessed.hpp b/include/boost/mpl/set/aux_/include_preprocessed.hpp
index 08f66a0..bd70b6d 100644
--- a/include/boost/mpl/set/aux_/include_preprocessed.hpp
+++ b/include/boost/mpl/set/aux_/include_preprocessed.hpp
@@ -1,7 +1,7 @@
 
 // NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION
 
-// Copyright Aleksey Gurtovoy 2001-2004
+// Copyright Aleksey Gurtovoy 2001-2006
 //
 // Distributed under the Boost Software License, Version 1.0. 
 // (See accompanying file LICENSE_1_0.txt or copy at 
@@ -14,6 +14,7 @@
 // $Revision$
 
 #include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
@@ -28,8 +29,13 @@
 /**/
 #endif
 
-
+#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/set/aux_/preprocessed/AUX778076_HEADER)
+#   include AUX778076_INCLUDE_STRING
+#   undef AUX778076_INCLUDE_STRING
+#else
 #   include BOOST_PP_STRINGIZE(boost/mpl/set/aux_/preprocessed/AUX778076_HEADER)
+#endif
 
 #   undef AUX778076_HEADER
 
diff --git a/include/boost/mpl/vector/aux_/include_preprocessed.hpp b/include/boost/mpl/vector/aux_/include_preprocessed.hpp
index ee2f77d..fecd21c 100644
--- a/include/boost/mpl/vector/aux_/include_preprocessed.hpp
+++ b/include/boost/mpl/vector/aux_/include_preprocessed.hpp
@@ -1,7 +1,7 @@
 
 // NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION
 
-// Copyright Aleksey Gurtovoy 2000-2004
+// Copyright Aleksey Gurtovoy 2000-2006
 //
 // Distributed under the Boost Software License, Version 1.0. 
 // (See accompanying file LICENSE_1_0.txt or copy at 
@@ -16,6 +16,7 @@
 #include <boost/mpl/aux_/config/typeof.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 #include <boost/mpl/aux_/config/preprocessor.hpp>
+#include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
@@ -40,7 +41,13 @@
 #endif
 
 
+#if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(700))
+#   define AUX778076_INCLUDE_STRING BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
+#   include AUX778076_INCLUDE_STRING
+#   undef AUX778076_INCLUDE_STRING
+#else
 #   include BOOST_PP_STRINGIZE(boost/mpl/vector/aux_/preprocessed/AUX778076_HEADER)
+#endif
 
 #   undef AUX778076_HEADER
 #   undef AUX778076_INCLUDE_DIR