Only pop min/max if they were defined previously

This commit is contained in:
Jason Turner 2016-04-18 14:38:25 -06:00
parent 14307194e9
commit 6d6f79b1a4

View File

@ -23,6 +23,7 @@
#if defined(CHAISCRIPT_MSVC) && defined(max) && defined(min)
#define CHAISCRIPT_PUSHED_MIN_MAX
#pragma push_macro("max") // Why Microsoft? why? This is worse than bad
#undef max
#pragma push_macro("min")
@ -2454,7 +2455,8 @@ namespace chaiscript
}
#ifdef CHAISCRIPT_MSVC
#if defined(CHAISCRIPT_MSVC) && defined(CHAISCRIPT_PUSHED_MIN_MAX)
#undef CHAISCRIPT_PUSHED_MIN_MAX
#pragma pop_macro("min")
#pragma pop_macro("max")
#endif