This commit is contained in:
Branimir Karadžić
2017-06-10 22:31:59 -07:00
parent b6ccccd4c5
commit 6a6c5e3af9
8 changed files with 10 additions and 21 deletions

View File

@@ -95,7 +95,7 @@ namespace entry
BX_PRAGMA_DIAGNOSTIC_PUSH();
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4459); // warning C4459: declaration of 's_allocator' hides global declaration
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wshadow");
static bx::CrtAllocator s_allocator;
static bx::DefaultAllocator s_allocator;
return &s_allocator;
BX_PRAGMA_DIAGNOSTIC_POP();
}