3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 05:59:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing pragma warning(pop) and other warnings under MSVC

Browse Source 
Fixes #1072
This commit is contained in:
Martin Hořeňovský
2017-10-30 09:27:00 +01:00
parent 75a77b6f8c
commit 57b4e0b64c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_compiler_capabilities.h
View File

@@ -82,7 +82,7 @@
// Universal Windows platform does not support SEH // Universal Windows platform does not support SEH
// Or console colours (or console at all...) // Or console colours (or console at all...)
# if (WINAPI_FAMILY == WINAPI_FAMILY_APP) # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
# define CATCH_CONFIG_COLOUR_NONE # define CATCH_CONFIG_COLOUR_NONE
# else # else
# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH # define CATCH_INTERNAL_CONFIG_WINDOWS_SEH

4
include/internal/catch_decomposer.h
View File

@@ -162,4 +162,8 @@ namespace Catch {
} // end namespace Catch } // end namespace Catch
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED #endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED