diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-16 10:35:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-16 10:35:46 +0200 |
commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/hle/service/am/am.cpp | |
parent | Merge pull request #6307 from Morph1984/fix-response-push-size (diff) | |
parent | core: Make variable shadowing a compile-time error (diff) | |
download | yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.gz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.bz2 yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.lz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.xz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.zst yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.zip |
Diffstat (limited to 'src/core/hle/service/am/am.cpp')
-rw-r--r-- | src/core/hle/service/am/am.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 408e441dc..234173297 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -833,7 +833,7 @@ IStorageImpl::~IStorageImpl() = default; class StorageDataImpl final : public IStorageImpl { public: - explicit StorageDataImpl(std::vector<u8>&& buffer) : buffer{std::move(buffer)} {} + explicit StorageDataImpl(std::vector<u8>&& buffer_) : buffer{std::move(buffer_)} {} std::vector<u8>& GetData() override { return buffer; @@ -1513,9 +1513,9 @@ void IApplicationFunctions::GetDisplayVersion(Kernel::HLERequestContext& ctx) { const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), system.GetContentProvider()}; - auto res = pm.GetControlMetadata(); - if (res.first != nullptr) { - return res; + auto metadata = pm.GetControlMetadata(); + if (metadata.first != nullptr) { + return metadata; } const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(title_id), @@ -1550,9 +1550,9 @@ void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), system.GetContentProvider()}; - auto res = pm.GetControlMetadata(); - if (res.first != nullptr) { - return res; + auto metadata = pm.GetControlMetadata(); + if (metadata.first != nullptr) { + return metadata; } const FileSys::PatchManager pm_update{FileSys::GetUpdateTitleID(title_id), |