Refactoring

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@320 860be788-9bd5-4423-9f1e-828f051e677b

src/libraries/turtle/config.hpp

@@ -9,27 +9,28 @@
 #ifndef MOCK_CONFIG_HPP_INCLUDED
 #define MOCK_CONFIG_HPP_INCLUDED
 
-#include <boost/preprocessor/inc.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/comparison/less.hpp>
 
 #ifndef MOCK_MAX_ARGS
 #  define MOCK_MAX_ARGS 9
+#elif BOOST_PP_LESS(9, MOCK_MAX_ARGS)
+#   define MOCK_USE_BOOST_PHOENIX
 #endif
 #define MOCK_NUM_ARGS BOOST_PP_INC(MOCK_MAX_ARGS)
 
-#if defined(MOCK_USE_BOOST_PHOENIX) || (MOCK_MAX_ARGS > 9)
-#   ifndef PHOENIX_LIMIT
-#       define PHOENIX_LIMIT MOCK_MAX_ARGS
-#   elif (PHOENIX_LIMIT < MOCK_MAX_ARGS)
-#       error PHOENIX_LIMIT must be set to MOCK_MAX_ARGS or higher
-#   endif
-#else
-#   define MOCK_USE_BOOST_BIND
-#endif
-
 #ifndef BOOST_FUNCTION_MAX_ARGS
 #   define BOOST_FUNCTION_MAX_ARGS MOCK_MAX_ARGS
-#elif (BOOST_FUNCTION_MAX_ARGS < MOCK_MAX_ARGS)
+#elif BOOST_PP_LESS(BOOST_FUNCTION_MAX_ARGS, MOCK_MAX_ARGS)
 #   error BOOST_FUNCTION_MAX_ARGS must be set to MOCK_MAX_ARGS or higher
 #endif
 
+#ifdef MOCK_USE_BOOST_PHOENIX
+#   ifndef PHOENIX_LIMIT
+#       define PHOENIX_LIMIT MOCK_MAX_ARGS
+#   elif BOOST_PP_LESS(PHOENIX_LIMIT, MOCK_MAX_ARGS)
+#       error PHOENIX_LIMIT must be set to MOCK_MAX_ARGS or higher
+#   endif
+#endif
+
 #endif // MOCK_CONFIG_HPP_INCLUDED

src/libraries/turtle/lambda.hpp

@@ -10,10 +10,10 @@
 #define MOCK_LAMBDA_HPP_INCLUDED
 
 #include "config.hpp"
-#ifdef MOCK_USE_BOOST_BIND
+#ifdef MOCK_USE_BOOST_PHOENIX
-#include <boost/bind.hpp>
-#else
 #include <boost/spirit/home/phoenix/bind.hpp>
+#else
+#include <boost/bind.hpp>
 #endif
 #include <boost/function.hpp>
 
@@ -21,10 +21,10 @@ namespace mock
 {
 namespace detail
 {
-#ifdef MOCK_USE_BOOST_BIND
+#ifdef MOCK_USE_BOOST_PHOENIX
-    using boost::bind;
-#else
     using boost::phoenix::bind;
+#else
+    using boost::bind;
 #endif
 
     template< typename Result, typename Signature >