3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with CATCH_CONFIG_DISABLE_EXCEPTIONS enabled

This commit is contained in:
khyperia 2020-04-21 09:51:45 +02:00 committed by Martin Hořeňovský
parent 4e4171420d
commit e59fc2c3b3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/catch_assertionhandler.cpp
View File

@ -15,6 +15,7 @@
#include "catch_interfaces_registry_hub.h" #include "catch_interfaces_registry_hub.h"
#include "catch_capture_matchers.h" #include "catch_capture_matchers.h"
#include "catch_run_context.h" #include "catch_run_context.h"
#include "catch_enforce.h"
namespace Catch { namespace Catch {

4
include/internal/catch_interfaces_exception.h
View File

@ -46,6 +46,9 @@ namespace Catch {
{} {}
std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override { std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
return "";
#else
try { try {
if( it == itEnd ) if( it == itEnd )
std::rethrow_exception(std::current_exception()); std::rethrow_exception(std::current_exception());
@ -55,6 +58,7 @@ namespace Catch {
catch( T& ex ) { catch( T& ex ) {
return m_translateFunction( ex ); return m_translateFunction( ex );
} }
#endif
} }
protected: protected: