Integrating github/staging through commit ab87ed9

Code/CryEngine/CrySystem/XML/ReadXMLSink.cpp

@@ -559,7 +559,6 @@ bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, Xml
         }
     }
 
-    const char* tag = definition->getTag();
     if (parseParams.useAlways != (IXmlNode*)NULL)
     {
         assert(!definition->haveAttr("type"));

Code/CryEngine/CrySystem/XML/XMLPatcher.cpp

@@ -390,9 +390,8 @@ void CXMLPatcher::DumpFiles(
     {
         CryLog("Dumping before and after data files for '%s'", pInXMLFileName);
 
-        const char* pOrigFileName;
-
-        if (pOrigFileName = strrchr(pInXMLFileName, '/'))
+        const char* pOrigFileName = strrchr(pInXMLFileName, '/');
+        if (pOrigFileName)
         {
             pOrigFileName++;