From a9f0ce2f77e4230275dc7a22f3bef351e251f29c Mon Sep 17 00:00:00 2001
From: Neil MacIntosh <neilmac@microsoft.com>
Date: Thu, 31 Mar 2016 12:01:07 -0700
Subject: [PATCH] Suppressed CppCoreCheck warnings.

---
 include/gsl_util.h    |  6 +++++-
 include/span.h        |  8 +++++++-
 include/string_span.h | 12 +++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/include/gsl_util.h b/include/gsl_util.h
index 316f2a1..edfcce4 100644
--- a/include/gsl_util.h
+++ b/include/gsl_util.h
@@ -31,6 +31,9 @@
 #pragma push_macro("constexpr")
 #define constexpr
 
+#pragma warning(push)
+#pragma warning(disable: 4127) // conditional expression is constant
+
 // MSVC 2013 workarounds
 #if _MSC_VER <= 1800
 // noexcept is not understood
@@ -40,7 +43,6 @@
 // turn off some misguided warnings
 #pragma warning(push)
 #pragma warning(disable: 4351) // warns about newly introduced aggregate initializer behavior
-#pragma warning(disable: 4127) // conditional expression is constant
 
 #endif // _MSC_VER <= 1800
 
@@ -131,6 +133,8 @@ constexpr typename Cont::value_type& at(Cont& cont, size_t index)
 
 #ifdef _MSC_VER
 
+#pragma warning(pop)
+
 #undef constexpr
 #pragma pop_macro("constexpr")
 
diff --git a/include/span.h b/include/span.h
index 31c26ad..a612983 100644
--- a/include/span.h
+++ b/include/span.h
@@ -37,10 +37,16 @@
 
 #ifdef _MSC_VER
 
-// turn off some warnings that are noisy about our Expects statements
 #pragma warning(push)
+
+// turn off some warnings that are noisy about our Expects statements
 #pragma warning(disable : 4127) // conditional expression is constant
 
+// blanket turn off warnings from CppCoreCheck for now
+// so people aren't annoyed by them when running the tool.
+// more targeted suppressions will be added in a future update to the GSL
+#pragma warning(disable: 26481 26482 26483 26485 26490 26491 26492 26493 26495)
+
 // No MSVC does constexpr fully yet
 #pragma push_macro("constexpr")
 #define constexpr
diff --git a/include/string_span.h b/include/string_span.h
index 46bf2d4..fdcbf31 100644
--- a/include/string_span.h
+++ b/include/string_span.h
@@ -31,6 +31,14 @@
 #pragma push_macro("constexpr")
 #define constexpr /* nothing */
 
+#pragma warning(push)
+
+// blanket turn off warnings from CppCoreCheck for now
+// so people aren't annoyed by them when running the tool.
+// more targeted suppressions will be added in a future update to the GSL
+#pragma warning(disable: 26481 26482 26483 26485 26490 26491 26492 26493 26495)
+
+
 // VS 2013 workarounds
 #if _MSC_VER <= 1800
 
@@ -930,12 +938,14 @@ bool operator>=(const T& one, gsl::basic_string_span<CharT, Extent> other) noexc
 }
 #endif
 
-// VS 2013 workarounds
 #ifdef _MSC_VER
 
+#pragma warning(pop)
+
 #undef constexpr
 #pragma pop_macro("constexpr")
 
+// VS 2013 workarounds
 #if _MSC_VER <= 1800
 
 #ifndef GSL_THROW_ON_CONTRACT_VIOLATION