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 branch 'master' of https://github.com/Microsoft/GSL into dev/neilmac/defines

Browse Source
This commit is contained in:
Neil MacIntosh 2015-11-17 15:35:14 -08:00
commit 107869a2e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gsl.h
View File

@ -219,7 +219,7 @@ namespace std
#pragma warning(pop) #pragma warning(pop)
#ifndef GSL_THROWS_FOR_TESTING #ifndef GSL_THROWS_FOR_TESTING
#pragma undef noexcept #undef noexcept
#endif // GSL_THROWS_FOR_TESTING #endif // GSL_THROWS_FOR_TESTING
#endif // _MSC_VER <= 1800 #endif // _MSC_VER <= 1800

2
include/span.h
View File

@ -2054,7 +2054,7 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#pragma warning(pop) #pragma warning(pop)
#ifndef GSL_THROWS_FOR_TESTING #ifndef GSL_THROWS_FOR_TESTING
#pragma undef noexcept #undef noexcept
#pragma pop_macro("noexcept") #pragma pop_macro("noexcept")
#endif // GSL_THROWS_FOR_TESTING #endif // GSL_THROWS_FOR_TESTING