mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed naming clash

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@59 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2009-10-08 15:25:30 +00:00
parent f47cc40eae
commit b3a72751d8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libraries/turtle/check.hpp
View file

@ -46,7 +46,7 @@ namespace detail
BOOST_DEDUCED_TYPENAME detail::is_functor< T >::type BOOST_DEDUCED_TYPENAME detail::is_functor< T >::type
>::type* = 0 ) >::type* = 0 )
: functor_( equal( t ).functor_ ) : functor_( equal( t ).functor_ )
, desc_ ( mock::format( t ) ) , desc_ ( format( t ) )
{ {
if( !functor_ ) if( !functor_ )
std::invalid_argument( "invalid functor" ); std::invalid_argument( "invalid functor" );

6
src/libraries/turtle/format.hpp
View file

@ -45,7 +45,7 @@ namespace detail
{}; {};
template< typename T > template< typename T >
std::string format( const T& t, std::string serialize( const T& t,
BOOST_DEDUCED_TYPENAME boost::enable_if< BOOST_DEDUCED_TYPENAME boost::enable_if<
BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 ) BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
{ {
@ -54,7 +54,7 @@ namespace detail
return s.str(); return s.str();
} }
template< typename T > template< typename T >
std::string format( const T&, std::string serialize( const T&,
BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME boost::disable_if<
BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 ) BOOST_DEDUCED_TYPENAME detail::is_serializable< T >::type >::type* = 0 )
{ {
@ -65,7 +65,7 @@ namespace detail
template< typename T > template< typename T >
std::string format( const T& t ) std::string format( const T& t )
{ {
return detail::format( t ); return detail::serialize( t );
} }
inline std::string format( const std::string& s ) inline std::string format( const std::string& s )
{ {