Merge branch 'master' into dev/neilmac/spec

This commit is contained in:
Neil MacIntosh
2016-07-20 09:30:05 -07:00
9 changed files with 34 additions and 13 deletions
+7 -1
View File
@@ -31,10 +31,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