From 4e484ae2a442ea2bd7f513aab17241ecf21b65d1 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Tue, 26 Jan 2016 00:24:14 -0500 Subject: [PATCH] compiler fixes, apparently using [] as intended is ambiguous ... --- src/PowderToySDL.cpp | 1 + src/client/Client.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index 7ef3e26f4a..e0b7b6e784 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -21,6 +21,7 @@ #include "icon.h" #endif #include +#include #ifndef WIN #include diff --git a/src/client/Client.cpp b/src/client/Client.cpp index d65c1146ae..c0a3def79b 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -775,7 +775,7 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession) //Notifications from server Json::Value notificationsArray = objDocument["Notifications"]; - for(size_t j = 0; j < notificationsArray.size(); j++) + for (Json::UInt j = 0; j < notificationsArray.size(); j++) { std::string notificationLink = notificationsArray[j]["Link"].asString(); std::string notificationText = notificationsArray[j]["Text"].asString(); @@ -1381,7 +1381,7 @@ LoginStatus Client::Login(std::string username, std::string password, User & use std::string userElevationTemp = objDocument["Elevation"].asString(); Json::Value notificationsArray = objDocument["Notifications"]; - for (size_t j = 0; j < notificationsArray.size(); j++) + for (Json::UInt j = 0; j < notificationsArray.size(); j++) { std::string notificationLink = notificationsArray[j]["Link"].asString(); std::string notificationText = notificationsArray[j]["Text"].asString(); @@ -1608,7 +1608,7 @@ SaveInfo * Client::GetSave(int saveID, int saveDate) Json::Value tagsArray = objDocument["Tags"]; std::list tempTags; - for (size_t j = 0; j < tagsArray.size(); j++) + for (Json::UInt j = 0; j < tagsArray.size(); j++) tempTags.push_back(tagsArray[j].asString()); SaveInfo * tempSave = new SaveInfo(tempID, tempDate, tempScoreUp, tempScoreDown, @@ -1671,7 +1671,7 @@ RequestBroker::Request * Client::GetSaveAsync(int saveID, int saveDate) Json::Value tagsArray = objDocument["Tags"]; std::list tempTags; - for (size_t j = 0; j < tagsArray.size(); j++) + for (Json::UInt j = 0; j < tagsArray.size(); j++) tempTags.push_back(tagsArray[j].asString()); SaveInfo * tempSave = new SaveInfo(tempID, tempDate, tempScoreUp, tempScoreDown, @@ -1710,7 +1710,7 @@ RequestBroker::Request * Client::GetCommentsAsync(int saveID, int start, int cou Json::Value commentsArray; dataStream >> commentsArray; - for (size_t j = 0; j < commentsArray.size(); j++) + for (Json::UInt j = 0; j < commentsArray.size(); j++) { int userID = format::StringToNumber(commentsArray[j]["UserID"].asString()); std::string username = commentsArray[j]["Username"].asString(); @@ -1767,7 +1767,7 @@ std::vector > * Client::GetTags(int start, int count resultCount = objDocument["TagTotal"].asInt(); Json::Value tagsArray = objDocument["Tags"]; - for (size_t j = 0; j < tagsArray.size(); j++) + for (Json::UInt j = 0; j < tagsArray.size(); j++) { int tagCount = tagsArray[j]["Count"].asInt(); std::string tag = tagsArray[j]["Tag"].asString(); @@ -1833,7 +1833,7 @@ std::vector * Client::SearchSaves(int start, int count, std::string q resultCount = objDocument["Count"].asInt(); Json::Value savesArray = objDocument["Saves"]; - for (size_t j = 0; j < savesArray.size(); j++) + for (Json::UInt j = 0; j < savesArray.size(); j++) { int tempID = savesArray[j]["ID"].asInt(); int tempDate = savesArray[j]["Date"].asInt(); @@ -1902,7 +1902,7 @@ std::list * Client::RemoveTag(int saveID, std::string tag) Json::Value tagsArray = responseObject["Tags"]; tags = new std::list(); - for (size_t j = 0; j < tagsArray.size(); j++) + for (Json::UInt j = 0; j < tagsArray.size(); j++) tags->push_back(tagsArray[j].asString()); } catch (std::exception &e) @@ -1944,7 +1944,7 @@ std::list * Client::AddTag(int saveID, std::string tag) Json::Value tagsArray = responseObject["Tags"]; tags = new std::list(); - for (size_t j = 0; j < tagsArray.size(); j++) + for (Json::UInt j = 0; j < tagsArray.size(); j++) tags->push_back(tagsArray[j].asString()); } catch (std::exception & e)