Skip to content

Commit 26a0df8

Browse files
pmenso57pmenso57
committed
pp-lib update
[SVN r15214]
1 parent 526d99f commit 26a0df8

9 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎include/boost/python/call.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace boost { namespace python {
2424

25-
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \
25+
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(z, n, _) \
2626
, converter::arg_to_python<A##n>(a##n).get()
2727

2828
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call.hpp>))

‎include/boost/python/call_method.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace boost { namespace python {
2323

24-
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(n, _) \
24+
# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(z, n, _) \
2525
, converter::arg_to_python<A##n>(a##n).get()
2626

2727
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call_method.hpp>))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define N BOOST_PP_ITERATION()
1212

13-
#define BOOST_PYTHON_MAKE_TUPLE_ARG(N, ignored) \
13+
#define BOOST_PYTHON_MAKE_TUPLE_ARG(z, N, ignored) \
1414
PyTuple_SET_ITEM( \
1515
result.ptr() \
1616
, N \

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545

4646
// enumerators
4747
# define BOOST_PYTHON_UNARY_ENUM(c, text) BOOST_PP_REPEAT(c, BOOST_PYTHON_UNARY_ENUM_I, text)
48-
# define BOOST_PYTHON_UNARY_ENUM_I(n, text) BOOST_PP_COMMA_IF(n) text ## n
48+
# define BOOST_PYTHON_UNARY_ENUM_I(z, n, text) BOOST_PP_COMMA_IF(n) text ## n
4949

5050
# define BOOST_PYTHON_BINARY_ENUM(c, a, b) BOOST_PP_REPEAT(c, BOOST_PYTHON_BINARY_ENUM_I, (a, b))
51-
# define BOOST_PYTHON_BINARY_ENUM_I(n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 1, _), n)
51+
# define BOOST_PYTHON_BINARY_ENUM_I(z, n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 1, _), n)
5252

5353
# define BOOST_PYTHON_ENUM_WITH_DEFAULT(c, text, def) BOOST_PP_REPEAT(c, BOOST_PYTHON_ENUM_WITH_DEFAULT_I, (text, def))
54-
# define BOOST_PYTHON_ENUM_WITH_DEFAULT_I(n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) = BOOST_PP_TUPLE_ELEM(2, 1, _)
54+
# define BOOST_PYTHON_ENUM_WITH_DEFAULT_I(z, n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) = BOOST_PP_TUPLE_ELEM(2, 1, _)
5555

5656
// fixed text (no commas)
57-
# define BOOST_PYTHON_FIXED(n, text) text
57+
# define BOOST_PYTHON_FIXED(z, n, text) text
5858

5959
// flags
6060
# define BOOST_PYTHON_FUNCTION_POINTER 0x0001

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ struct returning<void>
7878

7979
# define N BOOST_PP_ITERATION()
8080

81-
# define BOOST_PYTHON_CALL_ARGS(n, _) \
81+
# define BOOST_PYTHON_CALL_ARGS(z, n, _) \
8282
BOOST_PP_COMMA_IF(n) c##n(PyTuple_GET_ITEM(args_, n))
8383

84-
# define BOOST_PYTHON_CHECK_CONVERSION(n, _) \
84+
# define BOOST_PYTHON_CHECK_CONVERSION(z, n, _) \
8585
arg_from_python<A##n> c##n(PyTuple_GET_ITEM(args_, n)); \
8686
if (!c##n.convertible()) \
8787
return 0;

‎include/boost/python/init.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ namespace detail {
298298
// last in the list.
299299
//
300300
///////////////////////////////////////////////////////////////////////////////
301-
#define BOOST_PYTHON_APPEND_TO_INIT(INDEX, D) \
301+
#define BOOST_PYTHON_APPEND_TO_INIT(z, INDEX, D) \
302302
typedef typename detail::append_to_init \
303303
< \
304304
BOOST_PP_CAT(l, INDEX), \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ namespace boost { namespace python { namespace objects {
2525

2626
template <int nargs> struct make_holder;
2727

28-
# define BOOST_PYTHON_FORWARD_ARG(index, _) \
28+
# define BOOST_PYTHON_FORWARD_ARG(z, index, _) \
2929
typedef typename mpl::at<index,ArgList>::type t##index; \
3030
typedef typename forward<t##index>::type f##index;
3131

32-
# define BOOST_PYTHON_DO_FORWARD_ARG(index, _) , f##index(a##index)
32+
# define BOOST_PYTHON_DO_FORWARD_ARG(z, index, _) , f##index(a##index)
3333

3434
// specializations...
3535
# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/make_holder.hpp>))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
namespace boost { namespace python { namespace objects {
3232

33-
# define BOOST_PYTHON_UNFORWARD_LOCAL(n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)(a##n)
33+
# define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)(a##n)
3434

3535
template <class Pointer, class Value>
3636
struct pointer_holder : instance_holder

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace boost { namespace python { namespace objects {
2626

27-
# define BOOST_PYTHON_UNFORWARD_LOCAL(n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)(a##n)
27+
# define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)(a##n)
2828

2929
template <class Held>
3030
struct value_holder : instance_holder

0 commit comments

Comments
 (0)