diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:16:36 +0200 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:16:36 +0200 |
| commit | 6252330a772b49046be84ad7d16c8c3ce94de841 (patch) | |
| tree | a74839bee1cac6a137bb01aff7d59fc93161ec0d /src/server/shared/Dynamic/ObjectRegistry.h | |
| parent | f09af7058338d765db87b25acc275ac711765305 (diff) | |
| parent | 96c6ed1867c2a03e003147bff45faf588da21be2 (diff) | |
Merge pull request #14491 from doctaweeks/fixes-for-6.x
Fixes for 6.x
Diffstat (limited to 'src/server/shared/Dynamic/ObjectRegistry.h')
| -rw-r--r-- | src/server/shared/Dynamic/ObjectRegistry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index be253f947a7..1eb9368be61 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -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); |