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

Clean-up

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@58 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2009-10-06 22:23:31 +00:00
parent a1ea17ff9f
commit f47cc40eae
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libraries/turtle/mock.hpp
View file

@ -184,14 +184,14 @@ namespace detail
MOCK_METHOD_EXT(M, n, MOCK_SIGNATURE(M), M) MOCK_METHOD_EXT(M, n, MOCK_SIGNATURE(M), M)
#define MOCK_METHOD_EXT_TPL(M, n, S, t) \ #define MOCK_METHOD_EXT_TPL(M, n, S, t) \
MOCK_METHOD_STUB(M, n, S, t,,BOOST_DEDUCED_TYPENAME) \ MOCK_METHOD_STUB(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \
MOCK_METHOD_STUB(M, n, S, t, const,BOOST_DEDUCED_TYPENAME) \ MOCK_METHOD_STUB(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \
MOCK_METHOD_EXPECTATION(S, t) MOCK_METHOD_EXPECTATION(S, t)
#define MOCK_CONST_METHOD_EXT_TPL(M, n, S, t) \ #define MOCK_CONST_METHOD_EXT_TPL(M, n, S, t) \
MOCK_METHOD_STUB(M, n, S, t, const,BOOST_DEDUCED_TYPENAME) \ MOCK_METHOD_STUB(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \
MOCK_METHOD_EXPECTATION(S, t) MOCK_METHOD_EXPECTATION(S, t)
#define MOCK_NON_CONST_METHOD_EXT_TPL(M, n, S, t) \ #define MOCK_NON_CONST_METHOD_EXT_TPL(M, n, S, t) \
MOCK_METHOD_STUB(M, n, S, t,,BOOST_DEDUCED_TYPENAME) \ MOCK_METHOD_STUB(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \
MOCK_METHOD_EXPECTATION(S, t) MOCK_METHOD_EXPECTATION(S, t)
#define MOCK_METHOD_TPL(M, n) \ #define MOCK_METHOD_TPL(M, n) \
MOCK_METHOD_EXT_TPL(M, n, MOCK_SIGNATURE_TPL(M), M) MOCK_METHOD_EXT_TPL(M, n, MOCK_SIGNATURE_TPL(M), M)

4
src/tests/turtle_test/integration_test.cpp
View file

@ -15,10 +15,6 @@
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#ifdef _MSC_VER
# pragma warning( disable : 4355 4505 )
#endif
namespace namespace
{ {
struct my_custom_mock struct my_custom_mock