From 30480d031a0290afb861d7be3653d68e1178e651 Mon Sep 17 00:00:00 2001 From: mat007 Date: Sun, 27 Sep 2009 20:52:53 +0000 Subject: [PATCH] Clean-up git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@56 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/object.hpp | 9 ++------- src/tests/turtle_test/integration_test.cpp | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/libraries/turtle/object.hpp b/src/libraries/turtle/object.hpp index 79e4858..94c3725 100644 --- a/src/libraries/turtle/object.hpp +++ b/src/libraries/turtle/object.hpp @@ -10,7 +10,6 @@ #define MOCK_OBJECT_HPP_INCLUDED #include "node.hpp" -#include "root.hpp" #include #include #include @@ -20,8 +19,8 @@ namespace mock class object { public: - explicit object( const std::string& name = "" ) - : impl_( new object_impl( name ) ) + object() + : impl_( new object_impl() ) {} void tag( const std::string& name ) @@ -52,10 +51,6 @@ namespace mock class object_impl : public node { public: - explicit object_impl( const std::string& name ) - : name_( name ) - {} - std::string name_; private: diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp index 1f31fa7..9f3ac19 100644 --- a/src/tests/turtle_test/integration_test.cpp +++ b/src/tests/turtle_test/integration_test.cpp @@ -36,11 +36,8 @@ BOOST_AUTO_TEST_CASE( custom_mock_object_without_macros_and_without_inheriting_f namespace { - struct my_custom_mock_object : mock::object + struct my_custom_mock_object { - my_custom_mock_object() - : mock::object( "my_custom_mock_object" ) - {} MOCK_METHOD_EXT( my_method, 0, void(), my_method ) }; }