From 791f59c0cdb82885f4bce645fd5d77015f57b3c2 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sun, 22 Jul 2012 07:12:27 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@508 860be788-9bd5-4423-9f1e-828f051e677b
---
 turtle/detail/lambda.hpp      |  8 ++++----
 turtle/detail/object_impl.hpp |  4 ++--
 turtle/detail/root.hpp        |  4 ++--
 turtle/format.hpp             |  2 +-
 turtle/log.hpp                | 16 ++++++++--------
 turtle/object.hpp             |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/turtle/detail/lambda.hpp b/turtle/detail/lambda.hpp
index c8a95e8..699088b 100644
--- a/turtle/detail/lambda.hpp
+++ b/turtle/detail/lambda.hpp
@@ -36,22 +36,22 @@ namespace detail
         template< typename T >
         static functor_type make_val( T t )
         {
-            return mock::detail::bind( &do_identity< T >, t );
+            return detail::bind( &do_identity< T >, t );
         }
         template< typename T >
         static functor_type make_val( boost::reference_wrapper< T > t )
         {
-            return mock::detail::bind(
+            return detail::bind(
                 &do_ref_identity< T >, t.get_pointer() );
         }
         template< typename T >
         static functor_type make_throw( T t )
         {
-            return mock::detail::bind( &do_throw< T >, t );
+            return detail::bind( &do_throw< T >, t );
         }
         static functor_type make_nothing()
         {
-            return mock::detail::bind( &do_nothing );
+            return detail::bind( &do_nothing );
         }
 
         template< typename T >
diff --git a/turtle/detail/object_impl.hpp b/turtle/detail/object_impl.hpp
index 688d600..85445c5 100644
--- a/turtle/detail/object_impl.hpp
+++ b/turtle/detail/object_impl.hpp
@@ -33,7 +33,7 @@ namespace detail
             boost::unit_test::const_string name )
         {
             if( children_.empty() )
-                mock::detail::root.add( *this );
+                detail::root.add( *this );
             children_[ &v ].update( parent_, instance, type, name );
         }
         virtual void add( verifiable& v )
@@ -45,7 +45,7 @@ namespace detail
             group_.remove( v );
             children_.erase( &v );
             if( children_.empty() )
-                mock::detail::root.remove( *this );
+                detail::root.remove( *this );
         }
 
         virtual void serialize( std::ostream& s, const verifiable& v ) const
diff --git a/turtle/detail/root.hpp b/turtle/detail/root.hpp
index 734d768..aa351c9 100644
--- a/turtle/detail/root.hpp
+++ b/turtle/detail/root.hpp
@@ -126,11 +126,11 @@ namespace detail
 
     inline bool verify()
     {
-        return mock::detail::root.verify();
+        return detail::root.verify();
     }
     inline void reset()
     {
-        mock::detail::root.reset();
+        detail::root.reset();
     }
 } // mock
 
diff --git a/turtle/format.hpp b/turtle/format.hpp
index 777f3ff..31306c7 100644
--- a/turtle/format.hpp
+++ b/turtle/format.hpp
@@ -24,7 +24,7 @@ namespace detail
         {}
         void serialize( stream& s ) const
         {
-            mock::detail::serialize( s, *t_ );
+            detail::serialize( s, *t_ );
         }
         const T* t_;
     };
diff --git a/turtle/log.hpp b/turtle/log.hpp
index 4c153c5..a62c101 100644
--- a/turtle/log.hpp
+++ b/turtle/log.hpp
@@ -65,50 +65,50 @@ namespace detail
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::deque< T, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::list< T, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::vector< T, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename K, typename T, typename C, typename A >
     stream& operator<<( stream& s, const std::map< K, T, C, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename K, typename T, typename C, typename A >
     stream& operator<<( stream& s, const std::multimap< K, T, C, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename C, typename A >
     stream& operator<<( stream& s, const std::set< T, C, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename C, typename A >
     stream& operator<<( stream& s, const std::multiset< T, C, A >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T >
     stream& operator<<( stream& s,
         const boost::assign_detail::generic_list< T >& t )
     {
-        mock::detail::serialize( s, t.begin(), t.end() );
+        detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T >
diff --git a/turtle/object.hpp b/turtle/object.hpp
index 05da5d0..78d13e5 100644
--- a/turtle/object.hpp
+++ b/turtle/object.hpp
@@ -54,7 +54,7 @@ namespace detail
             BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T >
         >::type* = 0 )
     {
-        e.configure( mock::detail::root, &t, instance, type, name );
+        e.configure( detail::root, &t, instance, type, name );
         return e;
     }
 }