summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-10-09 10:34:48 -0400
committerGitHub <noreply@github.com>2019-10-09 10:34:48 -0400
commite664c24355bb4a53b114719a9aba960c82658403 (patch)
tree006b58d490b124edb07c16b9b3c20fceb1800fb4
parentf1990f57f4cfc7e1b0703c2f17bfef6f55918c18 (diff)
parent7b93c4646a63ba0c30be6717edede190f8123008 (diff)
Merge pull request #2921 from FreddyFunk/compiler-warnings-core
Services::ES fix casting warnings
-rw-r--r--src/core/hle/service/es/es.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp
index af70d174d..f77ddd739 100644
--- a/src/core/hle/service/es/es.cpp
+++ b/src/core/hle/service/es/es.cpp
@@ -128,7 +128,7 @@ private:
void CountCommonTicket(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ETicket, "called");
- const auto count = keys.GetCommonTickets().size();
+ const u32 count = static_cast<u32>(keys.GetCommonTickets().size());
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
@@ -138,7 +138,7 @@ private:
void CountPersonalizedTicket(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ETicket, "called");
- const auto count = keys.GetPersonalizedTickets().size();
+ const u32 count = static_cast<u32>(keys.GetPersonalizedTickets().size());
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
@@ -150,7 +150,7 @@ private:
if (keys.GetCommonTickets().empty())
out_entries = 0;
else
- out_entries = ctx.GetWriteBufferSize() / sizeof(u128);
+ out_entries = static_cast<u32>(ctx.GetWriteBufferSize() / sizeof(u128));
LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
@@ -160,7 +160,7 @@ private:
std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
[](const auto& pair) { return pair.first; });
- out_entries = std::min<u32>(ids.size(), out_entries);
+ out_entries = static_cast<u32>(std::min<std::size_t>(ids.size(), out_entries));
ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
IPC::ResponseBuilder rb{ctx, 3};
@@ -173,7 +173,7 @@ private:
if (keys.GetPersonalizedTickets().empty())
out_entries = 0;
else
- out_entries = ctx.GetWriteBufferSize() / sizeof(u128);
+ out_entries = static_cast<u32>(ctx.GetWriteBufferSize() / sizeof(u128));
LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
@@ -183,7 +183,7 @@ private:
std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
[](const auto& pair) { return pair.first; });
- out_entries = std::min<u32>(ids.size(), out_entries);
+ out_entries = static_cast<u32>(std::min<std::size_t>(ids.size(), out_entries));
ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
IPC::ResponseBuilder rb{ctx, 3};