From db09c733ead2a8f076e26fd2321e82d56043d53d Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 10 Aug 2015 13:23:28 +0200 Subject: [PATCH 1/2] Fixed SQLiteCpp MSVC2015 compilation. SQLiteCpp had a "noexcept" keyword that MSVC2015 didn't like, upgrading it makes it compile. --- lib/SQLiteCpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp index 49679e7b5..af78d5934 160000 --- a/lib/SQLiteCpp +++ b/lib/SQLiteCpp @@ -1 +1 @@ -Subproject commit 49679e7b54726e2d94d3aad76a65aeb9c1088afd +Subproject commit af78d59349fd013341746b345961e3f19ecae60d From 92ac33e923f112a5395e1fa0a52fc14786f80612 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 10 Aug 2015 13:54:19 +0200 Subject: [PATCH 2/2] Checked LeakFinder in MSVC2015, enabled support for it. --- src/LeakFinder.cpp | 6 +++--- src/main.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) 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