feedc0de/boost_preprocessor
1
0
Fork 0
forked from boostorg/preprocessor
Code Pull Requests Activity

Separate variadic and tuple limits so that variadic limits can be greater.

Browse Source
This commit is contained in:
Edward Diener
2020-08-17 21:22:13 -04:00
parent 59cdb3e5db
commit 1cf82f9928
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/preprocessor/config/limits.hpp
View File

@ -72,9 +72,6 @@
# if !(BOOST_PP_LIMIT_MAG == 256 || BOOST_PP_LIMIT_MAG == 512 || BOOST_PP_LIMIT_MAG == 1024) # if !(BOOST_PP_LIMIT_MAG == 256 || BOOST_PP_LIMIT_MAG == 512 || BOOST_PP_LIMIT_MAG == 1024)
# undef BOOST_PP_LIMIT_MAG # undef BOOST_PP_LIMIT_MAG
# define BOOST_PP_LIMIT_MAG 256 # define BOOST_PP_LIMIT_MAG 256
# if !defined(BOOST_PP_LIMIT_WHILE)
# define BOOST_PP_LIMIT_WHILE 256
# endif
# else # else
# if defined(BOOST_PP_LIMIT_WHILE) && BOOST_PP_LIMIT_WHILE < BOOST_PP_LIMIT_MAG # if defined(BOOST_PP_LIMIT_WHILE) && BOOST_PP_LIMIT_WHILE < BOOST_PP_LIMIT_MAG
# undef BOOST_PP_LIMIT_WHILE # undef BOOST_PP_LIMIT_WHILE
@ -82,11 +79,10 @@
# if !defined(BOOST_PP_LIMIT_WHILE) # if !defined(BOOST_PP_LIMIT_WHILE)
# define BOOST_PP_LIMIT_WHILE BOOST_PP_LIMIT_MAG # define BOOST_PP_LIMIT_WHILE BOOST_PP_LIMIT_MAG
# endif # endif
# if defined(BOOST_PP_LIMIT_SEQ) # if !defined(BOOST_PP_LIMIT_SEQ)
# undef BOOST_PP_LIMIT_SEQ
# endif
# define BOOST_PP_LIMIT_SEQ BOOST_PP_LIMIT_MAG # define BOOST_PP_LIMIT_SEQ BOOST_PP_LIMIT_MAG
# endif # endif
# endif
# else # else
# define BOOST_PP_LIMIT_MAG 256 # define BOOST_PP_LIMIT_MAG 256
# if !defined(BOOST_PP_LIMIT_WHILE) # if !defined(BOOST_PP_LIMIT_WHILE)
@ -110,11 +106,6 @@
# if !(BOOST_PP_LIMIT_VARIADIC == 64 || BOOST_PP_LIMIT_VARIADIC == 128 || BOOST_PP_LIMIT_VARIADIC == 256) # if !(BOOST_PP_LIMIT_VARIADIC == 64 || BOOST_PP_LIMIT_VARIADIC == 128 || BOOST_PP_LIMIT_VARIADIC == 256)
# undef BOOST_PP_LIMIT_VARIADIC # undef BOOST_PP_LIMIT_VARIADIC
# define BOOST_PP_LIMIT_VARIADIC 64 # define BOOST_PP_LIMIT_VARIADIC 64
# else
# if defined(BOOST_PP_LIMIT_TUPLE)
# undef BOOST_PP_LIMIT_TUPLE
# endif
# define BOOST_PP_LIMIT_TUPLE BOOST_PP_LIMIT_VARIADIC
# endif # endif
# else # else
# define BOOST_PP_LIMIT_VARIADIC 64 # define BOOST_PP_LIMIT_VARIADIC 64

4
test/Jamfile.v2
View File

@ -117,14 +117,14 @@ alias preprocessor_v_128
: :
[ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : array_v_128 ] [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : array_v_128 ]
[ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : tuple_v_128 ] [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=128 : tuple_v_128 ]
[ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 : variadic_v_128 ] [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=128 <define>BOOST_PP_LIMIT_TUPLE=128 : variadic_v_128 ]
; ;
alias preprocessor_v_256 alias preprocessor_v_256
: :
[ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : array_v_256 ] [ compile array.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : array_v_256 ]
[ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : tuple_v_256 ] [ compile tuple.cpp : <define>BOOST_PP_LIMIT_TUPLE=256 : tuple_v_256 ]
[ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 : variadic_v_256 ] [ compile variadic.cpp : <define>BOOST_PP_LIMIT_VARIADIC=256 <define>BOOST_PP_LIMIT_TUPLE=256 : variadic_v_256 ]
; ;
alias preprocessor_v_128_c alias preprocessor_v_128_c