Fix Win32 compile error

Author: botder

Client/mods/deathmatch/logic/lua/CLuaArgument.cpp

@@ -176,9 +176,9 @@ bool CLuaArgument::CompareRecursive(const CLuaArgument& Argument, std::set<CLuaA
             if (m_pTableData->Count() != Argument.m_pTableData->Count())
                 return false;
 
-            vector<CLuaArgument*>::const_iterator iter = m_pTableData->IterBegin();
-            vector<CLuaArgument*>::const_iterator iterCompare = Argument.m_pTableData->IterBegin();
-            while (iter != m_pTableData->IterEnd() && iterCompare != Argument.m_pTableData->IterEnd())
+            vector<CLuaArgument*>::const_iterator iter = m_pTableData->begin();
+            vector<CLuaArgument*>::const_iterator iterCompare = Argument.m_pTableData->begin();
+            while (iter != m_pTableData->end() && iterCompare != Argument.m_pTableData->end())
             {
                 if (pKnownTables->find(m_pTableData) == pKnownTables->end())
                 {

Client/mods/deathmatch/logic/lua/CLuaArguments.cpp

@@ -191,11 +191,9 @@ void CLuaArguments::PushAsTable(lua_State* luaVM, CFastHashMap<CLuaArguments*, i
 
 void CLuaArguments::PushArguments(const CLuaArguments& Arguments)
 {
-    vector<CLuaArgument*>::const_iterator iter = Arguments.IterBegin();
-    for (; iter != Arguments.IterEnd(); iter++)
+    for (CLuaArgument* arg : Arguments)
     {
-        CLuaArgument* pArgument = new CLuaArgument(**iter);
-        m_Arguments.push_back(pArgument);
+        m_Arguments.push_back(new CLuaArgument(*arg));
     }
 }
 

Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp

@@ -1030,10 +1030,10 @@ int CLuaBrowserDefs::SetBrowserAjaxHandler(lua_State* luaVM)
 
                         arguments.Call(pLuaMain, callbackFunction, &result);
 
-                        if (result.Count() == 0)
+                        if (result.IsEmpty())
                             return "";
 
-                        CLuaArgument* returnedValue = *result.IterBegin();
+                        CLuaArgument* returnedValue = *result.begin();
                         if (returnedValue->GetType() == LUA_TSTRING)
                             return returnedValue->GetString();
                         else

Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp

@@ -2360,13 +2360,11 @@ int CLuaGUIDefs::GUIGridListAddRow(lua_State* luaVM)
         else
         {
             // Vector containing our string arguments.  We add a bool to store whether it was originally a number.
-            std::vector<std::pair<SString, bool> >     m_items;
-            std::vector<CLuaArgument*>::const_iterator it = Arguments.IterBegin();
-            for (it; it != Arguments.IterEnd(); it++)
+            std::vector<std::pair<SString, bool>> m_items;
+            for (CLuaArgument* pArgument : Arguments)
             {
-                CLuaArgument* pArgument = *it;
-                SString       strItemText;
-                bool          bNumber = false;
+                SString strItemText;
+                bool    bNumber = false;
 
                 // Check the type of the argument and convert it to a string we can process
                 uint type = pArgument->GetType();
@@ -2427,12 +2425,10 @@ int CLuaGUIDefs::GUIGridListInsertRowAfter(lua_State* luaVM)
         {
             // Vector containing our string arguments.  We add a bool to store whether it was originally a number.
             std::vector<std::pair<SString, bool> >     m_items;
-            std::vector<CLuaArgument*>::const_iterator it = Arguments.IterBegin();
-            for (it; it != Arguments.IterEnd(); it++)
+            for (CLuaArgument* pArgument : Arguments)
             {
-                CLuaArgument* pArgument = *it;
-                SString       strItemText;
-                bool          bNumber = false;
+                SString strItemText;
+                bool    bNumber = false;
 
                 // Check the type of the argument and convert it to a string we can process
                 uint type = pArgument->GetType();

Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -488,9 +488,9 @@ int CLuaResourceDefs::Load(lua_State* luaVM)
         {
             CLuaArguments returnValues;
             callbackArguments.Call(pLuaMain, iLuaFunction, &returnValues);
-            if (returnValues.Count())
+            if (returnValues.IsNotEmpty())
             {
-                CLuaArgument* returnedValue = *returnValues.IterBegin();
+                CLuaArgument* returnedValue = *returnValues.begin();
                 int           iType = returnedValue->GetType();
                 if (iType == LUA_TNIL)
                     break;