diff options
author | bunnei <bunneidev@gmail.com> | 2018-10-08 07:21:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-08 07:21:05 +0200 |
commit | fd891ee9c0342b603574e57ef178620439927256 (patch) | |
tree | 38d4e1dd83f8b04ab447754f2d105a2f821e8750 /src/core/hle/service | |
parent | Merge pull request #1457 from ogniK5377/unmap-buffer (diff) | |
parent | Fixed assertion due to CountAddOnContent (diff) | |
download | yuzu-fd891ee9c0342b603574e57ef178620439927256.tar yuzu-fd891ee9c0342b603574e57ef178620439927256.tar.gz yuzu-fd891ee9c0342b603574e57ef178620439927256.tar.bz2 yuzu-fd891ee9c0342b603574e57ef178620439927256.tar.lz yuzu-fd891ee9c0342b603574e57ef178620439927256.tar.xz yuzu-fd891ee9c0342b603574e57ef178620439927256.tar.zst yuzu-fd891ee9c0342b603574e57ef178620439927256.zip |
Diffstat (limited to 'src/core/hle/service')
-rw-r--r-- | src/core/hle/service/aoc/aoc_u.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp index 79580bcd9..0ecfb5af1 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/aoc_u.cpp @@ -61,13 +61,13 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u"), add_on_content(AccumulateAOCTitleIDs AOC_U::~AOC_U() = default; void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) { - IPC::ResponseBuilder rb{ctx, 4}; + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID(); - rb.Push<u32>(std::count_if(add_on_content.begin(), add_on_content.end(), [¤t](u64 tid) { - return (tid & DLC_BASE_TITLE_ID_MASK) == current; - })); + rb.Push<u32>(static_cast<u32>( + std::count_if(add_on_content.begin(), add_on_content.end(), + [¤t](u64 tid) { return (tid & DLC_BASE_TITLE_ID_MASK) == current; }))); } void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { @@ -91,7 +91,7 @@ void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { return; } - count = std::min<size_t>(out.size() - offset, count); + count = static_cast<u32>(std::min<size_t>(out.size() - offset, count)); std::rotate(out.begin(), out.begin() + offset, out.end()); out.resize(count); |