diff options
| author | Daniel M. Weeks <dan@danweeks.net> | 2015-03-27 14:33:00 -0400 |
|---|---|---|
| committer | Daniel M. Weeks <dan@danweeks.net> | 2015-04-02 22:27:18 -0400 |
| commit | 573cda7b524ee4d7d23cefd026b056181f451a8b (patch) | |
| tree | 93b17e43ac67d8a1f0d4588e2844f770432a46aa /src/server/shared/Dynamic/ObjectRegistry.h | |
| parent | 18acb9914a2ea8660b34bac13ea81b13a5ee9fe1 (diff) | |
Rename variables to fix C++11 keyword collision
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); |