From 76d06b0e79acc1b5a42b7c83d8156696b72bc0ff Mon Sep 17 00:00:00 2001 From: Anna Krykora Date: Thu, 5 Jan 2017 16:54:55 +0100 Subject: [PATCH] Update EnvVar.cpp Instead of undefining max, clearer will be defining NOMINMAX, to prevent min and max macroses definition inside --- EnvVar.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/EnvVar.cpp b/EnvVar.cpp index 4e98f9f..015fe51 100755 --- a/EnvVar.cpp +++ b/EnvVar.cpp @@ -23,9 +23,12 @@ #include #include -#include -#undef max // unbelievable +#ifndef NOMINMAX // We do not need min and max macroses from +#define NOMINMAX +#endif + +#include #include "EnvVar.hpp" @@ -294,4 +297,4 @@ void EnvVar::copy_ (EnvVar const &other) void EnvVar::destroy_ () { -} \ No newline at end of file +}