diff options
Diffstat (limited to 'boost/test/execution_monitor.hpp')
| -rw-r--r-- | boost/test/execution_monitor.hpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/boost/test/execution_monitor.hpp b/boost/test/execution_monitor.hpp index b01137da7b..c9036be5ba 100644 --- a/boost/test/execution_monitor.hpp +++ b/boost/test/execution_monitor.hpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2014. +// (C) Copyright Gennadiy Rozental 2001. // (C) Copyright Beman Dawes 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -415,10 +415,10 @@ public: // translator holder interface virtual int operator()( boost::function<int ()> const& F ) { - BOOST_TEST_IMPL_TRY { + BOOST_TEST_I_TRY { return m_next ? (*m_next)( F ) : F(); } - BOOST_TEST_IMPL_CATCH( ExceptionType, e ) { + BOOST_TEST_I_CATCH( ExceptionType, e ) { m_translator( e ); return boost::exit_exception_failure; } @@ -461,13 +461,11 @@ public: // Constructor explicit system_error( char const* exp ); - unit_test::readonly_property<long> p_errno; - unit_test::readonly_property<char const*> p_failed_exp; + long const p_errno; + char const* const p_failed_exp; }; -#define BOOST_TEST_SYS_ASSERT( exp ) \ - if( (exp) ) ; \ - else BOOST_TEST_IMPL_THROW( ::boost::system_error( BOOST_STRINGIZE( exp ) ) ) +#define BOOST_TEST_SYS_ASSERT( cond ) BOOST_TEST_I_ASSRT( cond, ::boost::system_error( BOOST_STRINGIZE( exp ) ) ) // ************************************************************************** // // **************Floating point exception management interface ************** // |