diff options
| author | Phil Nash | 2013-04-23 20:52:49 +0100 |
|---|---|---|
| committer | Phil Nash | 2013-04-23 20:52:49 +0100 |
| commit | bf37e6879a37d74bde7eedb688506ee642229ff1 (patch) | |
| tree | 1a061170c6ad2f087a7660ffb730f1d413d98406 /include | |
| parent | 2a9d8d9e368a8da58733df6746baff4bb76312d2 (diff) | |
| download | catch3-bf37e6879a37d74bde7eedb688506ee642229ff1.tar.gz | |
Removed use of compiler specific techniques for denoting non-returning functions
- use if( Catch::isTrue( true) ) to guard throws instead
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_capture.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_commandline.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_common.h | 15 | ||||
| -rw-r--r-- | include/internal/catch_test_registry.hpp | 12 |
5 files changed, 9 insertions, 30 deletions
diff --git a/include/catch.hpp b/include/catch.hpp index 6e57a9da..a9fbfdba 100644 --- a/include/catch.hpp +++ b/include/catch.hpp @@ -80,12 +80,10 @@ #ifdef CATCH_CONFIG_VARIADIC_MACROS #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) - #define CATCH_TEST_CASE_NORETURN( ... ) INTERNAL_CATCH_TESTCASE_NORETURN( __VA_ARGS__ ) #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) #else #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define CATCH_TEST_CASE_NORETURN( name, description ) INTERNAL_CATCH_TESTCASE_NORETURN( name, description ) #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) #endif @@ -141,12 +139,10 @@ #ifdef CATCH_CONFIG_VARIADIC_MACROS #define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) - #define TEST_CASE_NORETURN( ... ) INTERNAL_CATCH_TESTCASE_NORETURN( __VA_ARGS__ ) #define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) #define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) #else #define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define TEST_CASE_NORETURN( name, description ) INTERNAL_CATCH_TESTCASE_NORETURN( name, description ) #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) #endif diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index a8aa98b1..cf143244 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -57,10 +57,6 @@ namespace Catch { struct TestFailureException{}; - -// This is just here to avoid compiler warnings with macro constants and boolean literals -inline bool isTrue( bool value ){ return value; } - } // end namespace Catch /////////////////////////////////////////////////////////////////////////////// diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 7657da6b..6c050f55 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -44,7 +44,6 @@ namespace Catch { std::string operator[]( std::size_t i ) const { return m_args[i]; } std::size_t argsCount() const { return m_args.size(); } - CATCH_ATTRIBUTE_NORETURN void raiseError( std::string const& message ) const { std::ostringstream oss; if( m_name.empty() ) @@ -56,7 +55,8 @@ namespace Catch { oss << " Arguments were:"; for( std::size_t i = 0; i < m_args.size(); ++i ) oss << " " << m_args[i]; - throw std::domain_error( oss.str() ); + if( isTrue( true ) ) + throw std::domain_error( oss.str() ); } private: diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 954f6170..7e74965a 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -15,16 +15,12 @@ #define INTERNAL_CATCH_STRINGIFY2( expr ) #expr #define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr ) -#ifdef __GNUC__ -#define CATCH_ATTRIBUTE_NORETURN __attribute__ ((noreturn)) -#else -#define CATCH_ATTRIBUTE_NORETURN -#endif - #include <sstream> #include <stdexcept> #include <algorithm> +#include "catch_compiler_capabilities.h" + namespace Catch { class NonCopyable { @@ -134,11 +130,14 @@ namespace Catch { return os; } - CATCH_ATTRIBUTE_NORETURN + // This is just here to avoid compiler warnings with macro constants and boolean literals + inline bool isTrue( bool value ){ return value; } + inline void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) { std::ostringstream oss; oss << locationInfo << ": Internal Catch error: '" << message << "'"; - throw std::logic_error( oss.str() ); + if( isTrue( true )) + throw std::logic_error( oss.str() ); } } diff --git a/include/internal/catch_test_registry.hpp b/include/internal/catch_test_registry.hpp index 65fe760f..fde21d35 100644 --- a/include/internal/catch_test_registry.hpp +++ b/include/internal/catch_test_registry.hpp @@ -81,12 +81,6 @@ private: static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE_NORETURN( ... ) \ - static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() CATCH_ATTRIBUTE_NORETURN; \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ ), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); }\ - static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() - - /////////////////////////////////////////////////////////////////////////////// #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \ namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); } @@ -108,12 +102,6 @@ private: static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE_NORETURN( Name, Desc ) \ - static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() CATCH_ATTRIBUTE_NORETURN; \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ ), CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); }\ - static void INTERNAL_CATCH_UNIQUE_NAME( TestCaseFunction_catch_internal_ )() - - /////////////////////////////////////////////////////////////////////////////// #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \ namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); } |