Merge fixes from menuet, dropping max() macro workaround.
Conflicts: include/string_span.h
This commit is contained in:
commit
9e1402dff8
2 files changed
+14
-11
No files matched your search
@@ -45,12 +45,6 @@
|
||||
#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
|
||||
|
||||
@@ -2202,11 +2196,6 @@ 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)
|
||||
|
||||
|
||||
Reference in new issue
Block a user