diff options
| author | Martin Hořeňovský | 2019-12-09 10:04:26 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-12-09 10:04:26 +0100 |
| commit | 8b42acc328fc7b6c4526e649a30c4b3c198c974d (patch) | |
| tree | ef40c6b022489a98abedb04657013e775bb04291 /src | |
| parent | 29b441949cc09f59a867972cbbac4b88f1a10843 (diff) | |
| download | catch3-8b42acc328fc7b6c4526e649a30c4b3c198c974d.tar.gz | |
Reintegrate extra tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/catch2/catch_assertionhandler.cpp | 1 | ||||
| -rw-r--r-- | src/catch2/catch_interfaces_exception.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/catch2/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp index 2f2e8ecd..892e78a4 100644 --- a/src/catch2/catch_assertionhandler.cpp +++ b/src/catch2/catch_assertionhandler.cpp @@ -11,6 +11,7 @@ #include <catch2/catch_interfaces_runner.h> #include <catch2/catch_interfaces_config.h> #include <catch2/catch_context.h> +#include <catch2/catch_enforce.h> #include <catch2/catch_debugger.h> #include <catch2/catch_interfaces_registry_hub.h> #include <catch2/catch_capture_matchers.h> diff --git a/src/catch2/catch_interfaces_exception.h b/src/catch2/catch_interfaces_exception.h index 0afbd67b..0f9fbd32 100644 --- a/src/catch2/catch_interfaces_exception.h +++ b/src/catch2/catch_interfaces_exception.h @@ -9,6 +9,7 @@ #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED #include <catch2/catch_interfaces_registry_hub.h> +#include <catch2/catch_compiler_capabilities.h> #if defined(CATCH_CONFIG_DISABLE) #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \ @@ -46,6 +47,7 @@ namespace Catch { {} std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override { +#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) try { if( it == itEnd ) std::rethrow_exception(std::current_exception()); @@ -55,6 +57,9 @@ namespace Catch { catch( T& ex ) { return m_translateFunction( ex ); } +#else + return "You should never get here!"; +#endif } protected: |