mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-29 02:10:00 +00:00
Add conditional check (#8736)
* resolve windows compile error * add conditional for undef new --------- Co-authored-by: Wouter van Oortmerssen <aardappel@gmail.com>
This commit is contained in:
@@ -770,13 +770,15 @@ void FixedLengthArrayTest() {
|
|||||||
// set memory chunk of size ArrayStruct to 1's
|
// set memory chunk of size ArrayStruct to 1's
|
||||||
std::memset(static_cast<void*>(non_zero_memory), 1, arr_size);
|
std::memset(static_cast<void*>(non_zero_memory), 1, arr_size);
|
||||||
// after placement-new it should be all 0's
|
// 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
|
#undef new
|
||||||
#endif
|
#endif
|
||||||
MyGame::Example::ArrayStruct* ap =
|
MyGame::Example::ArrayStruct* ap =
|
||||||
new (non_zero_memory) MyGame::Example::ArrayStruct;
|
new (non_zero_memory) MyGame::Example::ArrayStruct;
|
||||||
#if defined(_MSC_VER) && defined(_DEBUG)
|
#if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
|
||||||
#define new DEBUG_NEW
|
defined(_MSC_VER) && defined(_DEBUG)
|
||||||
|
#define new DEBUG_NEW
|
||||||
#endif
|
#endif
|
||||||
(void)ap;
|
(void)ap;
|
||||||
for (size_t i = 0; i < arr_size; ++i) {
|
for (size_t i = 0; i < arr_size; ++i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user