[patch] From upstream SVN revision 49257: adjusts header files to be GCC-4.4 compliant

boost-svn-r49257.patch (text/plain), 5.02 KB, created by Daniel J. on 2008-12-23 16:24:25 UTC

Index: branches/release/boost/mpl/apply.hpp
===================================================================
--- a/branches/release/boost/mpl/apply.hpp
+++ b/branches/release/boost/mpl/apply.hpp
@@ -136,5 +136,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
@@ -223,3 +226,4 @@
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/apply_wrap.hpp
===================================================================
--- a/branches/release/boost/mpl/apply_wrap.hpp
+++ b/branches/release/boost/mpl/apply_wrap.hpp
@@ -79,5 +79,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
@@ -198,3 +201,4 @@
 #   undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/aux_/advance_backward.hpp
===================================================================
--- a/branches/release/boost/mpl/aux_/advance_backward.hpp
+++ b/branches/release/boost/mpl/aux_/advance_backward.hpp
@@ -80,5 +80,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
 
@@ -122,3 +125,4 @@
 #   undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/aux_/advance_forward.hpp
===================================================================
--- a/branches/release/boost/mpl/aux_/advance_forward.hpp
+++ b/branches/release/boost/mpl/aux_/advance_forward.hpp
@@ -80,5 +80,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
 
@@ -121,3 +124,4 @@
 #   undef AUX778076_ITER_0
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/aux_/full_lambda.hpp
===================================================================
--- a/branches/release/boost/mpl/aux_/full_lambda.hpp
+++ b/branches/release/boost/mpl/aux_/full_lambda.hpp
@@ -228,5 +228,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
 
@@ -348,3 +351,4 @@
 
 #undef i_
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/aux_/numeric_op.hpp
===================================================================
--- a/branches/release/boost/mpl/aux_/numeric_op.hpp
+++ b/branches/release/boost/mpl/aux_/numeric_op.hpp
@@ -288,5 +288,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
@@ -309,3 +312,4 @@
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/bind.hpp
===================================================================
--- a/branches/release/boost/mpl/bind.hpp
+++ b/branches/release/boost/mpl/bind.hpp
@@ -362,5 +362,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
@@ -545,3 +548,4 @@
 #   undef j_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
Index: branches/release/boost/mpl/unpack_args.hpp
===================================================================
--- a/branches/release/boost/mpl/unpack_args.hpp
+++ b/branches/release/boost/mpl/unpack_args.hpp
@@ -112,5 +112,8 @@
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatibility, 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)
@@ -144,3 +147,4 @@
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING