From 9a1ad0f83314b2d93e278d1939ae55bb6ea7981f Mon Sep 17 00:00:00 2001 From: mat007 Date: Sun, 22 Jul 2012 07:15:58 +0000 Subject: [PATCH] Refactoring git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@517 860be788-9bd5-4423-9f1e-828f051e677b --- turtle/detail/functor.hpp | 3 --- turtle/mock.hpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/turtle/detail/functor.hpp b/turtle/detail/functor.hpp index a33c768..2ac8c81 100644 --- a/turtle/detail/functor.hpp +++ b/turtle/detail/functor.hpp @@ -33,7 +33,4 @@ namespace detail } } // mock -#define MOCK_FUNCTOR(f, S) \ - mock::detail::functor< S > f, f##_mock - #endif // MOCK_FUNCTOR_HPP_INCLUDED diff --git a/turtle/mock.hpp b/turtle/mock.hpp index 6793b13..3fd26da 100644 --- a/turtle/mock.hpp +++ b/turtle/mock.hpp @@ -27,6 +27,8 @@ struct T : I, mock::object, mock::detail::base< I > #define MOCK_CLASS(T) \ struct T : mock::object +#define MOCK_FUNCTOR(f, S) \ + mock::detail::functor< S > f, f##_mock #define MOCK_HELPER(t) \ t##_mock( mock::detail::root, BOOST_PP_STRINGIZE(t) )