diff --git a/src/libraries/turtle/check.hpp b/src/libraries/turtle/check.hpp index 13b1343..d6fb2ac 100644 --- a/src/libraries/turtle/check.hpp +++ b/src/libraries/turtle/check.hpp @@ -81,7 +81,7 @@ namespace detail BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME detail::is_functor< Expected > >::type* = 0 ) - : desc_( format( expected ) ) + : desc_( mock::format( expected ) ) { BOOST_CONCEPT_ASSERT(( EqualityComparable< Expected, Actual > )); f_ = mock::equal( expected ).f_; diff --git a/src/libraries/turtle/format.hpp b/src/libraries/turtle/format.hpp index 67edc5d..72743f8 100644 --- a/src/libraries/turtle/format.hpp +++ b/src/libraries/turtle/format.hpp @@ -87,7 +87,7 @@ namespace protect template< typename T1, typename T2 > inline std::string format( const std::pair< T1, T2 >& p ) { - return '(' + format( p.first ) + ',' + format( p.second ) + ')'; + return '(' + mock::format( p.first ) + ',' + mock::format( p.second ) + ')'; } template< typename T > std::string format( const T& begin, const T& end ) @@ -95,7 +95,7 @@ namespace protect std::stringstream s; s << '('; for( T it = begin; it != end; ++it ) - s << (it == begin ? "" : ",") << format( *it ); + s << (it == begin ? "" : ",") << mock::format( *it ); s << ')'; return s.str(); } diff --git a/src/libraries/turtle/function.hpp b/src/libraries/turtle/function.hpp index e61c3b6..efd3ed9 100644 --- a/src/libraries/turtle/function.hpp +++ b/src/libraries/turtle/function.hpp @@ -203,7 +203,7 @@ namespace mock } #define MOCK_EXPECTATION_FORMAT(z, n, d) \ - BOOST_PP_IF(n, + ", " +,) format( p##n ) + BOOST_PP_IF(n, + ", " +,) mock::format( p##n ) #define MOCK_EXPECTATION_CONTEXT(n) \ context( BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_FORMAT, BOOST_PP_EMPTY) ) #define MOCK_EXPECTATION_OPERATOR(z, n, d) \ diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index bfa3afc..7265a60 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -120,7 +120,8 @@ namespace detail const std::string& name, const T& t ) { if( parent != "?" || e.tag() == "?" ) - set_parent( e, parent + op + type_name( typeid( T ) ) + "::", + mock::detail::set_parent( e, + parent + op + mock::detail::type_name( typeid( T ) ) + "::", name, t ); return e; } diff --git a/src/libraries/turtle/placeholder.hpp b/src/libraries/turtle/placeholder.hpp index 13c41e1..d14907e 100644 --- a/src/libraries/turtle/placeholder.hpp +++ b/src/libraries/turtle/placeholder.hpp @@ -46,7 +46,7 @@ namespace detail const T& t ) { return detail::placeholder< Functor >( f, - name + "( " + format( t ) + " )" ); + name + "( " + mock::format( t ) + " )" ); } }