summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-08-10 21:12:06 +0200
committerworktycho <work.tycho@gmail.com>2015-08-10 21:12:06 +0200
commit63b65c19eff7c3d8cd8316f5653fef2c396a3af6 (patch)
treea0263761bcafd5d852c947ff1df91ed639b206d7
parentMerge pull request #2421 from cuberite/StackWalkerWarningIgnore (diff)
parentChecked LeakFinder in MSVC2015, enabled support for it. (diff)
downloadcuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar.gz
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar.bz2
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar.lz
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar.xz
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.tar.zst
cuberite-63b65c19eff7c3d8cd8316f5653fef2c396a3af6.zip
m---------lib/SQLiteCpp0
-rw-r--r--src/LeakFinder.cpp6
-rw-r--r--src/main.cpp7
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp
-Subproject 49679e7b54726e2d94d3aad76a65aeb9c1088af
+Subproject af78d59349fd013341746b345961e3f19ecae60
diff --git a/src/LeakFinder.cpp b/src/LeakFinder.cpp
index 42a5afe56..2e352af2d 100644
--- a/src/LeakFinder.cpp
+++ b/src/LeakFinder.cpp
@@ -103,9 +103,9 @@
#include "LeakFinder.h"
-// Currently only tested with MS VC++ 5 to 10
-#if (_MSC_VER < 1100) || (_MSC_VER > 1800)
-#error Only MS VC++ 5/6/7/7.1/8/9/10/11/12 supported. Check if the '_CrtMemBlockHeader' has not changed with this compiler!
+// Currently only tested with MS VC++ 5 to 2015
+#if (_MSC_VER < 1100) || (_MSC_VER > 1900)
+ #error Only MS VC++ 5/6/7/7.1/8/9/10/11/12 supported. Check if the '_CrtMemBlockHeader' has not changed with this compiler!
#endif
diff --git a/src/main.cpp b/src/main.cpp
index 2103f3356..d0a5eb203 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,9 +48,10 @@ bool cRoot::m_RunAsService = false;
-/** If defined, a thorough leak finder will be used (debug MSVC only); leaks will be output to the Output window */
-// _X 2014_02_20: Disabled for canon repo, it makes the debug version too slow in MSVC2013
-// and we haven't had a memory leak for over a year anyway.
+/** If defined, a thorough leak finder will be used (debug MSVC only); leaks will be output to the Output window
+_X 2014_02_20: Disabled for canon repo, it makes the debug version too slow in MSVC2013
+and we haven't had a memory leak for over a year anyway.
+Synchronize this with Server.cpp to enable the "dumpmem" console command. */
// #define ENABLE_LEAK_FINDER