From 989830855c88352d984c7a414efc2c361624aaf1 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Wed, 11 May 2011 16:09:38 +0000
Subject: [PATCH] Added missing check for BOOST_FT_MAX_ARITY when MOCK_MAX_ARGS
 was set to 21 or more

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@321 860be788-9bd5-4423-9f1e-828f051e677b
---
 build/build.xml                 | 2 +-
 src/libraries/turtle/config.hpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index 60c655c..6c07f49 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -21,7 +21,7 @@
     <build-turtle-test name="turtle"/>
     <build-turtle-test name="turtle_max_args">
       <defineset>
-        <define name="MOCK_MAX_ARGS" value="20"/>
+        <define name="MOCK_MAX_ARGS" value="30"/>
       </defineset>
     </build-turtle-test>
     <build-turtle-test name="turtle_use_conversions">
diff --git a/src/libraries/turtle/config.hpp b/src/libraries/turtle/config.hpp
index 582a695..71c14e2 100644
--- a/src/libraries/turtle/config.hpp
+++ b/src/libraries/turtle/config.hpp
@@ -25,6 +25,12 @@
 #   error BOOST_FUNCTION_MAX_ARGS must be set to MOCK_MAX_ARGS or higher
 #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
 #   ifndef PHOENIX_LIMIT
 #       define PHOENIX_LIMIT MOCK_MAX_ARGS