summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/entry/entry.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-08 15:13:38 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-08 15:13:38 +0200
commitd4a431f0ea75957702de88dd1b074bd9a22ef6d2 (patch)
tree7af8ada5b3b1b9b34eae232f03a6d9044da1ed2a /3rdparty/bgfx/examples/common/entry/entry.cpp
parent5a33ceba7536d45a84b0f0238c21e391f6e6abbc (diff)
latest BGFX (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/entry/entry.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry.cpp5
1 files changed, 3 insertions, 2 deletions
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