aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/mii/mii_manager.cpp
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-11-02 18:41:57 -0400
committerGitHub <noreply@github.com>2021-11-02 18:41:57 -0400
commit3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba (patch)
tree5cbd9a62e1daf1c1de97444858064fe8210df077 /src/core/hle/service/mii/mii_manager.cpp
parentb118fa8698dbe0e2b6e663c1c37a7eac03422905 (diff)
parentcb09ea0f0174162a85f47fdb8446b397c3c57e20 (diff)
Merge pull request #7268 from Morph1984/expected-resultval
common, result: Implement a subset of std::expected and use it in ResultVal
Diffstat (limited to 'src/core/hle/service/mii/mii_manager.cpp')
-rw-r--r--src/core/hle/service/mii/mii_manager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp
index 4fef2aea4..ca4ed35bb 100644
--- a/src/core/hle/service/mii/mii_manager.cpp
+++ b/src/core/hle/service/mii/mii_manager.cpp
@@ -443,14 +443,14 @@ ResultVal<std::vector<MiiInfoElement>> MiiManager::GetDefault(SourceFlag source_
std::vector<MiiInfoElement> result;
if ((source_flag & SourceFlag::Default) == SourceFlag::None) {
- return MakeResult(std::move(result));
+ return result;
}
for (std::size_t index = BaseMiiCount; index < DefaultMiiCount; index++) {
result.emplace_back(BuildDefault(index), Source::Default);
}
- return MakeResult(std::move(result));
+ return result;
}
ResultCode MiiManager::GetIndex([[maybe_unused]] const MiiInfo& info, u32& index) {