mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing check for BOOST_FT_MAX_ARITY when MOCK_MAX_ARGS was set to 21 or more

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@321 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-05-11 16:09:38 +00:00
parent 13cf400e82
commit 989830855c
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -21,7 +21,7 @@
<build-turtle-test name="turtle"/> <build-turtle-test name="turtle"/>
<build-turtle-test name="turtle_max_args"> <build-turtle-test name="turtle_max_args">
<defineset> <defineset>
<define name="MOCK_MAX_ARGS" value="20"/> <define name="MOCK_MAX_ARGS" value="30"/>
</defineset> </defineset>
</build-turtle-test> </build-turtle-test>
<build-turtle-test name="turtle_use_conversions"> <build-turtle-test name="turtle_use_conversions">

6
src/libraries/turtle/config.hpp
View file

@ -25,6 +25,12 @@
# error BOOST_FUNCTION_MAX_ARGS must be set to MOCK_MAX_ARGS or higher # error BOOST_FUNCTION_MAX_ARGS must be set to MOCK_MAX_ARGS or higher
#endif #endif
#ifndef BOOST_FT_MAX_ARITY
# define BOOST_FT_MAX_ARITY BOOST_PP_INC(MOCK_MAX_ARGS)
#elif BOOST_PP_LESS_EQUAL(BOOST_FT_MAX_ARITY, MOCK_MAX_ARGS)
# error BOOST_FT_MAX_ARITY must be set to MOCK_MAX_ARGS + 1 or higher
#endif
#ifdef MOCK_USE_BOOST_PHOENIX #ifdef MOCK_USE_BOOST_PHOENIX
# ifndef PHOENIX_LIMIT # ifndef PHOENIX_LIMIT
# define PHOENIX_LIMIT MOCK_MAX_ARGS # define PHOENIX_LIMIT MOCK_MAX_ARGS