Skip to content

Commit 88170f6

Browse files
pmenso57pmenso57
committed
updated to new iteration interface
[SVN r14388]
1 parent 931aab2 commit 88170f6

File tree

13 files changed

+38
-38
lines changed

13 files changed

+38
-38
lines changed

‎include/boost/python/args.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ namespace boost { namespace mpl {
4646
template <class T> struct size;
4747
template <long N, class Seq> struct at;
4848

49-
# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/args.hpp>, 1)
49+
# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/args.hpp>, 1))
5050
# include BOOST_PP_ITERATE()
5151

52-
# define BOOST_PP_ITERATION_PARAMS_1 4, (0, BOOST_PYTHON_MAX_ARITY - 1, <boost/python/args.hpp>, 2)
52+
# define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY - 1, <boost/python/args.hpp>, 2))
5353
# include BOOST_PP_ITERATE()
5454

5555

‎include/boost/python/call.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace boost { namespace python {
2525
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \
2626
, converter::arg_to_python<A##n>(a##n).get()
2727

28-
# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call.hpp>)
28+
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call.hpp>))
2929
# include BOOST_PP_ITERATE()
3030

3131
# undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET

‎include/boost/python/call_method.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace boost { namespace python {
2424
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \
2525
, converter::arg_to_python<A##n>(a##n).get()
2626

27-
# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call_method.hpp>)
27+
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call_method.hpp>))
2828
# include BOOST_PP_ITERATE()
2929

3030
# undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET

‎include/boost/python/detail/arg_tuple_size.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ template <class F> struct arg_tuple_size;
4141

4242
// Specializations for function pointers
4343
# define BOOST_PP_ITERATION_PARAMS_1 \
44-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/arg_tuple_size.hpp>, BOOST_PYTHON_FUNCTION_POINTER)
44+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/arg_tuple_size.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
4545
# include BOOST_PP_ITERATE()
4646

4747
// Specializations for member function pointers
4848
# define BOOST_PP_ITERATION_PARAMS_1 \
49-
4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/arg_tuple_size.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER)
49+
(4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/arg_tuple_size.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
5050
# include BOOST_PP_ITERATE()
5151

5252
# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
@@ -94,7 +94,7 @@ char_array<N> arg_tuple_size_helper(
9494
// Outer iteration over cv-qualifications
9595

9696
# define BOOST_PP_ITERATION_PARAMS_2 \
97-
3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/arg_tuple_size.hpp>)
97+
(3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/arg_tuple_size.hpp>))
9898
# include BOOST_PP_ITERATE()
9999

100100
#elif BOOST_PP_ITERATION_DEPTH() == 2 && BOOST_PP_RELATIVE_FLAGS(1) == BOOST_PYTHON_POINTER_TO_MEMBER

‎include/boost/python/detail/caller.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ struct caller
3939

4040
// function pointers
4141
# define BOOST_PP_ITERATION_PARAMS_1 \
42-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/caller.hpp>, BOOST_PYTHON_FUNCTION_POINTER)
42+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/caller.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
4343
# include BOOST_PP_ITERATE()
4444

4545
// pointers-to-members
4646
# define BOOST_PP_ITERATION_PARAMS_1 \
47-
4, (0, 3, <boost/python/detail/caller.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER)
47+
(4, (0, 3, <boost/python/detail/caller.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
4848
# include BOOST_PP_ITERATE()
4949

5050
};
@@ -78,7 +78,7 @@ PyObject* operator()(
7878
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
7979
// outer over cv-qualifiers
8080

81-
# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/caller.hpp>)
81+
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/caller.hpp>))
8282
# include BOOST_PP_ITERATE()
8383

8484
#elif BOOST_PP_ITERATION_DEPTH() == 2

‎include/boost/python/detail/member_function_cast.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct member_function_cast_impl
6161
# endif
6262

6363
// Member functions
64-
# define BOOST_PP_ITERATION_PARAMS_1 3, (0, 3, <boost/python/detail/member_function_cast.hpp>)
64+
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, 3, <boost/python/detail/member_function_cast.hpp>))
6565
# include BOOST_PP_ITERATE()
6666
};
6767

@@ -86,7 +86,7 @@ struct member_function_cast
8686
#elif BOOST_PP_ITERATION_DEPTH() == 1
8787
// outer over cv-qualifiers
8888

89-
# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/member_function_cast.hpp>)
89+
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/member_function_cast.hpp>))
9090
# include BOOST_PP_ITERATE()
9191

9292
#elif BOOST_PP_ITERATION_DEPTH() == 2

‎include/boost/python/detail/result.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ namespace boost { namespace python { namespace detail {
3131
// to get this to work portably.
3232

3333
# define BOOST_PP_ITERATION_PARAMS_1 \
34-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>, BOOST_PYTHON_FUNCTION_POINTER)
34+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
3535
# include BOOST_PP_ITERATE()
3636

3737
# define BOOST_PP_ITERATION_PARAMS_1 \
38-
4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/result.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER)
38+
(4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/result.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
3939
# include BOOST_PP_ITERATE()
4040

4141
template <class R, class T>
@@ -101,7 +101,7 @@ boost::type<R>* result(R (*pf)(BOOST_PYTHON_UNARY_ENUM(N, A)), int = 0)
101101
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
102102
// Outer over cv-qualifiers
103103

104-
# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>)
104+
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>))
105105
# include BOOST_PP_ITERATE()
106106

107107
#elif BOOST_PP_ITERATION_DEPTH() == 2

‎include/boost/python/detail/returning.hpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ template <class R>
3636
struct returning
3737
{
3838
// Specializations for function pointers
39-
# define BOOST_PP_ITERATION_PARAMS_1 \
40-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>, \
41-
BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_NON_VOID)
39+
# define BOOST_PP_ITERATION_PARAMS_1 \
40+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>, \
41+
BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_NON_VOID))
4242
# include BOOST_PP_ITERATE()
4343

4444
// Specializations for member function pointers
45-
# define BOOST_PP_ITERATION_PARAMS_1 \
46-
4, (0, 3, <boost/python/detail/returning.hpp>, \
47-
BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_NON_VOID)
45+
# define BOOST_PP_ITERATION_PARAMS_1 \
46+
(4, (0, 3, <boost/python/detail/returning.hpp>, \
47+
BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_NON_VOID))
4848
# include BOOST_PP_ITERATE()
4949
};
5050

@@ -53,15 +53,15 @@ struct returning<void>
5353
{
5454
typedef void R;
5555
// Specializations for function pointers
56-
# define BOOST_PP_ITERATION_PARAMS_1 \
57-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>, \
58-
BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_VOID)
56+
# define BOOST_PP_ITERATION_PARAMS_1 \
57+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>, \
58+
BOOST_PYTHON_FUNCTION_POINTER | BOOST_PYTHON_RETURNING_VOID))
5959
# include BOOST_PP_ITERATE()
6060

6161
// Specializations for member function pointers
62-
# define BOOST_PP_ITERATION_PARAMS_1 \
63-
4, (0, 3, <boost/python/detail/returning.hpp>, \
64-
BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_VOID)
62+
# define BOOST_PP_ITERATION_PARAMS_1 \
63+
(4, (0, 3, <boost/python/detail/returning.hpp>, \
64+
BOOST_PYTHON_POINTER_TO_MEMBER | BOOST_PYTHON_RETURNING_VOID))
6565
# include BOOST_PP_ITERATE()
6666
};
6767

@@ -133,8 +133,8 @@ struct returning<void>
133133
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() & BOOST_PYTHON_POINTER_TO_MEMBER
134134

135135
// Outer iteration over cv-qualifications
136-
# define BOOST_PP_ITERATION_PARAMS_2 \
137-
3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>)
136+
# define BOOST_PP_ITERATION_PARAMS_2 \
137+
(3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/returning.hpp>))
138138
# include BOOST_PP_ITERATE()
139139

140140
#elif BOOST_PP_ITERATION_DEPTH() == 2 && BOOST_PP_RELATIVE_FLAGS(1) & BOOST_PYTHON_POINTER_TO_MEMBER

‎include/boost/python/detail/target.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
namespace boost { namespace python { namespace detail {
2121

2222
# define BOOST_PP_ITERATION_PARAMS_1 \
23-
4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>, BOOST_PYTHON_FUNCTION_POINTER)
23+
(4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
2424
# include BOOST_PP_ITERATE()
2525

2626
# define BOOST_PP_ITERATION_PARAMS_1 \
27-
4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/target.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER)
27+
(4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/target.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
2828
# include BOOST_PP_ITERATE()
2929

3030
template <class R, class T>
@@ -52,7 +52,7 @@ boost::type<BOOST_PP_IF(N, A0, void)>* target(R (*)(BOOST_PYTHON_UNARY_ENUM(N, A
5252
#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
5353
// Outer over cv-qualifiers
5454

55-
# define BOOST_PP_ITERATION_PARAMS_2 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>)
55+
# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>))
5656
# include BOOST_PP_ITERATE()
5757

5858
#elif BOOST_PP_ITERATION_DEPTH() == 2

‎include/boost/python/object/make_holder.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ template <int nargs> struct make_holder;
3131
# define BOOST_PYTHON_DO_FORWARD_ARG(index, _) , f##index(a##index)
3232

3333
// specializations...
34-
# define BOOST_PP_ITERATION_PARAMS_1 3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/make_holder.hpp>)
34+
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/make_holder.hpp>))
3535
# include BOOST_PP_ITERATE()
3636

3737
# undef BOOST_PYTHON_FORWARD_ARG

0 commit comments

Comments
 (0)