Merge branch 'master' of https://github.com/Microsoft/GSL into dev/neilmac/defines

This commit is contained in:
Neil MacIntosh committed 2015-11-17 15:35:14 -08:00
commit 107869a2e4
2 files changed
+2 -2

No files matched your search

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