From 54c08c53a65ccfa805f65598fb7f37280ca70197 Mon Sep 17 00:00:00 2001 From: mat007 Date: Fri, 3 May 2013 20:18:05 +0000 Subject: [PATCH] Refactoring git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@636 860be788-9bd5-4423-9f1e-828f051e677b --- turtle/detail/expectation_template.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/turtle/detail/expectation_template.hpp b/turtle/detail/expectation_template.hpp index d18551c..ccd6de2 100644 --- a/turtle/detail/expectation_template.hpp +++ b/turtle/detail/expectation_template.hpp @@ -52,33 +52,33 @@ namespace detail , public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) > { BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_TYPEDEF, BOOST_PP_EMPTY) + MOCK_EXPECTATION_TYPEDEF, _) public: #ifndef MOCK_NUM_ARGS_0 expectation() : BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_INITIALIZE, BOOST_PP_EMPTY) + MOCK_EXPECTATION_INITIALIZE, _) {} template< BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, typename Constraint_) > expectation& with( BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, Constraint_, c) ) { BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_WITH, BOOST_PP_EMPTY) + MOCK_EXPECTATION_WITH, _) return *this; } #endif bool is_valid( BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_ARGS, BOOST_PP_EMPTY) ) const + MOCK_EXPECTATION_ARGS, _) ) const { return ! i_->exhausted() BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_IS_VALID, BOOST_PP_EMPTY); + MOCK_EXPECTATION_IS_VALID, _); } BOOST_PP_REPEAT(MOCK_MAX_SEQUENCES, - MOCK_EXPECTATION_IN, BOOST_PP_EMPTY) + MOCK_EXPECTATION_IN, _) expectation& once() { @@ -119,14 +119,14 @@ namespace detail #ifndef MOCK_NUM_ARGS_0 << ".with( " << BOOST_PP_REPEAT(MOCK_NUM_ARGS, - MOCK_EXPECTATION_SERIALIZE, BOOST_PP_EMPTY) + MOCK_EXPECTATION_SERIALIZE, _) << " )" #endif ; } private: BOOST_PP_REPEAT( - MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY) + MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, _) }; } } // mock