From b3a72751d882e74f6ca35f45b77c594d564a30c9 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Thu, 8 Oct 2009 15:25:30 +0000
Subject: [PATCH] Fixed naming clash

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@59 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/check.hpp  | 2 +-
 src/libraries/turtle/format.hpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libraries/turtle/check.hpp b/src/libraries/turtle/check.hpp
index 0fe6590..4b21846 100644
--- a/src/libraries/turtle/check.hpp
+++ b/src/libraries/turtle/check.hpp
@@ -46,7 +46,7 @@ namespace detail
                 BOOST_DEDUCED_TYPENAME detail::is_functor< T >::type
             >::type* = 0 )
             : functor_( equal( t ).functor_ )
-            , desc_   ( mock::format( t ) )
+            , desc_   ( format( t ) )
         {
             if( !functor_ )
                 std::invalid_argument( "invalid functor" );
diff --git a/src/libraries/turtle/format.hpp b/src/libraries/turtle/format.hpp
index dbb5602..c6be972 100644
--- a/src/libraries/turtle/format.hpp
+++ b/src/libraries/turtle/format.hpp
@@ -45,7 +45,7 @@ namespace detail
     {};
 
     template< typename T >
-    std::string format( const T& t,
+    std::string serialize( const T& t,
         BOOST_DEDUCED_TYPENAME boost::enable_if<
             BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
     {
@@ -54,7 +54,7 @@ namespace detail
         return s.str();
     }
     template< typename T >
-    std::string format( const T&,
+    std::string serialize( const T&,
         BOOST_DEDUCED_TYPENAME boost::disable_if<
             BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
     {
@@ -65,7 +65,7 @@ namespace detail
     template< typename T >
     std::string format( const T& t )
     {
-        return detail::format( t );
+        return detail::serialize( t );
     }
     inline std::string format( const std::string& s )
     {