From dd77af75b7f4a642ea50f13fd63363911e033f3f Mon Sep 17 00:00:00 2001 From: coder7695 <235360898+coder7695@users.noreply.github.com> Date: Fri, 31 Oct 2025 19:20:18 +0100 Subject: [PATCH] Add conditional check (#8736) * resolve windows compile error * add conditional for undef new --------- Co-authored-by: Wouter van Oortmerssen --- tests/test.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test.cpp b/tests/test.cpp index c499ece1d..581fc6743 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -770,13 +770,15 @@ void FixedLengthArrayTest() { // set memory chunk of size ArrayStruct to 1's std::memset(static_cast(non_zero_memory), 1, arr_size); // after placement-new it should be all 0's -#if defined(_MSC_VER) && defined(_DEBUG) +#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \ + defined(_MSC_VER) && defined(_DEBUG) #undef new #endif MyGame::Example::ArrayStruct* ap = new (non_zero_memory) MyGame::Example::ArrayStruct; -#if defined(_MSC_VER) && defined(_DEBUG) -#define new DEBUG_NEW +#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \ + defined(_MSC_VER) && defined(_DEBUG) + #define new DEBUG_NEW #endif (void)ap; for (size_t i = 0; i < arr_size; ++i) {