From 92019d62b02becf3a0c04e61abe32a8a93f2a9c8 Mon Sep 17 00:00:00 2001 From: mat007 Date: Wed, 18 May 2011 22:48:54 +0000 Subject: [PATCH] Removed MOCK_NUM_ARGS git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@336 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/config.hpp | 1 - src/libraries/turtle/expectation.hpp | 2 +- src/libraries/turtle/function.hpp | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libraries/turtle/config.hpp b/src/libraries/turtle/config.hpp index 71c14e2..c3d4081 100644 --- a/src/libraries/turtle/config.hpp +++ b/src/libraries/turtle/config.hpp @@ -17,7 +17,6 @@ #elif BOOST_PP_LESS(9, MOCK_MAX_ARGS) # define MOCK_USE_BOOST_PHOENIX #endif -#define MOCK_NUM_ARGS BOOST_PP_INC(MOCK_MAX_ARGS) #ifndef BOOST_FUNCTION_MAX_ARGS # define BOOST_FUNCTION_MAX_ARGS MOCK_MAX_ARGS diff --git a/src/libraries/turtle/expectation.hpp b/src/libraries/turtle/expectation.hpp index 927cbfb..06499c6 100644 --- a/src/libraries/turtle/expectation.hpp +++ b/src/libraries/turtle/expectation.hpp @@ -213,7 +213,7 @@ namespace detail private: \ BOOST_PP_REPEAT(n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \ }; - BOOST_PP_REPEAT_FROM_TO(1, MOCK_NUM_ARGS, MOCK_EXPECTATION, BOOST_PP_EMPTY) + BOOST_PP_REPEAT_FROM_TO(1, BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_EXPECTATION, BOOST_PP_EMPTY) #undef MOCK_EXPECTATION_METHODS #undef MOCK_EXPECTATION_TYPEDEF diff --git a/src/libraries/turtle/function.hpp b/src/libraries/turtle/function.hpp index 6e09bf1..30d604f 100644 --- a/src/libraries/turtle/function.hpp +++ b/src/libraries/turtle/function.hpp @@ -106,7 +106,7 @@ namespace mock { \ return (*impl_)( BOOST_PP_ENUM_PARAMS(n, p) ); \ } - BOOST_PP_REPEAT_FROM_TO(1, MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, BOOST_PP_EMPTY) + BOOST_PP_REPEAT_FROM_TO(1, BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_EXPECTATION_OPERATOR, BOOST_PP_EMPTY) #undef MOCK_EXPECTATION_OPERATOR friend std::ostream& operator<<( std::ostream& s, const function& e ) @@ -237,7 +237,7 @@ namespace mock MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \ MOCK_EXPECTATION_INVOKE(z, n, P) - BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort()) + BOOST_PP_REPEAT(BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_EXPECTATION_OPERATOR, ErrorPolicy::abort()) void test() const MOCK_EXPECTATION_INVOKE(, 0,)