From ca7043e52d6a5d0ee1b91f287371fbe7f216697e Mon Sep 17 00:00:00 2001 From: Mukul Sati Date: Sat, 23 Mar 2013 02:24:31 -0400 Subject: 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 ; 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. --- src/profiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/profiler.h') 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; } } { -- cgit v1.2.3