mirror of
https://github.com/mat007/turtle.git
synced 2026-06-22 12:13:43 +00:00
Cleanup
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@508 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
parent
d8dafff661
commit
791f59c0cd
6 changed files with 18 additions and 18 deletions
|
|
@ -36,22 +36,22 @@ namespace detail
|
|||
template< typename 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 >
|
||||
static functor_type make_val( boost::reference_wrapper< T > t )
|
||||
{
|
||||
return mock::detail::bind(
|
||||
return detail::bind(
|
||||
&do_ref_identity< T >, t.get_pointer() );
|
||||
}
|
||||
template< typename 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()
|
||||
{
|
||||
return mock::detail::bind( &do_nothing );
|
||||
return detail::bind( &do_nothing );
|
||||
}
|
||||
|
||||
template< typename T >
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace detail
|
|||
boost::unit_test::const_string name )
|
||||
{
|
||||
if( children_.empty() )
|
||||
mock::detail::root.add( *this );
|
||||
detail::root.add( *this );
|
||||
children_[ &v ].update( parent_, instance, type, name );
|
||||
}
|
||||
virtual void add( verifiable& v )
|
||||
|
|
@ -45,7 +45,7 @@ namespace detail
|
|||
group_.remove( v );
|
||||
children_.erase( &v );
|
||||
if( children_.empty() )
|
||||
mock::detail::root.remove( *this );
|
||||
detail::root.remove( *this );
|
||||
}
|
||||
|
||||
virtual void serialize( std::ostream& s, const verifiable& v ) const
|
||||
|
|
|
|||
|
|
@ -126,11 +126,11 @@ namespace detail
|
|||
|
||||
inline bool verify()
|
||||
{
|
||||
return mock::detail::root.verify();
|
||||
return detail::root.verify();
|
||||
}
|
||||
inline void reset()
|
||||
{
|
||||
mock::detail::root.reset();
|
||||
detail::root.reset();
|
||||
}
|
||||
} // mock
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace detail
|
|||
{}
|
||||
void serialize( stream& s ) const
|
||||
{
|
||||
mock::detail::serialize( s, *t_ );
|
||||
detail::serialize( s, *t_ );
|
||||
}
|
||||
const T* t_;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,50 +65,50 @@ namespace detail
|
|||
template< typename T, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename T, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename T, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename K, typename T, typename C, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename K, typename T, typename C, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename T, typename C, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename T, typename C, typename A >
|
||||
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;
|
||||
}
|
||||
template< typename T >
|
||||
stream& operator<<( stream& s,
|
||||
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;
|
||||
}
|
||||
template< typename T >
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ namespace detail
|
|||
BOOST_DEDUCED_TYPENAME boost::is_base_of< object, T >
|
||||
>::type* = 0 )
|
||||
{
|
||||
e.configure( mock::detail::root, &t, instance, type, name );
|
||||
e.configure( detail::root, &t, instance, type, name );
|
||||
return e;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue