git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@415 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-02-26 13:11:01 +00:00
parent 97eedfc240
commit a1d2f27add
2 changed files with 8 additions and 5 deletions

View file

@ -33,7 +33,7 @@ namespace mock
static void checkpoint( const char* file, int line )
{
boost::unit_test::unit_test_log.set_checkpoint( file,
(std::size_t)line );
static_cast< std::size_t >( line ) );
}
template< typename Context >
@ -43,7 +43,8 @@ namespace mock
{
boost::unit_test::framework::assertion_result( false );
boost::unit_test::unit_test_log
<< boost::unit_test::log::begin( file, (std::size_t)line )
<< boost::unit_test::log::begin( file,
static_cast< std::size_t >( line ) )
<< boost::unit_test::log_all_errors
<< message << ": " << context
<< boost::unit_test::log::end();
@ -55,7 +56,8 @@ namespace mock
{
boost::unit_test::framework::assertion_result( true );
boost::unit_test::unit_test_log
<< boost::unit_test::log::begin( file, (std::size_t)line )
<< boost::unit_test::log::begin( file,
static_cast< std::size_t >( line ) )
<< boost::unit_test::log_successful_tests
<< "mock expectation fulfilled: " << context
<< boost::unit_test::log::end();

View file

@ -59,9 +59,10 @@ namespace detail
#endif
serialize( s, name );
}
void serialize( std::ostream& s, boost::unit_test::const_string name ) const
void serialize( std::ostream& s,
boost::unit_test::const_string name ) const
{
std::size_t p = name.rfind( "::" );
boost::unit_test::const_string::size_type p = name.rfind( "::" );
if( p != boost::unit_test::const_string::npos )
{
s << name.substr( p + 2 );