[Boost-commit] svn:boost r53869 - in trunk/boost/spirit/home/phoenix: operator operator/detail statement statement/detail

Subject: [Boost-commit] svn:boost r53869 - in trunk/boost/spirit/home/phoenix: operator operator/detail statement statement/detail
From: steven_at_[hidden]
Date: 2009-06-13 12:14:38

Author: steven_watanabe
Date: 2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
New Revision: 53869
URL: http://svn.boost.org/trac/boost/changeset/53869

Log:
Use BOOST_PP_DEC instead of BOOST_PP_SUB for macros used inside BOOST_PP_ITERATE().  Fixes #3170.
Text files modified: 
   trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp |     2 +-                                      
   trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp  |     2 +-                                      
   trunk/boost/spirit/home/phoenix/operator/member.hpp                  |     2 +-                                      
   trunk/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp  |     2 +-                                      
   trunk/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp      |     2 +-                                      
   trunk/boost/spirit/home/phoenix/statement/try_catch.hpp              |     4 ++--                                    
   6 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -44,7 +44,7 @@
         }
 
 #define BOOST_PP_ITERATION_PARAMS_1                                                                                 \
-        (3, (1, BOOST_PP_SUB(PHOENIX_MEMBER_LIMIT, 2), "boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp"))
+        (3, (1, BOOST_PP_DEC(BOOST_PP_DEC(PHOENIX_MEMBER_LIMIT)), "boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_eval.hpp"))
 
 #include BOOST_PP_ITERATE()
 

Modified: trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -38,7 +38,7 @@
         }
 
 #define BOOST_PP_ITERATION_PARAMS_1                                                        \
-        (3, (1, BOOST_PP_SUB(PHOENIX_MEMBER_LIMIT, 2), "boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp"))
+        (3, (1, BOOST_PP_DEC(BOOST_PP_DEC(PHOENIX_MEMBER_LIMIT)), "boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp"))
 
 #include BOOST_PP_ITERATE()
 

Modified: trunk/boost/spirit/home/phoenix/operator/member.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/operator/member.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/operator/member.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -32,7 +32,7 @@
 #include <boost/preprocessor/arithmetic/sub.hpp>
 
 #if !defined(PHOENIX_MEMBER_LIMIT)
-#define PHOENIX_MEMBER_LIMIT BOOST_PP_SUB(PHOENIX_COMPOSITE_LIMIT, 2)
+#define PHOENIX_MEMBER_LIMIT BOOST_PP_DEC(BOOST_PP_DEC(PHOENIX_COMPOSITE_LIMIT))
 #endif
 
 #include <boost/spirit/home/phoenix/operator/detail/mem_fun_ptr_gen.hpp>

Modified: trunk/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -75,7 +75,7 @@
             }
 
 #define BOOST_PP_ITERATION_PARAMS_2                                                                             \
-        (3, (0, BOOST_PP_SUB(PHOENIX_ITERATION, 1), "boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp"))
+        (3, (0, BOOST_PP_DEC(PHOENIX_ITERATION), "boost/spirit/home/phoenix/statement/detail/catch_all_eval.hpp"))
 
 #include BOOST_PP_ITERATE()
 

Modified: trunk/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/statement/detail/catch_eval.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -57,7 +57,7 @@
             }
 
 #define BOOST_PP_ITERATION_PARAMS_2                                                                         \
-        (3, (0, BOOST_PP_SUB(PHOENIX_ITERATION, 1), "boost/spirit/home/phoenix/statement/detail/catch_eval.hpp"))
+        (3, (0, BOOST_PP_DEC(PHOENIX_ITERATION), "boost/spirit/home/phoenix/statement/detail/catch_eval.hpp"))
 
 #include BOOST_PP_ITERATE()
 

Modified: trunk/boost/spirit/home/phoenix/statement/try_catch.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/statement/try_catch.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/statement/try_catch.hpp	2009-06-13 12:14:36 EDT (Sat, 13 Jun 2009)
@@ -15,10 +15,10 @@
 #include <boost/fusion/include/push_back.hpp>
 #include <boost/fusion/include/as_vector.hpp>
 
-#include <boost/preprocessor/arithmetic/sub.hpp>
+#include <boost/preprocessor/arithmetic/dec.hpp>
 
 #if !defined(PHOENIX_CATCH_LIMIT)
-#define PHOENIX_CATCH_LIMIT BOOST_PP_SUB(PHOENIX_COMPOSITE_LIMIT, 1)
+#define PHOENIX_CATCH_LIMIT BOOST_PP_DEC(PHOENIX_COMPOSITE_LIMIT)
 #endif
 
 #include <boost/spirit/home/phoenix/statement/detail/catch_composite.hpp>