Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r77823 - in trunk: boost/functional status
From: lorcaminiti_at_[hidden]
Date: 2012-04-07 15:43:04


Author: lcaminiti
Date: 2012-04-07 15:43:03 EDT (Sat, 07 Apr 2012)
New Revision: 77823
URL: http://svn.boost.org/trac/boost/changeset/77823

Log:
Trying to fix a pp error on Sun... using a separate macro to force expansion but not sure if that was the issue.
Text files modified:
   trunk/boost/functional/overloaded_function.hpp | 10 +++++++---
   trunk/status/explicit-failures-markup.xml | 8 --------
   2 files changed, 7 insertions(+), 11 deletions(-)

Modified: trunk/boost/functional/overloaded_function.hpp
==============================================================================
--- trunk/boost/functional/overloaded_function.hpp (original)
+++ trunk/boost/functional/overloaded_function.hpp 2012-04-07 15:43:03 EDT (Sat, 07 Apr 2012)
@@ -83,10 +83,14 @@
>::type
 
 // Iterate within namespace.
+# define BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_OVERLOAD_COUNT \
+ /*at least 2 func to overload 2, 3, ...*/ \
+ BOOST_PP_SUB( \
+ BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX, \
+ 2)
 # define BOOST_PP_ITERATION_PARAMS_1 \
- (3, (0, BOOST_PP_SUB( /*at least 2 func to overload 2, 3, ...*/\
- BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_CONFIG_OVERLOAD_MAX, 2), \
- "boost/functional/overloaded_function.hpp"))
+ (3, (0, BOOST_FUNCTIONAL_OVERLOADED_FUNCTION_OVERLOAD_COUNT, \
+ "boost/functional/overloaded_function.hpp"))
 # include BOOST_PP_ITERATE() // Iterate over function arity.
 
 #undef BOOST_FUNCTIONAL_f_type

Modified: trunk/status/explicit-failures-markup.xml
==============================================================================
--- trunk/status/explicit-failures-markup.xml (original)
+++ trunk/status/explicit-failures-markup.xml 2012-04-07 15:43:03 EDT (Sat, 07 Apr 2012)
@@ -1933,14 +1933,6 @@
         </mark-expected-failures>
     </library>
     
- <!-- functional/overloaded_function -->
- <library name="functional/overloaded_function">
- <!-- Boost.Preprocessor (iteration?) error on Sun -->
- <mark-unusable>
- <toolset name="sun-5.10"/>
- </mark-unusable>
- </library>
-
     <!-- fusion -->
     <library name="fusion">
         <mark-unusable>


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