diff options
| author | Martin Hořeňovský | 2017-10-30 09:27:00 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-10-30 09:58:13 +0100 |
| commit | 57b4e0b64ce00c7e6d43e509071127debf4d12f1 (patch) | |
| tree | b0444ce433b8b162646047e952a878af07fac4ee /include | |
| parent | 75a77b6f8cf439c8ad57e6e7d922ec186665067e (diff) | |
| download | catch3-57b4e0b64ce00c7e6d43e509071127debf4d12f1.tar.gz | |
Fix missing pragma warning(pop) and other warnings under MSVC
Fixes #1072
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 2 | ||||
| -rw-r--r-- | include/internal/catch_decomposer.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index e7d506ed..96ddd800 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -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 diff --git a/include/internal/catch_decomposer.h b/include/internal/catch_decomposer.h index fee24e72..38b62f45 100644 --- a/include/internal/catch_decomposer.h +++ b/include/internal/catch_decomposer.h @@ -162,4 +162,8 @@ namespace Catch { } // end namespace Catch +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED |