From aa816535b4a379c4a10354df7ba352847d7e4557 Mon Sep 17 00:00:00 2001 From: mat007 Date: Thu, 6 May 2010 16:33:45 +0000 Subject: [PATCH] Made boost_test_error_policy throw a mock::exception extending boost::execution_aborted (helpful in order to filter on exceptions) git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@151 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/error.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libraries/turtle/error.hpp b/src/libraries/turtle/error.hpp index 6797293..93f8392 100644 --- a/src/libraries/turtle/error.hpp +++ b/src/libraries/turtle/error.hpp @@ -22,13 +22,16 @@ namespace mock { #ifdef MOCK_USE_BOOST_TEST + + struct exception : public boost::execution_aborted + {}; + template< typename Result > struct boost_test_error_policy { static Result abort() { - throw boost::enable_current_exception( - boost::execution_aborted() ); + throw boost::enable_current_exception( exception() ); } static void missing_action( const std::string& context, @@ -70,11 +73,14 @@ namespace mock << boost::unit_test::log::end(); } }; -#endif // MOCK_USE_BOOST_TEST + +#else // MOCK_USE_BOOST_TEST struct exception {}; +#endif // MOCK_USE_BOOST_TEST + template< typename Result > struct basic_error_policy {