diff options
Diffstat (limited to 'boost/test/tools/interface.hpp')
| -rw-r--r-- | boost/test/tools/interface.hpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/boost/test/tools/interface.hpp b/boost/test/tools/interface.hpp index 48d5affc4f..5e84f1c6d4 100644 --- a/boost/test/tools/interface.hpp +++ b/boost/test/tools/interface.hpp @@ -40,17 +40,9 @@ // ************** BOOST_TEST_<level> ************** // // ************************************************************************** // -#ifdef BOOST_NO_CXX11_AUTO_DECLARATIONS -#define BOOST_TEST_BUILD_ASSERTION( P ) \ - ::boost::test_tools::tt_detail::expression_holder const& E= \ - ::boost::test_tools::tt_detail::hold_expression( \ - ::boost::test_tools::assertion::seed() ->* P ) \ -/**/ -#else -#define BOOST_TEST_BUILD_ASSERTION( P ) \ - auto const& E = ::boost::test_tools::assertion::seed()->*P \ +#define BOOST_TEST_BUILD_ASSERTION( P ) \ + (::boost::test_tools::assertion::seed()->*P) \ /**/ -#endif //____________________________________________________________________________// @@ -75,10 +67,10 @@ do { \ #define BOOST_TEST_TOOL_ET_IMPL( P, level ) \ do { \ BOOST_TEST_PASSPOINT(); \ - BOOST_TEST_BUILD_ASSERTION( P ); \ + \ ::boost::test_tools::tt_detail:: \ report_assertion( \ - E.evaluate(), \ + BOOST_TEST_BUILD_ASSERTION( P ).evaluate(), \ BOOST_TEST_LAZY_MSG( BOOST_TEST_STRINGIZE( P ) ), \ BOOST_TEST_L(__FILE__), \ static_cast<std::size_t>(__LINE__), \ @@ -94,10 +86,11 @@ do { \ #define BOOST_TEST_TOOL_ET_IMPL_EX( P, level, arg ) \ do { \ BOOST_TEST_PASSPOINT(); \ - BOOST_TEST_BUILD_ASSERTION( P ); \ + \ ::boost::test_tools::tt_detail:: \ report_assertion( \ - ::boost::test_tools::tt_detail::assertion_evaluate(E) \ + ::boost::test_tools::tt_detail::assertion_evaluate( \ + BOOST_TEST_BUILD_ASSERTION( P ) ) \ << arg, \ ::boost::test_tools::tt_detail::assertion_text( \ BOOST_TEST_LAZY_MSG( BOOST_TEST_STRINGIZE(P) ), \ |