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

Fully qualifying function calls to prevent ADL

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@150 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2010-05-06 16:02:26 +00:00
parent 352520cde8
commit 62d2766e20
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ namespace detail
BOOST_DEDUCED_TYPENAME boost::disable_if< BOOST_DEDUCED_TYPENAME boost::disable_if<
BOOST_DEDUCED_TYPENAME detail::is_functor< Expected > BOOST_DEDUCED_TYPENAME detail::is_functor< Expected >
>::type* = 0 ) >::type* = 0 )
: desc_( format( expected ) ) : desc_( mock::format( expected ) )
{ {
BOOST_CONCEPT_ASSERT(( EqualityComparable< Expected, Actual > )); BOOST_CONCEPT_ASSERT(( EqualityComparable< Expected, Actual > ));
f_ = mock::equal( expected ).f_; f_ = mock::equal( expected ).f_;

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

@ -87,7 +87,7 @@ namespace protect
template< typename T1, typename T2 > template< typename T1, typename T2 >
inline std::string format( const std::pair< T1, T2 >& p ) 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 > template< typename T >
std::string format( const T& begin, const T& end ) std::string format( const T& begin, const T& end )
@ -95,7 +95,7 @@ namespace protect
std::stringstream s; std::stringstream s;
s << '('; s << '(';
for( T it = begin; it != end; ++it ) for( T it = begin; it != end; ++it )
s << (it == begin ? "" : ",") << format( *it ); s << (it == begin ? "" : ",") << mock::format( *it );
s << ')'; s << ')';
return s.str(); return s.str();
} }

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

@ -203,7 +203,7 @@ namespace mock
} }
#define MOCK_EXPECTATION_FORMAT(z, n, d) \ #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) \ #define MOCK_EXPECTATION_CONTEXT(n) \
context( BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_FORMAT, BOOST_PP_EMPTY) ) context( BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_EXPECTATION_FORMAT, BOOST_PP_EMPTY) )
#define MOCK_EXPECTATION_OPERATOR(z, n, d) \ #define MOCK_EXPECTATION_OPERATOR(z, n, d) \

3
src/libraries/turtle/mock.hpp
View file

@ -120,7 +120,8 @@ namespace detail
const std::string& name, const T& t ) const std::string& name, const T& t )
{ {
if( parent != "?" || e.tag() == "?" ) 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 ); name, t );
return e; return e;
} }

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

@ -46,7 +46,7 @@ namespace detail
const T& t ) const T& t )
{ {
return detail::placeholder< Functor >( f, return detail::placeholder< Functor >( f,
name + "( " + format( t ) + " )" ); name + "( " + mock::format( t ) + " )" );
} }
} }