Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename variables to fix C++11 keyword collision

Browse Source
This commit is contained in:
Daniel M. Weeks
2015-03-27 14:33:00 -04:00
parent 18acb9914a
commit 573cda7b52
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/shared/Dynamic/ObjectRegistry.h
View File

@@ -47,12 +47,12 @@ class ObjectRegistry
}
/// Inserts a registry item
bool InsertItem(T *obj, Key key, bool override = false)
bool InsertItem(T *obj, Key key, bool _override = false)
{
typename RegistryMapType::iterator iter = i_registeredObjects.find(key);
if ( iter != i_registeredObjects.end() )
{
if ( !override )
if ( !_override )
return false;
delete iter->second;
i_registeredObjects.erase(iter);