[Boost-commit] svn:boost r48960 - in trunk/boost: mpl mpl/aux_ python python/detail python/object

Subject: [Boost-commit] svn:boost r48960 - in trunk/boost: mpl mpl/aux_ python python/detail python/object
From: rwgk_at_[hidden]
Date: 2008-09-25 00:49:26

Author: rwgk
Date: 2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
New Revision: 48960
URL: http://svn.boost.org/trac/boost/changeset/48960

Log:
boost/python, boost/mpl: gcc 4.4 compatibility (see http://svn.boost.org/trac/boost/ticket/2069)
Text files modified: 
   trunk/boost/mpl/apply.hpp                    |     6 +++++-                                  
   trunk/boost/mpl/apply_wrap.hpp               |     6 +++++-                                  
   trunk/boost/mpl/aux_/advance_backward.hpp    |     6 +++++-                                  
   trunk/boost/mpl/aux_/advance_forward.hpp     |     6 +++++-                                  
   trunk/boost/mpl/aux_/full_lambda.hpp         |     6 +++++-                                  
   trunk/boost/mpl/aux_/numeric_op.hpp          |     6 +++++-                                  
   trunk/boost/mpl/bind.hpp                     |     6 +++++-                                  
   trunk/boost/mpl/unpack_args.hpp              |     6 +++++-                                  
   trunk/boost/python/call.hpp                  |     6 +++++-                                  
   trunk/boost/python/call_method.hpp           |     6 +++++-                                  
   trunk/boost/python/detail/result.hpp         |     6 +++++-                                  
   trunk/boost/python/detail/target.hpp         |     6 +++++-                                  
   trunk/boost/python/object/make_holder.hpp    |     6 +++++-                                  
   trunk/boost/python/object/pointer_holder.hpp |     6 +++++-                                  
   trunk/boost/python/object/value_holder.hpp   |     6 +++++-                                  
   trunk/boost/python/signature.hpp             |     6 +++++-                                  
   16 files changed, 80 insertions(+), 16 deletions(-)

Modified: trunk/boost/mpl/apply.hpp
==============================================================================
--- trunk/boost/mpl/apply.hpp	(original)
+++ trunk/boost/mpl/apply.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/apply_wrap.hpp
==============================================================================
--- trunk/boost/mpl/apply_wrap.hpp	(original)
+++ trunk/boost/mpl/apply_wrap.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/aux_/advance_backward.hpp
==============================================================================
--- trunk/boost/mpl/aux_/advance_backward.hpp	(original)
+++ trunk/boost/mpl/aux_/advance_backward.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/aux_/advance_forward.hpp
==============================================================================
--- trunk/boost/mpl/aux_/advance_forward.hpp	(original)
+++ trunk/boost/mpl/aux_/advance_forward.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/aux_/full_lambda.hpp
==============================================================================
--- trunk/boost/mpl/aux_/full_lambda.hpp	(original)
+++ trunk/boost/mpl/aux_/full_lambda.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/aux_/numeric_op.hpp
==============================================================================
--- trunk/boost/mpl/aux_/numeric_op.hpp	(original)
+++ trunk/boost/mpl/aux_/numeric_op.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/bind.hpp
==============================================================================
--- trunk/boost/mpl/bind.hpp	(original)
+++ trunk/boost/mpl/bind.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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: trunk/boost/mpl/unpack_args.hpp
==============================================================================
--- trunk/boost/mpl/unpack_args.hpp	(original)
+++ trunk/boost/mpl/unpack_args.hpp	2008-09-25 00:49:24 EDT (Thu, 25 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

Modified: trunk/boost/python/call.hpp
==============================================================================
--- trunk/boost/python/call.hpp	(original)
+++ trunk/boost/python/call.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -38,7 +38,10 @@
 
 # endif // CALL_DWA2002411_HPP
 
-#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
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, call.hpp)
@@ -76,4 +79,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/call_method.hpp
==============================================================================
--- trunk/boost/python/call_method.hpp	(original)
+++ trunk/boost/python/call_method.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -37,7 +37,10 @@
 
 # endif // CALL_METHOD_DWA2002411_HPP
 
-#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
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, call_method.hpp)
@@ -76,4 +79,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING

Modified: trunk/boost/python/detail/result.hpp
==============================================================================
--- trunk/boost/python/detail/result.hpp	(original)
+++ trunk/boost/python/detail/result.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -86,7 +86,10 @@
 # endif // RESULT_DWA2002521_HPP
 
 /* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+// 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 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, result.hpp(function pointers))
@@ -128,4 +131,5 @@
 # undef N
 # undef Q
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/detail/target.hpp
==============================================================================
--- trunk/boost/python/detail/target.hpp	(original)
+++ trunk/boost/python/detail/target.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -37,7 +37,10 @@
 # endif // TARGET_DWA2002521_HPP
 
 /* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
+// 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 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, target.hpp(function_pointers))
@@ -79,4 +82,5 @@
 # undef N
 # undef Q
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/object/make_holder.hpp
==============================================================================
--- trunk/boost/python/object/make_holder.hpp	(original)
+++ trunk/boost/python/object/make_holder.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -47,7 +47,10 @@
 
 # endif // MAKE_HOLDER_DWA20011215_HPP
 
-#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
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, make_holder.hpp)
@@ -102,4 +105,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/object/pointer_holder.hpp
==============================================================================
--- trunk/boost/python/object/pointer_holder.hpp	(original)
+++ trunk/boost/python/object/pointer_holder.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -170,7 +170,10 @@
 # endif // POINTER_HOLDER_DWA20011215_HPP
 
 /* --------------- pointer_holder --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 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 && BOOST_PP_ITERATION_FLAGS() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, pointer_holder.hpp)
@@ -212,4 +215,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/object/value_holder.hpp
==============================================================================
--- trunk/boost/python/object/value_holder.hpp	(original)
+++ trunk/boost/python/object/value_holder.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -117,7 +117,10 @@
 
 // --------------- value_holder ---------------
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 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 && BOOST_PP_ITERATION_FLAGS() == 1
 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100)                      \
         && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
 #  line BOOST_PP_LINE(__LINE__, value_holder.hpp(value_holder))
@@ -163,4 +166,5 @@
 
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: trunk/boost/python/signature.hpp
==============================================================================
--- trunk/boost/python/signature.hpp	(original)
+++ trunk/boost/python/signature.hpp	2008-09-25 00:49:24 EDT (Thu, 25 Sep 2008)
@@ -113,7 +113,10 @@
 
 # endif // SIGNATURE_JDG20020813_HPP
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
+// 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 // defined(BOOST_PP_IS_ITERATING)
 
 # define N BOOST_PP_ITERATION()
 
@@ -176,4 +179,5 @@
 # undef Q
 # undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // !defined(BOOST_PP_IS_ITERATING)