summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/entry/entry.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-30 14:36:33 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-30 14:36:33 +0200
commitfadbc9808c682c1c9cc7af89a35d2e4fa3faa6dc (patch)
tree1ca878aa70cf67e6419b283cafc1ae6515b377ef /3rdparty/bgfx/examples/common/entry/entry.cpp
parent86ac81dd3399acb04e99a4ddcd3acc5a622aa4ec (diff)
Updated to latest 3rdparty (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/entry/entry.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry.cpp3
1 files changed, 3 insertions, 0 deletions
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