From ee7af21e411d5d43ba67f4b67603f72e62b0570d Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 29 Jun 2014 16:57:50 +0200 Subject: [PATCH] Fix msvc2012 build --- src/profiler.h | 5 +++-- src/util/string.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/profiler.h b/src/profiler.h index e746c489c..25d89c6c8 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -22,9 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes.h" #include +#include + #include "jthread/jmutex.h" #include "jthread/jmutexautolock.h" -#include #include "util/timetaker.h" #include "util/numeric.h" // paging() #include "debug.h" // assert() @@ -73,7 +74,7 @@ class Profiler else{ /* No add shall have been used */ assert(n->second != -2); - n->second = (std::max)(n->second, 0) + 1; + n->second = MYMAX(n->second, 0) + 1; } } { diff --git a/src/util/string.h b/src/util/string.h index 4aeea17db..6e2db0af4 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) -- 2.44.0