From a013d9300f51cffa6181bdeb2ee8b64fb82492d6 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 10 Mar 2011 18:45:05 +0000 Subject: [PATCH] - cleaned up some compiler warnings --- source/glest_game/global/config.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index 15094e73..7b81768d 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -648,10 +648,10 @@ vector > Config::getPropertiesFromContainer(const Properties vector > Config::getMergedProperties() const { vector > result = getMasterProperties(); vector > resultUser = getUserProperties(); - for(int i = 0; i < resultUser.size(); ++i) { + for(unsigned int i = 0; i < resultUser.size(); ++i) { const pair &propertyUser = resultUser[i]; bool overrideProperty = false; - for(int j = 0; j < result.size(); ++j) { + for(unsigned int j = 0; j < result.size(); ++j) { pair &property = result[j]; // Take the user property and override the original value if(property.first == propertyUser.first) { @@ -679,7 +679,7 @@ vector > Config::getUserProperties() const { void Config::setUserProperties(const vector > &valueList) { Properties &propertiesObj = properties.second; - for(int idx = 0; idx < valueList.size(); ++ idx) { + for(unsigned int idx = 0; idx < valueList.size(); ++ idx) { const pair &nameValuePair = valueList[idx]; propertiesObj.setString(nameValuePair.first,nameValuePair.second); }