Merging recent changes from trunk.

[SVN r85636]
This commit is contained in:
Emil Dotchevski
2013-09-10 05:54:53 +00:00
parent a0d47fea34
commit 107f265ead
5 changed files with 23 additions and 8 deletions

View File

@ -35,8 +35,8 @@ boost_throw_exception_test()
catch(
boost::exception & x )
{
char const * const * file=boost::get_error_info<boost::throw_function>(x);
char const * const * function=boost::get_error_info<boost::throw_file>(x);
char const * const * function=boost::get_error_info<boost::throw_function>(x);
char const * const * file=boost::get_error_info<boost::throw_file>(x);
int const * line=boost::get_error_info<boost::throw_line>(x);
BOOST_TEST( file && *file );
BOOST_TEST( function && *function );
@ -55,8 +55,8 @@ boost_throw_exception_test()
catch(
boost::exception & x )
{
char const * const * file=boost::get_error_info<boost::throw_function>(x);
char const * const * function=boost::get_error_info<boost::throw_file>(x);
char const * const * function=boost::get_error_info<boost::throw_function>(x);
char const * const * file=boost::get_error_info<boost::throw_file>(x);
int const * line=boost::get_error_info<boost::throw_line>(x);
int const * data=boost::get_error_info<test_data>(x);
BOOST_TEST( file && *file );