diff options
| author | Neil MacIntosh <neilmac@microsoft.com> | 2016-08-08 13:52:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 13:52:15 -0700 |
| commit | efeb557bf113c663261468f442d97cc656d05405 (patch) | |
| tree | a323812d19865a32e24bef9ee8d1d7d7cd8df021 | |
| parent | 9ab3a2ac3960145c309e3935851ee5e4337c93ee (diff) | |
| parent | db9d3da02941e2337d6ed0d2ca228f7b7461731d (diff) | |
| download | platform_external_Microsoft-GSL-efeb557bf113c663261468f442d97cc656d05405.tar.gz platform_external_Microsoft-GSL-efeb557bf113c663261468f442d97cc656d05405.tar.bz2 platform_external_Microsoft-GSL-efeb557bf113c663261468f442d97cc656d05405.zip | |
Merge pull request #310 from neilmacintosh/dev/neilmac/fix_mismatched_pragma
Fixed #308 - a mismatched pragma.
| -rw-r--r-- | include/span.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/span.h b/include/span.h index a5d2823..1405aa9 100644 --- a/include/span.h +++ b/include/span.h @@ -814,10 +814,13 @@ as_writeable_bytes(span<ElementType, Extent> s) noexcept #undef noexcept #ifdef _MSC_VER -#pragma warning(pop) #pragma pop_macro("noexcept") #endif #endif // GSL_THROW_ON_CONTRACT_VIOLATION +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif // GSL_SPAN_H |