diff options
| author | Mukul Sati <mukulsati@gmail.com> | 2013-03-23 02:24:31 -0400 |
|---|---|---|
| committer | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2013-03-24 00:53:10 +0400 |
| commit | ca7043e52d6a5d0ee1b91f287371fbe7f216697e (patch) | |
| tree | 36ce36393fffc297699685119dbf505449021874 /src/profiler.h | |
| parent | 6f8d40ef5d24e26a70c7a0bdf6d2992e0bea9a63 (diff) | |
| download | minetest-ca7043e52d6a5d0ee1b91f287371fbe7f216697e.tar.gz minetest-ca7043e52d6a5d0ee1b91f287371fbe7f216697e.tar.bz2 minetest-ca7043e52d6a5d0ee1b91f287371fbe7f216697e.zip | |
Set of changes to build mineTest using Visual Studio 11.0. These affect
the following:
1. String concatenation in guiMainMenu.cpp - it is required for all
individual strings to be of the same type <unicode/non-unicode>; adding
explicit L qualifier before the other strings.
2. Correcting type of BlockMakeData to struct in place of class forward
declarations. This information is used for name decoration by Visual
Studio, leading to linker errors in case of mismatches.
3. Windows headers define max as a macro somewhere, leading to a compile
time error in profiler.h; using () around function to prevent macro match
from occurring.
Diffstat (limited to 'src/profiler.h')
| -rw-r--r-- | src/profiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/profiler.h b/src/profiler.h index 56b026880..271ad70c1 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -73,7 +73,7 @@ public: else{ /* No add shall have been used */ assert(n->second != -2); - n->second = std::max(n->second, 0) + 1; + n->second = (std::max)(n->second, 0) + 1; } } { |