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

Fix build errors.

This commit is contained in:
Scott Hutchinson 2022-12-12 08:59:37 -08:00
parent 5dc0474d8a
commit ed3bcd3dd2
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_fatal_condition.cpp
View File

@ -127,9 +127,7 @@ namespace Catch {
void FatalConditionHandler::disengage_platform() noexcept { void FatalConditionHandler::disengage_platform() noexcept {
if (SetUnhandledExceptionFilter(previousTopLevelExceptionFilter) != topLevelExceptionFilter) { if (SetUnhandledExceptionFilter(previousTopLevelExceptionFilter) != topLevelExceptionFilter) {
Catch::cerr() CATCH_RUNTIME_ERROR("Could not restore previous top level exception filter");
<< "Unexpected SEH unhandled exception filter on disengage."
<< " The filter was restored, but might be rolled back unexpectedly.";
} }
previousTopLevelExceptionFilter = nullptr; previousTopLevelExceptionFilter = nullptr;
} }

2
include/internal/catch_fatal_condition.h
View File

@ -31,7 +31,7 @@ namespace Catch {
// Should be if-defed to work on current platform, can assume // Should be if-defed to work on current platform, can assume
// engage-disengage 1:1 pairing. // engage-disengage 1:1 pairing.
void engage_platform(); void engage_platform();
void disengage_platform(); void disengage_platform() noexcept;
public: public:
// Should also have platform-specific implementations as needed // Should also have platform-specific implementations as needed
FatalConditionHandler(); FatalConditionHandler();

2
projects/SelfTest/UsageTests/Misc.tests.cpp
View File

@ -522,7 +522,7 @@ TEST_CASE("Validate SEH behavior - unhandled", "[.approvals][FatalConditionHandl
throw_no_catch(); throw_no_catch();
} }
static LONG CALLBACK dummyExceptionFilter(PEXCEPTION_POINTERS ExceptionInfo) { static LONG CALLBACK dummyExceptionFilter(PEXCEPTION_POINTERS /*ExceptionInfo*/) {
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }