From 106262f1ef68813e64854524634b19c37c4f1cdb Mon Sep 17 00:00:00 2001 From: Neil MacIntosh Date: Tue, 17 Nov 2015 19:01:46 -0800 Subject: [PATCH] Remove unnecessary workaround for max macro --- include/span.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/include/span.h b/include/span.h index a8d0542..7fd711c 100644 --- a/include/span.h +++ b/include/span.h @@ -39,12 +39,6 @@ #pragma push_macro("constexpr") #define constexpr /* nothing */ -// MSVC has the potential of bringing in headers where max is a macro -#ifdef max -#pragma push_macro("max") -#undef max -#endif - // VS 2013 workarounds #if _MSC_VER <= 1800 @@ -2046,10 +2040,6 @@ general_span_iterator operator+(typename general_span_iterator::diff #undef constexpr #pragma pop_macro("constexpr") -#ifdef max -#pragma pop_macro("max") -#endif - #if _MSC_VER <= 1800 #pragma warning(pop)