para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from Microsoft/dev/neilmac/fix-config-macro

Browse Source 
Remove unnecessary workaround for max macro
This commit is contained in:
Neil MacIntosh 2015-11-17 19:05:57 -08:00
commit 3cd0d523b6
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/span.h
View File

@ -39,12 +39,6 @@
#pragma push_macro("constexpr") #pragma push_macro("constexpr")
#define constexpr /* nothing */ #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 // VS 2013 workarounds
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800
@ -2046,10 +2040,6 @@ general_span_iterator<Span> operator+(typename general_span_iterator<Span>::diff
#undef constexpr #undef constexpr
#pragma pop_macro("constexpr") #pragma pop_macro("constexpr")
#ifdef max
#pragma pop_macro("max")
#endif
#if _MSC_VER <= 1800 #if _MSC_VER <= 1800
#pragma warning(pop) #pragma warning(pop)