Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed variable shadowing.

Browse Source
This commit is contained in:
Branimir Karadžić
2015-04-04 19:10:35 -07:00
parent 250777287f
commit 1e8051fd00
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/common/entry/entry.cpp
View File

@@ -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