[Boost-commit] svn:boost r49125 - in branches/release: . boost/proto boost/xpressive/proto

Subject: [Boost-commit] svn:boost r49125 - in branches/release: . boost/proto boost/xpressive/proto
From: eric_at_[hidden]
Date: 2008-10-03 03:23:31

Author: eric_niebler
Date: 2008-10-03 03:23:31 EDT (Fri, 03 Oct 2008)
New Revision: 49125
URL: http://svn.boost.org/trac/boost/changeset/49125

Log:
Merged revisions 49089 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r49089 | eric_niebler | 2008-10-01 09:35:58 -0700 (Wed, 01 Oct 2008) | 1 line
  
  accept patch from Daniel James to fix gcc-4.4 preprocessor problem in proto
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/proto/expr.hpp           |     6 +++++-                                  
   branches/release/boost/xpressive/proto/expr.hpp |     6 +++++-                                  
   2 files changed, 10 insertions(+), 2 deletions(-)

Modified: branches/release/boost/proto/expr.hpp
==============================================================================
--- branches/release/boost/proto/expr.hpp	(original)
+++ branches/release/boost/proto/expr.hpp	2008-10-03 03:23:31 EDT (Fri, 03 Oct 2008)
@@ -146,7 +146,10 @@
 
     #endif // BOOST_PROTO_EXPR_HPP_EAN_04_01_2005
 
-#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 ARG_COUNT BOOST_PP_MAX(1, BOOST_PP_ITERATION())
     #define IS_TERMINAL 0 == BOOST_PP_ITERATION()
@@ -477,4 +480,5 @@
 
     #undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif

Modified: branches/release/boost/xpressive/proto/expr.hpp
==============================================================================
--- branches/release/boost/xpressive/proto/expr.hpp	(original)
+++ branches/release/boost/xpressive/proto/expr.hpp	2008-10-03 03:23:31 EDT (Fri, 03 Oct 2008)
@@ -134,7 +134,10 @@
 
     #endif // BOOST_PROTO_EXPR_HPP_EAN_04_01_2005
 
-#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 ARG_COUNT BOOST_PP_MAX(1, BOOST_PP_ITERATION())
     #define IS_TERMINAL 0 == BOOST_PP_ITERATION()
@@ -404,4 +407,5 @@
 
     #undef N
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif