Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14491 from doctaweeks/fixes-for-6.x

Browse Source 
Fixes for 6.x
This commit is contained in:
Carbenium
2015-04-05 00:16:36 +02:00
parent f09af70583 96c6ed1867
commit 6252330a77
59 changed files with 89 additions and 90 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);