From f47cc40eae125dbd4f2447706aa4f8bdcb9e712d Mon Sep 17 00:00:00 2001 From: mat007 Date: Tue, 6 Oct 2009 22:23:31 +0000 Subject: [PATCH] Clean-up git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@58 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/mock.hpp | 8 ++++---- src/tests/turtle_test/integration_test.cpp | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index c63f2a6..1ef0846 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -184,14 +184,14 @@ namespace detail MOCK_METHOD_EXT(M, n, MOCK_SIGNATURE(M), M) #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, const,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_EXPECTATION(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) #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) #define MOCK_METHOD_TPL(M, n) \ MOCK_METHOD_EXT_TPL(M, n, MOCK_SIGNATURE_TPL(M), M) diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp index d276ed7..fa55b99 100644 --- a/src/tests/turtle_test/integration_test.cpp +++ b/src/tests/turtle_test/integration_test.cpp @@ -15,10 +15,6 @@ #include #include -#ifdef _MSC_VER -# pragma warning( disable : 4355 4505 ) -#endif - namespace { struct my_custom_mock