From e59fc2c3b329493eda676ffa7fcefc7f6059fd0b Mon Sep 17 00:00:00 2001 From: khyperia Date: Tue, 21 Apr 2020 09:51:45 +0200 Subject: [PATCH] Fix build with CATCH_CONFIG_DISABLE_EXCEPTIONS enabled --- include/internal/catch_assertionhandler.cpp | 1 + include/internal/catch_interfaces_exception.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/internal/catch_assertionhandler.cpp b/include/internal/catch_assertionhandler.cpp index 77c3f1d4..fd14c85a 100644 --- a/include/internal/catch_assertionhandler.cpp +++ b/include/internal/catch_assertionhandler.cpp @@ -15,6 +15,7 @@ #include "catch_interfaces_registry_hub.h" #include "catch_capture_matchers.h" #include "catch_run_context.h" +#include "catch_enforce.h" namespace Catch { diff --git a/include/internal/catch_interfaces_exception.h b/include/internal/catch_interfaces_exception.h index d3254d5f..43840ea0 100644 --- a/include/internal/catch_interfaces_exception.h +++ b/include/internal/catch_interfaces_exception.h @@ -46,6 +46,9 @@ namespace Catch { {} std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override { +#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) + return ""; +#else try { if( it == itEnd ) std::rethrow_exception(std::current_exception()); @@ -55,6 +58,7 @@ namespace Catch { catch( T& ex ) { return m_translateFunction( ex ); } +#endif } protected: