From fadbc9808c682c1c9cc7af89a35d2e4fa3faa6dc Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 30 Mar 2015 14:36:33 +0200 Subject: Updated to latest 3rdparty (nw) --- 3rdparty/bgfx/examples/common/entry/entry.cpp | 3 +++ 1 file changed, 3 insertions(+) (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 7ef7853145f..001232d5556 100644 --- a/3rdparty/bgfx/examples/common/entry/entry.cpp +++ b/3rdparty/bgfx/examples/common/entry/entry.cpp @@ -29,8 +29,11 @@ namespace entry #if ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR bx::ReallocatorI* getDefaultAllocator() { +BX_PRAGMA_DIAGNOSTIC_PUSH_MSVC(); +BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4459); // warning C4459: declaration of 's_allocator' hides global declaration static bx::CrtAllocator s_allocator; return &s_allocator; +BX_PRAGMA_DIAGNOSTIC_POP_MSVC(); } #endif // ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR -- cgit v1.2.3-70-g09d2