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

2015-11-17 15:35:14 -08:00
parent 292f81e5ef e3886084dc
commit 107869a2e4
2 changed files with 2 additions and 2 deletions
@@ -219,7 +219,7 @@ namespace std
 #pragma warning(pop)

 #ifndef GSL_THROWS_FOR_TESTING
-#pragma undef noexcept
+#undef noexcept
 #endif // GSL_THROWS_FOR_TESTING

 #endif // _MSC_VER <= 1800
@@ -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