feedc0de/boost_throw_exception
1
0
Fork 0
forked from boostorg/throw_exception
Code Pull Requests Activity

Test (and fix) error info with virtual inheritance from boost::exception

Browse Source
This commit is contained in:
Peter Dimov
2019-11-30 21:51:32 +02:00
parent c58f418c2f
commit a2a78f6e46
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/throw_exception.hpp
View File

@ -117,10 +117,13 @@ public:
explicit wrapexcept( E const & e ): E( e )
{
boost::exception_detail::copy_boost_exception( this, &e );
}
explicit wrapexcept( E const & e, boost::source_location const & loc ): E( e )
{
boost::exception_detail::copy_boost_exception( this, &e );
set_info( *this, throw_file( loc.file_name() ) );
set_info( *this, throw_line( loc.line() ) );
set_info( *this, throw_function( loc.function_name() ) );

46
test/throw_exception_test5.cpp
View File

@ -18,6 +18,10 @@ class my_exception: public std::exception, public boost::exception
{
};
class my_exception2: public std::exception, public virtual boost::exception
{
};
int main()
{
try
@ -62,5 +66,47 @@ int main()
}
}
try
{
boost::throw_exception( my_exception2() << error_code( 123 ) << error_string( "error%%string" ) );
}
catch( boost::exception const & x )
{
{
int const * code = boost::get_error_info<error_code>( x );
BOOST_TEST( code != 0 );
BOOST_TEST_EQ( *code, 123 );
}
{
std::string const * str = boost::get_error_info<error_string>( x );
BOOST_TEST( str != 0 );
BOOST_TEST_EQ( *str, "error%%string" );
}
}
try
{
BOOST_THROW_EXCEPTION( my_exception2() << error_code( 123 ) << error_string( "error%%string" ) );
}
catch( boost::exception const & x )
{
{
int const * code = boost::get_error_info<error_code>( x );
BOOST_TEST( code != 0 );
BOOST_TEST_EQ( *code, 123 );
}
{
std::string const * str = boost::get_error_info<error_string>( x );
BOOST_TEST( str != 0 );
BOOST_TEST_EQ( *str, "error%%string" );
}
}
return boost::report_errors();
}