Disable macro max in Windows. Implement move ctors in string_span for VS2013. Remove redundant pragma warning pop for VS2013.

This commit is contained in:
Pascal Menuet committed 2015-12-11 20:47:07 +01:00
1 parent ace63c5a9d
commit 37cdb6bc50
2 files changed
+26 -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)