diff --git a/include/boost/python/args.hpp b/include/boost/python/args.hpp index c99daafc..d3b7c5d9 100644 --- a/include/boost/python/args.hpp +++ b/include/boost/python/args.hpp @@ -46,10 +46,10 @@ namespace boost { namespace mpl { template struct size; template struct at; -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, , 1) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, , 1)) # include BOOST_PP_ITERATE() -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY - 1, , 2) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY - 1, , 2)) # include BOOST_PP_ITERATE() diff --git a/include/boost/python/call.hpp b/include/boost/python/call.hpp index 82c07b6f..45ab7712 100644 --- a/include/boost/python/call.hpp +++ b/include/boost/python/call.hpp @@ -25,7 +25,7 @@ namespace boost { namespace python { # define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \ , converter::arg_to_python(a##n).get() -# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() # undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET diff --git a/include/boost/python/call_method.hpp b/include/boost/python/call_method.hpp index c0ced783..26b295d9 100644 --- a/include/boost/python/call_method.hpp +++ b/include/boost/python/call_method.hpp @@ -24,7 +24,7 @@ namespace boost { namespace python { # define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \ , converter::arg_to_python(a##n).get() -# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() # undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET diff --git a/include/boost/python/detail/arg_tuple_size.hpp b/include/boost/python/detail/arg_tuple_size.hpp index 24abae89..bd1933fa 100644 --- a/include/boost/python/detail/arg_tuple_size.hpp +++ b/include/boost/python/detail/arg_tuple_size.hpp @@ -41,12 +41,12 @@ template struct arg_tuple_size; // Specializations for function pointers # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER) + (4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER)) # include BOOST_PP_ITERATE() // Specializations for member function pointers # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER) + (4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER)) # include BOOST_PP_ITERATE() # if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) @@ -94,7 +94,7 @@ char_array arg_tuple_size_helper( // Outer iteration over cv-qualifications # define BOOST_PP_ITERATION_PARAMS_2 \ - 3, (0, BOOST_PYTHON_MAX_ARITY, ) + (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 && BOOST_PP_RELATIVE_FLAGS(1) == BOOST_PYTHON_POINTER_TO_MEMBER diff --git a/include/boost/python/detail/caller.hpp b/include/boost/python/detail/caller.hpp index d8871cd1..43366464 100644 --- a/include/boost/python/detail/caller.hpp +++ b/include/boost/python/detail/caller.hpp @@ -39,12 +39,12 @@ struct caller // function pointers # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER) + (4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER)) # include BOOST_PP_ITERATE() // pointers-to-members # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, 3, , BOOST_PYTHON_POINTER_TO_MEMBER) + (4, (0, 3, , BOOST_PYTHON_POINTER_TO_MEMBER)) # include BOOST_PP_ITERATE() }; @@ -78,7 +78,7 @@ PyObject* operator()( #elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER // outer over cv-qualifiers -# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 diff --git a/include/boost/python/detail/member_function_cast.hpp b/include/boost/python/detail/member_function_cast.hpp index c8c3fc2b..c7ac4fa8 100644 --- a/include/boost/python/detail/member_function_cast.hpp +++ b/include/boost/python/detail/member_function_cast.hpp @@ -61,7 +61,7 @@ struct member_function_cast_impl # endif // Member functions -# define BOOST_PP_ITERATION_PARAMS_1 3, (0, 3, ) +# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, 3, )) # include BOOST_PP_ITERATE() }; @@ -86,7 +86,7 @@ struct member_function_cast #elif BOOST_PP_ITERATION_DEPTH() == 1 // outer over cv-qualifiers -# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 diff --git a/include/boost/python/detail/result.hpp b/include/boost/python/detail/result.hpp index 2244671e..742195de 100755 --- a/include/boost/python/detail/result.hpp +++ b/include/boost/python/detail/result.hpp @@ -31,11 +31,11 @@ namespace boost { namespace python { namespace detail { // to get this to work portably. # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER) + (4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER)) # include BOOST_PP_ITERATE() # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER) + (4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER)) # include BOOST_PP_ITERATE() template @@ -101,7 +101,7 @@ boost::type* result(R (*pf)(BOOST_PYTHON_UNARY_ENUM(N, A)), int = 0) #elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER // Outer over cv-qualifiers -# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 diff --git a/include/boost/python/detail/returning.hpp b/include/boost/python/detail/returning.hpp index 498cc824..84609493 100644 --- a/include/boost/python/detail/returning.hpp +++ b/include/boost/python/detail/returning.hpp @@ -36,15 +36,15 @@ template struct returning { // Specializations for function pointers -# define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , \ - BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_NON_VOID) +# define BOOST_PP_ITERATION_PARAMS_1 \ + (4, (0, BOOST_PYTHON_MAX_ARITY, , \ + BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_NON_VOID)) # include BOOST_PP_ITERATE() // Specializations for member function pointers -# define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, 3, , \ - BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_NON_VOID) +# define BOOST_PP_ITERATION_PARAMS_1 \ + (4, (0, 3, , \ + BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_NON_VOID)) # include BOOST_PP_ITERATE() }; @@ -53,15 +53,15 @@ struct returning { typedef void R; // Specializations for function pointers -# define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , \ - BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_VOID) +# define BOOST_PP_ITERATION_PARAMS_1 \ + (4, (0, BOOST_PYTHON_MAX_ARITY, , \ + BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_VOID)) # include BOOST_PP_ITERATE() // Specializations for member function pointers -# define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, 3, , \ - BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_VOID) +# define BOOST_PP_ITERATION_PARAMS_1 \ + (4, (0, 3, , \ + BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_VOID)) # include BOOST_PP_ITERATE() }; @@ -133,8 +133,8 @@ struct returning #elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() & BOOST_PYTHON_POINTER_TO_MEMBER // Outer iteration over cv-qualifications -# define BOOST_PP_ITERATION_PARAMS_2 \ - 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_2 \ + (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 && BOOST_PP_RELATIVE_FLAGS(1) & BOOST_PYTHON_POINTER_TO_MEMBER diff --git a/include/boost/python/detail/target.hpp b/include/boost/python/detail/target.hpp index d8033a8c..d8eb7d68 100644 --- a/include/boost/python/detail/target.hpp +++ b/include/boost/python/detail/target.hpp @@ -20,11 +20,11 @@ namespace boost { namespace python { namespace detail { # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER) + (4, (0, BOOST_PYTHON_MAX_ARITY, , BOOST_PYTHON_FUNCTION_POINTER)) # include BOOST_PP_ITERATE() # define BOOST_PP_ITERATION_PARAMS_1 \ - 4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER) + (4, (0, BOOST_PYTHON_CV_COUNT - 1, , BOOST_PYTHON_POINTER_TO_MEMBER)) # include BOOST_PP_ITERATE() template @@ -52,7 +52,7 @@ boost::type* target(R (*)(BOOST_PYTHON_UNARY_ENUM(N, A #elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER // Outer over cv-qualifiers -# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() #elif BOOST_PP_ITERATION_DEPTH() == 2 diff --git a/include/boost/python/object/make_holder.hpp b/include/boost/python/object/make_holder.hpp index fa6614eb..58a185b0 100644 --- a/include/boost/python/object/make_holder.hpp +++ b/include/boost/python/object/make_holder.hpp @@ -31,7 +31,7 @@ template struct make_holder; # define BOOST_PYTHON_DO_FORWARD_ARG(index, _) , f##index(a##index) // specializations... -# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() # undef BOOST_PYTHON_FORWARD_ARG diff --git a/include/boost/python/object/pointer_holder.hpp b/include/boost/python/object/pointer_holder.hpp index 3f495250..72cecdfc 100644 --- a/include/boost/python/object/pointer_holder.hpp +++ b/include/boost/python/object/pointer_holder.hpp @@ -38,7 +38,7 @@ struct pointer_holder : instance_holder // Forward construction to the held object -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, , 1) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, , 1)) # include BOOST_PP_ITERATE() private: // required holder implementation @@ -58,7 +58,7 @@ struct pointer_holder_back_reference : instance_holder pointer_holder_back_reference(Pointer); // Forward construction to the held object -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, , 2) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, , 2)) # include BOOST_PP_ITERATE() private: // required holder implementation diff --git a/include/boost/python/object/value_holder.hpp b/include/boost/python/object/value_holder.hpp index ac42f561..353cd929 100644 --- a/include/boost/python/object/value_holder.hpp +++ b/include/boost/python/object/value_holder.hpp @@ -30,7 +30,7 @@ template struct value_holder : instance_holder { // Forward construction to the held object -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, , 1) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, , 1)) # include BOOST_PP_ITERATE() private: // required holder implementation @@ -44,7 +44,7 @@ template struct value_holder_back_reference : instance_holder { // Forward construction to the held object -# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, , 2) +# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, , 2)) # include BOOST_PP_ITERATE() private: // required holder implementation diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp index 2fd1804f..35817f21 100755 --- a/include/boost/python/object_core.hpp +++ b/include/boost/python/object_core.hpp @@ -102,7 +102,7 @@ namespace api // object operator()() const; -# define BOOST_PP_ITERATION_PARAMS_1 3, (1, BOOST_PYTHON_MAX_ARITY, ) +# define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, )) # include BOOST_PP_ITERATE() // truth value testing