diff options
| author | Haibo Huang <hhb@google.com> | 2019-10-25 16:15:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-25 16:15:27 -0700 |
| commit | 12d3873e5d483f86ff4aae943b84b98c0de4f19f (patch) | |
| tree | 3efe82d4ff405d40fd7e728fee1b42ccef91aa95 /tests/multi_span_tests.cpp | |
| parent | 5eb44f371c9f1150f4fe9f2929c2b882f60adfc2 (diff) | |
| parent | c0efabafbf9eef1a5d97a6921cfc3fcfb4430e63 (diff) | |
| download | Microsoft-GSL-12d3873e5d483f86ff4aae943b84b98c0de4f19f.tar.gz | |
Upgrade Microsoft-GSL to 3d56ba9e7f2d61fd8c9c2a7715b46fde38c00123
am: c0efabafbf
Change-Id: I21ef4758fee241238ba0a233a5cec7bc75b4d57c
Diffstat (limited to 'tests/multi_span_tests.cpp')
| -rw-r--r-- | tests/multi_span_tests.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp index 17188be..0aa0ff9 100644 --- a/tests/multi_span_tests.cpp +++ b/tests/multi_span_tests.cpp @@ -17,8 +17,14 @@ #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) // from catch +#pragma warning(disable : 26440 26426) // from catch +#pragma warning(disable : 4996) // multi_span is in the process of being deprecated. + // Suppressing warnings until it is completely removed +#endif +#if __clang__ || __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif #include <catch/catch.hpp> // for AssertionHandler, StringRef, CHECK, CHECK... @@ -1787,3 +1793,7 @@ TEST_CASE("iterator") #ifdef CONFIRM_COMPILATION_ERRORS copy(src_span_static, dst_span_static); #endif + +#if __clang__ || __GNUC__ +#pragma GCC diagnostic pop +#endif |