diff options
| author | Mai M <mathew1800@gmail.com> | 2021-11-02 18:41:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 18:41:57 -0400 |
| commit | 3d1f2bb3aa2e5bced4ab2342b5e591224f09f0ba (patch) | |
| tree | 5cbd9a62e1daf1c1de97444858064fe8210df077 /src/core/hle/service/ns/ns.cpp | |
| parent | b118fa8698dbe0e2b6e663c1c37a7eac03422905 (diff) | |
| parent | cb09ea0f0174162a85f47fdb8446b397c3c57e20 (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/ns/ns.cpp')
| -rw-r--r-- | src/core/hle/service/ns/ns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 931b48f72..64ffc8572 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -414,7 +414,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage( for (const auto lang : *priority_list) { const auto supported_flag = GetSupportedLanguageFlag(lang); if (supported_languages == 0 || (supported_languages & supported_flag) == supported_flag) { - return MakeResult(static_cast<u8>(lang)); + return static_cast<u8>(lang); } } @@ -448,7 +448,7 @@ ResultVal<u64> IApplicationManagerInterface::ConvertApplicationLanguageToLanguag return ERR_APPLICATION_LANGUAGE_NOT_FOUND; } - return MakeResult(static_cast<u64>(*language_code)); + return static_cast<u64>(*language_code); } IApplicationVersionInterface::IApplicationVersionInterface(Core::System& system_) |
