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/glue/glue_manager.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/glue/glue_manager.cpp')
| -rw-r--r-- | src/core/hle/service/glue/glue_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/glue/glue_manager.cpp b/src/core/hle/service/glue/glue_manager.cpp index aa9d48c0c..48e133b48 100644 --- a/src/core/hle/service/glue/glue_manager.cpp +++ b/src/core/hle/service/glue/glue_manager.cpp @@ -26,7 +26,7 @@ ResultVal<ApplicationLaunchProperty> ARPManager::GetLaunchProperty(u64 title_id) return ERR_NOT_REGISTERED; } - return MakeResult<ApplicationLaunchProperty>(iter->second.launch); + return iter->second.launch; } ResultVal<std::vector<u8>> ARPManager::GetControlProperty(u64 title_id) const { @@ -39,7 +39,7 @@ ResultVal<std::vector<u8>> ARPManager::GetControlProperty(u64 title_id) const { return ERR_NOT_REGISTERED; } - return MakeResult<std::vector<u8>>(iter->second.control); + return iter->second.control; } ResultCode ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, |