Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r48949 - in branches/initializer-list/boost/mpl: . aux_
From: daniel_james_at_[hidden]
Date: 2008-09-24 15:05:43


Author: danieljames
Date: 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
New Revision: 48949
URL: http://svn.boost.org/trac/boost/changeset/48949

Log:
Ralf's mpl patches for gcc 4.4. Needed to be able to test initializer list support.

Text files modified:
   branches/initializer-list/boost/mpl/apply.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/apply_wrap.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/aux_/advance_backward.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/aux_/advance_forward.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/aux_/full_lambda.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/aux_/numeric_op.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/bind.hpp | 6 +++++-
   branches/initializer-list/boost/mpl/unpack_args.hpp | 6 +++++-
   8 files changed, 40 insertions(+), 8 deletions(-)

Modified: branches/initializer-list/boost/mpl/apply.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/apply.hpp (original)
+++ branches/initializer-list/boost/mpl/apply.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -135,7 +135,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 # define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -222,4 +225,5 @@
 
 # undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/apply_wrap.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/apply_wrap.hpp (original)
+++ branches/initializer-list/boost/mpl/apply_wrap.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -78,7 +78,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 # define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -197,4 +200,5 @@
 
 # undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/aux_/advance_backward.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/aux_/advance_backward.hpp (original)
+++ branches/initializer-list/boost/mpl/aux_/advance_backward.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -79,7 +79,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 template<>
@@ -121,4 +124,5 @@
 # undef AUX778076_ITER_1
 # undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/aux_/advance_forward.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/aux_/advance_forward.hpp (original)
+++ branches/initializer-list/boost/mpl/aux_/advance_forward.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -79,7 +79,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 template<>
@@ -120,4 +123,5 @@
 # undef AUX778076_ITER_1
 # undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/aux_/full_lambda.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/aux_/full_lambda.hpp (original)
+++ branches/initializer-list/boost/mpl/aux_/full_lambda.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -227,7 +227,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 #if i_ > 0
@@ -347,4 +350,5 @@
 };
 
 #undef i_
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/aux_/numeric_op.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/aux_/numeric_op.hpp (original)
+++ branches/initializer-list/boost/mpl/aux_/numeric_op.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -287,7 +287,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 # define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -308,4 +311,5 @@
 
 # undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/bind.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/bind.hpp (original)
+++ branches/initializer-list/boost/mpl/bind.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -361,7 +361,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 # define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -544,4 +547,5 @@
 # endif
 # undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: branches/initializer-list/boost/mpl/unpack_args.hpp
==============================================================================
--- branches/initializer-list/boost/mpl/unpack_args.hpp (original)
+++ branches/initializer-list/boost/mpl/unpack_args.hpp 2008-09-24 15:05:42 EDT (Wed, 24 Sep 2008)
@@ -111,7 +111,10 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 # define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -143,4 +146,5 @@
 
 # undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk