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@768 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2015-03-01 11:28:33 +00:00
parent 20be7d84d0
commit 96f5d1959a
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
turtle/detail/function_impl_template.hpp
View file

@ -38,9 +38,6 @@ namespace detail
{
public:
typedef safe_error< R, MOCK_ERROR_POLICY< R > > error_type;
typedef expectation<
R ( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, T) )
> expectation_type;
public:
function_impl()
@ -90,11 +87,14 @@ namespace detail
}
private:
template< typename T >
struct wrapper : wrapper_base< T, expectation_type >
typedef expectation<
R( BOOST_PP_ENUM_PARAMS( MOCK_NUM_ARGS, T ) )
> expectation_type;
struct wrapper : wrapper_base< R, expectation_type >
{
wrapper( const boost::shared_ptr< mutex >& m, expectation_type& e )
: wrapper_base< T, expectation_type >( e )
: wrapper_base< R, expectation_type >( e )
, lock_( m )
{}
@ -178,21 +178,21 @@ namespace detail
};
public:
typedef wrapper< R > wrapper_type;
typedef wrapper wrapper_type;
wrapper_type expect( const char* file, int line )
wrapper expect( const char* file, int line )
{
lock _( mutex_ );
expectations_.push_back( expectation_type( file, line ) );
valid_ = true;
return wrapper_type( mutex_, expectations_.back() );
return wrapper( mutex_, expectations_.back() );
}
wrapper_type expect()
wrapper expect()
{
lock _( mutex_ );
expectations_.push_back( expectation_type() );
valid_ = true;
return wrapper_type( mutex_, expectations_.back() );
return wrapper( mutex_, expectations_.back() );
}
R operator()(