yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #2921 from FreddyFunk/compiler-warnings-core 

Services::ES fix casting warnings
This commit is contained in:
bunnei 2019-10-09 10:34:48 -04:00 committed by GitHub
parent f1990f57f4 7b93c4646a
commit e664c24355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/service/es/es.cpp
View File

@ -128,7 +128,7 @@ private:
void CountCommonTicket(Kernel::HLERequestContext& ctx) { void CountCommonTicket(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ETicket, "called"); 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}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -138,7 +138,7 @@ private:
void CountPersonalizedTicket(Kernel::HLERequestContext& ctx) { void CountPersonalizedTicket(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ETicket, "called"); 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}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -150,7 +150,7 @@ private:
if (keys.GetCommonTickets().empty()) if (keys.GetCommonTickets().empty())
out_entries = 0; out_entries = 0;
else 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); LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
@ -160,7 +160,7 @@ private:
std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids), std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
[](const auto& pair) { return pair.first; }); [](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)); ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
@ -173,7 +173,7 @@ private:
if (keys.GetPersonalizedTickets().empty()) if (keys.GetPersonalizedTickets().empty())
out_entries = 0; out_entries = 0;
else 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); LOG_DEBUG(Service_ETicket, "called, entries={:016X}", out_entries);
@ -183,7 +183,7 @@ private:
std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids), std::transform(tickets.begin(), tickets.end(), std::back_inserter(ids),
[](const auto& pair) { return pair.first; }); [](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)); ctx.WriteBuffer(ids.data(), out_entries * sizeof(u128));
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};