Rename variables to fix C++11 keyword collision

(cherry picked from commit 573cda7b524ee4d7d23cefd026b056181f451a8b)

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);