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@581 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
parent
970b9b6b7b
commit
3c0bb8e16e
8 changed files with 79 additions and 82 deletions
|
|
@ -50,7 +50,7 @@ namespace detail
|
|||
|
||||
void calls( const functor_type& f )
|
||||
{
|
||||
if( !f )
|
||||
if( ! f )
|
||||
throw std::invalid_argument( "null functor" );
|
||||
f_ = f;
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ namespace detail
|
|||
|
||||
void calls( const functor_type& f )
|
||||
{
|
||||
if( !f )
|
||||
if( ! f )
|
||||
throw std::invalid_argument( "null functor" );
|
||||
f_ = f;
|
||||
}
|
||||
|
|
@ -127,7 +127,7 @@ namespace detail
|
|||
|
||||
void calls( const functor_type& f )
|
||||
{
|
||||
if( !f )
|
||||
if( ! f )
|
||||
throw std::invalid_argument( "null functor" );
|
||||
f_ = f;
|
||||
}
|
||||
|
|
@ -173,7 +173,7 @@ namespace detail
|
|||
|
||||
void calls( const functor_type& f )
|
||||
{
|
||||
if( !f )
|
||||
if( ! f )
|
||||
throw std::invalid_argument( "null functor" );
|
||||
f_ = f;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,4 +128,3 @@ namespace detail
|
|||
#undef MOCK_EXPECTATION_ARGS
|
||||
#undef MOCK_EXPECTATION_IS_VALID
|
||||
#undef MOCK_EXPECTATION_SERIALIZE
|
||||
#undef MOCK_EXPECTATION
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ namespace detail
|
|||
{
|
||||
for( expectations_cit it = expectations_.begin();
|
||||
it != expectations_.end(); ++it )
|
||||
if( !it->verify() )
|
||||
if( ! it->verify() )
|
||||
{
|
||||
valid_ = false;
|
||||
error_type::fail( "verification failed",
|
||||
|
|
@ -133,9 +133,9 @@ namespace detail
|
|||
}
|
||||
|
||||
friend std::ostream& operator<<(
|
||||
std::ostream& s, const function_impl& e )
|
||||
std::ostream& s, const function_impl& impl )
|
||||
{
|
||||
return s << lazy_context( &e ) << lazy_expectations( &e );
|
||||
return s << lazy_context( &impl ) << lazy_expectations( &impl );
|
||||
}
|
||||
|
||||
struct lazy_context
|
||||
|
|
|
|||
|
|
@ -30,8 +30,7 @@ namespace detail
|
|||
virtual bool invoked() const = 0;
|
||||
virtual bool exhausted() const = 0;
|
||||
|
||||
friend inline std::ostream& operator<<(
|
||||
std::ostream& s, const invocation& i )
|
||||
friend std::ostream& operator<<( std::ostream& s, const invocation& i )
|
||||
{
|
||||
return i.serialize( s );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue