Fixed VS memory tracking leaking into user code

42611f9a · Wouter van Oortmerssen · 1f0bd128 · 42611f9a · 42611f9a
Commit 42611f9a authored Aug 25, 2017 by Wouter van Oortmerssen
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

base.h include/flatbuffers/base.h +4 -2

test.cpp tests/test.cpp +2 -1

No files found.
--- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h
 #ifndef FLATBUFFERS_BASE_H_
 #define FLATBUFFERS_BASE_H_

-#if defined(_MSC_VER) && defined(_DEBUG)
+#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+    defined(_MSC_VER) && defined(_DEBUG)
  #define _CRTDBG_MAP_ALLOC
 #endif

@@ -15,7 +16,8 @@
 #include <cstdlib>
 #include <cstring>

-#if defined(_MSC_VER) && defined(_DEBUG)
+#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+    defined(_MSC_VER) && defined(_DEBUG)
  #include <crtdbg.h>
  #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
  #define new DEBUG_NEW

--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1749,7 +1749,8 @@ void TypeAliasesTest()
 }

 int main(int /*argc*/, const char * /*argv*/[]) {
-  #if defined(_MSC_VER) && defined(_DEBUG)
+  #if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
+      defined(_MSC_VER) && defined(_DEBUG)
    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF
      // For more thorough checking:
      //| _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_DELAY_FREE_MEM_DF