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

Cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@282 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-03-26 13:34:32 +00:00
parent 1a2cdf0647
commit 5aa5cceb88
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,11 +66,11 @@ namespace detail
friend std::ostream& operator<<( std::ostream& s, const check_base& c ) friend std::ostream& operator<<( std::ostream& s, const check_base& c )
{ {
c.format( s ); c.serialize( s );
return s; return s;
} }
private: private:
virtual void format( std::ostream& ) const = 0; virtual void serialize( std::ostream& ) const = 0;
}; };
template< typename Actual, typename Expected, typename Enable = void > template< typename Actual, typename Expected, typename Enable = void >
@ -87,7 +87,7 @@ namespace detail
{ {
return actual == expected_; return actual == expected_;
} }
virtual void format( std::ostream& s ) const virtual void serialize( std::ostream& s ) const
{ {
s << mock::format( expected_ ); s << mock::format( expected_ );
} }
@ -110,7 +110,7 @@ namespace detail
{ {
return c_( actual ); return c_( actual );
} }
virtual void format( std::ostream& s ) const virtual void serialize( std::ostream& s ) const
{ {
s << mock::format( c_ ); s << mock::format( c_ );
} }
@ -136,7 +136,7 @@ namespace detail
{ {
return f_( actual ); return f_( actual );
} }
virtual void format( std::ostream& s ) const virtual void serialize( std::ostream& s ) const
{ {
s << mock::format( f_ ); s << mock::format( f_ );
} }

8
src/libraries/turtle/lambda.hpp
View file

@ -36,21 +36,21 @@ namespace detail
template< typename T > template< typename T >
static functor_type make_val( T 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 > template< typename T >
static functor_type make_val( boost::reference_wrapper< T > 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 > template< typename T >
static functor_type make_throw( T 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() static functor_type make_nothing()
{ {
return detail::bind( &do_nothing ); return mock::detail::bind( &do_nothing );
} }
template< typename T > template< typename T >

18
src/libraries/turtle/log.hpp
View file

@ -146,7 +146,7 @@ namespace detail2
{} {}
void serialize( stream& s ) const void serialize( stream& s ) const
{ {
detail2::serialize( s, *t_ ); mock::detail2::serialize( s, *t_ );
} }
const T* t_; const T* t_;
}; };
@ -195,50 +195,50 @@ namespace detail
template< typename T, typename A > template< typename T, typename A >
stream& operator<<( stream& s, const std::deque< T, A >& t ) 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; return s;
} }
template< typename T, typename A > template< typename T, typename A >
stream& operator<<( stream& s, const std::list< T, A >& t ) 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; return s;
} }
template< typename T, typename A > template< typename T, typename A >
stream& operator<<( stream& s, const std::vector< T, A >& t ) 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; return s;
} }
template< typename K, typename T, typename C, typename A > template< typename K, typename T, typename C, typename A >
stream& operator<<( stream& s, const std::map< K, T, C, A >& t ) 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; return s;
} }
template< typename K, typename T, typename C, typename A > template< typename K, typename T, typename C, typename A >
stream& operator<<( stream& s, const std::multimap< K, T, C, A >& t ) 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; return s;
} }
template< typename T, typename C, typename A > template< typename T, typename C, typename A >
stream& operator<<( stream& s, const std::set< T, C, A >& t ) 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; return s;
} }
template< typename T, typename C, typename A > template< typename T, typename C, typename A >
stream& operator<<( stream& s, const std::multiset< T, C, A >& t ) 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; return s;
} }
template< typename T > template< typename T >
stream& operator<<( stream& s, stream& operator<<( stream& s,
const boost::assign_detail::generic_list< T >& t ) 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; return s;
} }