Rename variables to fix C++11 keyword collision

(cherry picked from commit 573cda7b524ee4d7d23cefd026b056181f451a8b)

src/server/game/Entities/Player/Player.cpp

@@ -21997,9 +21997,9 @@ void Player::SetPvP(bool state)
         (*itr)->SetPvP(state);
 }
 
-void Player::UpdatePvP(bool state, bool override)
+void Player::UpdatePvP(bool state, bool _override)
 {
-    if (!state || override)
+    if (!state || _override)
     {
         SetPvP(state);
         pvpInfo.EndTimer = 0;

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