aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil MacIntosh <neilmac@microsoft.com>2016-08-02 16:22:18 -0700
committerNeil MacIntosh <neilmac@microsoft.com>2016-08-02 16:22:18 -0700
commitebce4920d66816f8c9addb288cfe67bef41f07a2 (patch)
treeb91bb4a84c4c247c6e72a77f997b3237c6670e05
parent0535138459d0f78e39a2e558bc239f5727eaa13c (diff)
downloadplatform_external_Microsoft-GSL-ebce4920d66816f8c9addb288cfe67bef41f07a2.tar.gz
platform_external_Microsoft-GSL-ebce4920d66816f8c9addb288cfe67bef41f07a2.tar.bz2
platform_external_Microsoft-GSL-ebce4920d66816f8c9addb288cfe67bef41f07a2.zip
Fixed #308 - a mismatched pragma.
-rw-r--r--include/span.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/span.h b/include/span.h
index a612983..b7a3d77 100644
--- a/include/span.h
+++ b/include/span.h
@@ -2221,10 +2221,13 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#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