Merge branch 'VS2013-fix-string_span-ctors' of https://github.com/menuet/GSL into menuet-VS2013-fix-string_span-ctors

This commit is contained in:
Neil MacIntosh committed 2015-12-14 11:08:58 -08:00
commit 385780388e
2 files changed
+97 -2

No files matched your search

+11
View File
@@ -45,6 +45,12 @@
#pragma push_macro("constexpr")
#define constexpr
// On Windows, if NOMINMAX is not defined, then windows.h defines the macro max
#ifdef _WIN32
#pragma push_macro("max")
#define max max
#endif
// VS 2013 workarounds
#if _MSC_VER <= 1800
@@ -2196,6 +2202,11 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#undef constexpr
#pragma pop_macro("constexpr")
#ifdef _WIN32
#undef max
#pragma pop_macro("max")
#endif
#if _MSC_VER <= 1800
#pragma warning(pop)