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

Removed MOCK_NUM_ARGS

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@336 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-05-18 22:48:54 +00:00
parent 7d28fc0d78
commit 92019d62b0
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@
#elif BOOST_PP_LESS(9, MOCK_MAX_ARGS) #elif BOOST_PP_LESS(9, MOCK_MAX_ARGS)
# define MOCK_USE_BOOST_PHOENIX # define MOCK_USE_BOOST_PHOENIX
#endif #endif
#define MOCK_NUM_ARGS BOOST_PP_INC(MOCK_MAX_ARGS)
#ifndef BOOST_FUNCTION_MAX_ARGS #ifndef BOOST_FUNCTION_MAX_ARGS
# define BOOST_FUNCTION_MAX_ARGS MOCK_MAX_ARGS # define BOOST_FUNCTION_MAX_ARGS MOCK_MAX_ARGS

2
src/libraries/turtle/expectation.hpp
View file

@ -213,7 +213,7 @@ namespace detail
private: \ private: \
BOOST_PP_REPEAT(n, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) \ 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_METHODS
#undef MOCK_EXPECTATION_TYPEDEF #undef MOCK_EXPECTATION_TYPEDEF

4
src/libraries/turtle/function.hpp
View file

@ -106,7 +106,7 @@ namespace mock
{ \ { \
return (*impl_)( BOOST_PP_ENUM_PARAMS(n, p) ); \ 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 #undef MOCK_EXPECTATION_OPERATOR
friend std::ostream& operator<<( std::ostream& s, const function& e ) 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_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \
MOCK_EXPECTATION_INVOKE(z, n, P) 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 void test() const
MOCK_EXPECTATION_INVOKE(, 0,) MOCK_EXPECTATION_INVOKE(, 0,)