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@508 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-22 07:12:27 +00:00
parent d8dafff661
commit 791f59c0cd
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
turtle/detail/lambda.hpp
View file

@ -36,22 +36,22 @@ namespace detail
template< typename T > template< typename T >
static functor_type make_val( T t ) static functor_type make_val( T t )
{ {
return mock::detail::bind( &do_identity< T >, t ); return 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 mock::detail::bind( return detail::bind(
&do_ref_identity< T >, t.get_pointer() ); &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 mock::detail::bind( &do_throw< T >, t ); return detail::bind( &do_throw< T >, t );
} }
static functor_type make_nothing() static functor_type make_nothing()
{ {
return mock::detail::bind( &do_nothing ); return detail::bind( &do_nothing );
} }
template< typename T > template< typename T >

4
turtle/detail/object_impl.hpp
View file

@ -33,7 +33,7 @@ namespace detail
boost::unit_test::const_string name ) boost::unit_test::const_string name )
{ {
if( children_.empty() ) if( children_.empty() )
mock::detail::root.add( *this ); detail::root.add( *this );
children_[ &v ].update( parent_, instance, type, name ); children_[ &v ].update( parent_, instance, type, name );
} }
virtual void add( verifiable& v ) virtual void add( verifiable& v )
@ -45,7 +45,7 @@ namespace detail
group_.remove( v ); group_.remove( v );
children_.erase( &v ); children_.erase( &v );
if( children_.empty() ) if( children_.empty() )
mock::detail::root.remove( *this ); detail::root.remove( *this );
} }
virtual void serialize( std::ostream& s, const verifiable& v ) const virtual void serialize( std::ostream& s, const verifiable& v ) const

4
turtle/detail/root.hpp
View file

@ -126,11 +126,11 @@ namespace detail
inline bool verify() inline bool verify()
{ {
return mock::detail::root.verify(); return detail::root.verify();
} }
inline void reset() inline void reset()
{ {
mock::detail::root.reset(); detail::root.reset();
} }
} // mock } // mock

2
turtle/format.hpp
View file

@ -24,7 +24,7 @@ namespace detail
{} {}
void serialize( stream& s ) const void serialize( stream& s ) const
{ {
mock::detail::serialize( s, *t_ ); detail::serialize( s, *t_ );
} }
const T* t_; const T* t_;
}; };

16
turtle/log.hpp
View file

@ -65,50 +65,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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); 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 )
{ {
mock::detail::serialize( s, t.begin(), t.end() ); detail::serialize( s, t.begin(), t.end() );
return s; return s;
} }
template< typename T > template< typename T >

2
turtle/object.hpp
View file

@ -54,7 +54,7 @@ namespace detail
BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T > BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T >
>::type* = 0 ) >::type* = 0 )
{ {
e.configure( mock::detail::root, &t, instance, type, name ); e.configure( detail::root, &t, instance, type, name );
return e; return e;
} }
} }