From 1d13a3fcde5c9a8742a3066239438f71a1c706a7 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sun, 6 Sep 2009 17:49:13 +0000
Subject: [PATCH] Reverting revision 21

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@24 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/expectation.hpp | 4 ++--
 src/libraries/turtle/object.hpp      | 4 ++--
 src/libraries/turtle/root.hpp        | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/libraries/turtle/expectation.hpp b/src/libraries/turtle/expectation.hpp
index 14fceca..c3937a5 100644
--- a/src/libraries/turtle/expectation.hpp
+++ b/src/libraries/turtle/expectation.hpp
@@ -46,11 +46,11 @@ namespace mock
                 matcher_type;
 
     public:
-        expectation( node& parent = detail::root, const std::string& name = "?" )
+        expectation( node& parent = root, const std::string& name = "?" )
             : impl_( new expectation_impl( parent, name ) )
         {}
         expectation( const std::string& name )
-            : impl_( new expectation_impl( detail::root, name ) )
+            : impl_( new expectation_impl( root, name ) )
         {}
 
         expectation& set_name( const std::string& name )
diff --git a/src/libraries/turtle/object.hpp b/src/libraries/turtle/object.hpp
index c5c07b8..e180c41 100644
--- a/src/libraries/turtle/object.hpp
+++ b/src/libraries/turtle/object.hpp
@@ -19,12 +19,12 @@ namespace mock
     class object : public node
     {
     public:
-        explicit object( node& parent = detail::root, const std::string& name = "" )
+        explicit object( node& parent = root, const std::string& name = "" )
             : node( parent )
             , name_( name )
         {}
         explicit object( const std::string& name )
-            : node( detail::root )
+            : node( root )
             , name_( name )
         {}
 
diff --git a/src/libraries/turtle/root.hpp b/src/libraries/turtle/root.hpp
index 075fc9c..addb59b 100644
--- a/src/libraries/turtle/root.hpp
+++ b/src/libraries/turtle/root.hpp
@@ -13,8 +13,6 @@
 #include <boost/test/utils/trivial_singleton.hpp>
 
 namespace mock
-{
-namespace detail
 {
     class root_t : public boost::unit_test::singleton< root_t >, public node
     {
@@ -24,15 +22,14 @@ namespace detail
         BOOST_TEST_SINGLETON_CONS( root_t );
     };
     BOOST_TEST_SINGLETON_INST( root )
-}
 
     inline bool verify()
     {
-        return detail::root.verify();
+        return root.verify();
     }
     inline void reset()
     {
-        detail::root.reset();
+        root.reset();
     }
 }