microsoft/GSL
1
0
Fork 1
mirror of https://github.com/microsoft/GSL.git synced 2025-11-18 00:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/neilmac/spec

Browse Source
This commit is contained in:
Neil MacIntosh
2016-07-20 09:30:05 -07:00
parent f2ab3a5c54 a9f0ce2f77
commit eed99d8599
9 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/string_span.h
View File

@@ -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
@@ -927,12 +935,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