Skip to content

Commit

Permalink
Fix type conversion warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ventero committed Feb 12, 2016
1 parent 8105047 commit 20912e0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/CSteam/CSteam.cpp
Expand Up @@ -1045,6 +1045,6 @@ void createParamStringArray(std::vector<std::string> tags,
tagstrings[i] = tags[i].c_str();
}

tagArray->m_nNumStrings = arrayLength;
tagArray->m_nNumStrings = static_cast<int>(arrayLength);
tagArray->m_ppStrings = tagstrings;
}
5 changes: 4 additions & 1 deletion src/FRESteamWorks/FREConverters.cpp
Expand Up @@ -40,7 +40,10 @@ FREObject FREDouble(double value) {

FREObject FREString(std::string value) {
FREObject result;
FRENewObjectFromUTF8(value.size() + 1, (const uint8_t*)value.c_str(), &result);
FRENewObjectFromUTF8(
static_cast<uint32>(value.size()) + 1,
(const uint8_t*)value.c_str(),
&result);
return result;
}

Expand Down
16 changes: 9 additions & 7 deletions src/FRESteamWorks/FRESteamWorks.cpp
Expand Up @@ -285,10 +285,10 @@ AIR_FUNC(AIRSteam_GetGlobalStatHistoryInt) {
return FREArray(0);

auto history = g_Steam->GetGlobalStatHistoryInt(name, days);
size_t size = history.size();
uint32 size = static_cast<uint32>(history.size());

FREObject array = FREArray(size);
for (size_t i = 0; i < size; ++i) {
for (uint32 i = 0; i < size; ++i) {
double value = static_cast<double>(history.at(i));
FRESetArrayElementAt(array, i, FREDouble(value));
}
Expand All @@ -306,10 +306,10 @@ AIR_FUNC(AIRSteam_GetGlobalStatHistoryFloat) {
return FREArray(0);

auto history = g_Steam->GetGlobalStatHistoryFloat(name, days);
size_t size = history.size();
uint32 size = static_cast<uint32>(history.size());

FREObject array = FREArray(size);
for (size_t i = 0; i < size; ++i) {
for (uint32 i = 0; i < size; ++i) {
double value = history.at(i);
FRESetArrayElementAt(array, i, FREDouble(value));
}
Expand Down Expand Up @@ -395,10 +395,11 @@ AIR_FUNC(AIRSteam_UploadLeaderboardScore) {
!FREGetInt32(argv[2], &score)) return FREBool(false);

std::vector<int32> details = getArray<int32>(argv[3], FREGetInt32);
int num_details = static_cast<int>(details.size());

return FREBool(g_Steam->UploadLeaderboardScore(handle,
ELeaderboardUploadScoreMethod(method), score,
details.data(), details.size()));
details.data(), num_details));
}

AIR_FUNC(AIRSteam_UploadLeaderboardScoreResult) {
Expand Down Expand Up @@ -444,8 +445,9 @@ AIR_FUNC(AIRSteam_DownloadLeaderboardEntriesResult) {
auto entries = g_Steam->DownloadLeaderboardEntriesResult(numDetails);
if (entries.empty()) return FREArray(0);

FREObject array = FREArray(entries.size());
for (size_t i = 0; i < entries.size(); ++i) {
uint32 size = static_cast<uint32>(entries.size());
FREObject array = FREArray(size);
for (uint32 i = 0; i < size; ++i) {
FREObject el;
FRENewObject((const uint8_t*)"com.amanitadesign.steam.LeaderboardEntry", 0, NULL, &el, NULL);

Expand Down

0 comments on commit 20912e0

Please sign in to comment.