Skip to content
Permalink
Browse files

Fix msvc2012 build

  • Loading branch information
sapier sapier
sapier authored and sapier committed Jun 29, 2014
1 parent ebf7ea5 commit ee7af21e411d5d43ba67f4b67603f72e62b0570d
Showing with 4 additions and 2 deletions.
  1. +3 −2 src/profiler.h
  2. +1 −0 src/util/string.h
@@ -22,9 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "irrlichttypes.h"
#include <string>
#include <map>

#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"
#include <map>
#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;
}
}
{
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <cstring>
#include <vector>
#include <sstream>
#include <cctype>

#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)

0 comments on commit ee7af21

Please sign in to comment.
You can’t perform that action at this time.