para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #310 from neilmacintosh/dev/neilmac/fix_mismatched_pragma

Browse Source 
Fixed #308 - a mismatched pragma.
This commit is contained in:
Neil MacIntosh 2016-08-08 13:52:15 -07:00 committed by GitHub
commit efeb557bf1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/span.h
View File

@ -814,10 +814,13 @@ as_writeable_bytes(span<ElementType, Extent> s) noexcept
#undef noexcept #undef noexcept
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop)
#pragma pop_macro("noexcept") #pragma pop_macro("noexcept")
#endif #endif
#endif // GSL_THROW_ON_CONTRACT_VIOLATION #endif // GSL_THROW_ON_CONTRACT_VIOLATION
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif // GSL_SPAN_H #endif // GSL_SPAN_H