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 unneeded typedef

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@766 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2015-03-01 11:27:57 +00:00
parent 6503e69624
commit e76e9fb5bc
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
turtle/detail/expectation_template.hpp
View file

@ -6,23 +6,20 @@
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#define MOCK_EXPECTATION_TYPEDEF(z, n, d) \
typedef T##n arg##n##_type;
#define MOCK_EXPECTATION_INITIALIZE(z, n, d) \ #define MOCK_EXPECTATION_INITIALIZE(z, n, d) \
BOOST_PP_COMMA_IF(n) c##n##_( \ BOOST_PP_COMMA_IF(n) c##n##_( \
boost::make_shared< \ boost::make_shared< \
matcher< arg##n##_type, constraint< any > > >( mock::any ) ) matcher< T##n, constraint< any > > >( mock::any ) )
#define MOCK_EXPECTATION_WITH(z, n, d) \ #define MOCK_EXPECTATION_WITH(z, n, d) \
c##n##_ = boost::make_shared< \ c##n##_ = boost::make_shared< \
matcher< arg##n##_type, Constraint_##n > >( c##n ); matcher< T##n, Constraint_##n > >( c##n );
#define MOCK_EXPECTATION_MEMBER(z, n, d) \ #define MOCK_EXPECTATION_MEMBER(z, n, d) \
boost::shared_ptr< matcher_base< arg##n##_type > > c##n##_; boost::shared_ptr< matcher_base< T##n > > c##n##_;
#define MOCK_EXPECTATION_ARGS(z, n, d) \ #define MOCK_EXPECTATION_ARGS(z, n, d) \
BOOST_PP_COMMA_IF(n) arg##n##_type a##n BOOST_PP_COMMA_IF(n) T##n a##n
#define MOCK_EXPECTATION_IS_VALID(z, n, d) \ #define MOCK_EXPECTATION_IS_VALID(z, n, d) \
&& (*c##n##_)( a##n ) && (*c##n##_)( a##n )
@ -51,9 +48,6 @@ namespace detail
class expectation< R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) > class expectation< R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) >
: public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) > : public action< R, R (BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS,T)) >
{ {
BOOST_PP_REPEAT(MOCK_NUM_ARGS,
MOCK_EXPECTATION_TYPEDEF, _)
public: public:
expectation() expectation()
: BOOST_PP_REPEAT(MOCK_NUM_ARGS, : BOOST_PP_REPEAT(MOCK_NUM_ARGS,