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

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

View File

@ -82,7 +82,7 @@
// Universal Windows platform does not support SEH
// 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
# else
# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH

View File

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