From d4a431f0ea75957702de88dd1b074bd9a22ef6d2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 8 Apr 2015 15:13:38 +0200 Subject: latest BGFX (nw) --- 3rdparty/bgfx/examples/common/entry/entry.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '3rdparty/bgfx/examples/common/entry/entry.cpp') diff --git a/3rdparty/bgfx/examples/common/entry/entry.cpp b/3rdparty/bgfx/examples/common/entry/entry.cpp index 001232d5556..4eb25a51a96 100644 --- a/3rdparty/bgfx/examples/common/entry/entry.cpp +++ b/3rdparty/bgfx/examples/common/entry/entry.cpp @@ -29,11 +29,12 @@ namespace entry #if ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR bx::ReallocatorI* getDefaultAllocator() { -BX_PRAGMA_DIAGNOSTIC_PUSH_MSVC(); +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; return &s_allocator; -BX_PRAGMA_DIAGNOSTIC_POP_MSVC(); +BX_PRAGMA_DIAGNOSTIC_POP(); } #endif // ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR -- cgit v1.2.3-70-g09d2