diff options
| author | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-01-10 21:20:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 21:20:37 +0300 |
| commit | 395a5bf550e4b038b14ed5dfbbf56b4db90e882a (patch) | |
| tree | 131a08bf7f523b7978421f0b02b333262d436e49 /tests | |
| parent | 2d878b94ee482029142a25fd8d96cbc6b5282140 (diff) | |
| parent | 96b6964b3030c663b049fccdeb15535efe780887 (diff) | |
Merge branch 'master' into dev/jomaples/add_missing_span_functions
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/span_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index 5885328..28c97f5 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -17,8 +17,7 @@ #ifdef _MSC_VER // blanket turn off warnings from CppCoreCheck from catch // so people aren't annoyed by them when running the tool. -#pragma warning(disable : 26440 26426 26497 4189) // from catch - +#pragma warning(disable : 26440 26426 26497 4189 4996) #endif #if __clang__ || __GNUC__ @@ -26,6 +25,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wundef" #pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif // __clang__ || __GNUC__ #if __clang__ |