diff options
| author | bunnei <bunneidev@gmail.com> | 2023-08-09 21:24:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 21:24:31 -0700 |
| commit | 9d3a293a4ea17b60146c10e7561c0fd1219fd6c1 (patch) | |
| tree | b69936f3e53ee675de0ca21a1dffabd7e71acae0 /src/core/hle/service/mii/mii_manager.cpp | |
| parent | 3d6ce9dd2b5bad115b295fb7092abc5c30a34448 (diff) | |
| parent | 1e394c6cdf1ab83c83477c19c0e736a95b86e8da (diff) | |
Merge pull request #11093 from liamwhite/result-ergonomics
core: remove ResultVal type
Diffstat (limited to 'src/core/hle/service/mii/mii_manager.cpp')
| -rw-r--r-- | src/core/hle/service/mii/mii_manager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index c920650f5..46125d473 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -409,8 +409,7 @@ u32 MiiManager::GetCount(SourceFlag source_flag) const { return static_cast<u32>(count); } -ResultVal<CharInfo> MiiManager::UpdateLatest([[maybe_unused]] const CharInfo& info, - SourceFlag source_flag) { +Result MiiManager::UpdateLatest(CharInfo* out_info, const CharInfo& info, SourceFlag source_flag) { if ((source_flag & SourceFlag::Database) == SourceFlag::None) { return ERROR_CANNOT_FIND_ENTRY; } @@ -672,7 +671,7 @@ bool MiiManager::ValidateV3Info(const Ver3StoreData& mii_v3) const { return is_valid; } -ResultVal<std::vector<MiiInfoElement>> MiiManager::GetDefault(SourceFlag source_flag) { +std::vector<MiiInfoElement> MiiManager::GetDefault(SourceFlag source_flag) { std::vector<MiiInfoElement> result; if ((source_flag & SourceFlag::Default) == SourceFlag::None) { |