From 5aa5cceb8808c1da00e4a2b0985a9e3c3003b1e6 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sat, 26 Mar 2011 13:34:32 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@282 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/check.hpp  | 10 +++++-----
 src/libraries/turtle/lambda.hpp |  8 ++++----
 src/libraries/turtle/log.hpp    | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libraries/turtle/check.hpp b/src/libraries/turtle/check.hpp
index c880ef7..5846ec9 100644
--- a/src/libraries/turtle/check.hpp
+++ b/src/libraries/turtle/check.hpp
@@ -66,11 +66,11 @@ namespace detail
 
         friend std::ostream& operator<<( std::ostream& s, const check_base& c )
         {
-            c.format( s );
+            c.serialize( s );
             return s;
         }
     private:
-        virtual void format( std::ostream& ) const = 0;
+        virtual void serialize( std::ostream& ) const = 0;
     };
 
     template< typename Actual, typename Expected, typename Enable = void >
@@ -87,7 +87,7 @@ namespace detail
         {
             return actual == expected_;
         }
-        virtual void format( std::ostream& s ) const
+        virtual void serialize( std::ostream& s ) const
         {
             s << mock::format( expected_ );
         }
@@ -110,7 +110,7 @@ namespace detail
         {
             return c_( actual );
         }
-        virtual void format( std::ostream& s ) const
+        virtual void serialize( std::ostream& s ) const
         {
             s << mock::format( c_ );
         }
@@ -136,7 +136,7 @@ namespace detail
         {
             return f_( actual );
         }
-        virtual void format( std::ostream& s ) const
+        virtual void serialize( std::ostream& s ) const
         {
             s << mock::format( f_ );
         }
diff --git a/src/libraries/turtle/lambda.hpp b/src/libraries/turtle/lambda.hpp
index 01019c0..101f1c5 100644
--- a/src/libraries/turtle/lambda.hpp
+++ b/src/libraries/turtle/lambda.hpp
@@ -36,21 +36,21 @@ namespace detail
         template< typename T >
         static functor_type make_val( T t )
         {
-            return detail::bind( &do_identity< T >, t );
+            return mock::detail::bind( &do_identity< T >, t );
         }
         template< typename T >
         static functor_type make_val( boost::reference_wrapper< T > t )
         {
-            return detail::bind( &do_ref_identity< T >, t.get_pointer() );
+            return mock::detail::bind( &do_ref_identity< T >, t.get_pointer() );
         }
         template< typename T >
         static functor_type make_throw( T t )
         {
-            return detail::bind( &do_throw< T >, t );
+            return mock::detail::bind( &do_throw< T >, t );
         }
         static functor_type make_nothing()
         {
-            return detail::bind( &do_nothing );
+            return mock::detail::bind( &do_nothing );
         }
 
         template< typename T >
diff --git a/src/libraries/turtle/log.hpp b/src/libraries/turtle/log.hpp
index 079f37b..9def4bd 100644
--- a/src/libraries/turtle/log.hpp
+++ b/src/libraries/turtle/log.hpp
@@ -146,7 +146,7 @@ namespace detail2
         {}
         void serialize( stream& s ) const
         {
-            detail2::serialize( s, *t_ );
+            mock::detail2::serialize( s, *t_ );
         }
         const T* t_;
     };
@@ -195,50 +195,50 @@ namespace detail
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::deque< T, A >& t )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::list< T, A >& t )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T, typename A >
     stream& operator<<( stream& s, const std::vector< T, A >& t )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::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 )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::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 )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::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 )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::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 )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::detail::serialize( s, t.begin(), t.end() );
         return s;
     }
     template< typename T >
     stream& operator<<( stream& s,
         const boost::assign_detail::generic_list< T >& t )
     {
-        detail::serialize( s, t.begin(), t.end() );
+        mock::detail::serialize( s, t.begin(), t.end() );
         return s;
     }