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/sm/sm.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/sm/sm.cpp')
| -rw-r--r-- | src/core/hle/service/sm/sm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index ae4dc4a75..41abb146c 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -87,7 +87,7 @@ ResultVal<Kernel::KPort*> ServiceManager::GetServicePort(const std::string& name auto handler = it->second; port->GetServerPort().SetSessionHandler(std::move(handler)); - return MakeResult(port); + return port; } /** @@ -165,7 +165,7 @@ ResultVal<Kernel::KClientSession*> SM::GetServiceImpl(Kernel::HLERequestContext& LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetId()); - return MakeResult(session); + return session; } void SM::RegisterService(Kernel::HLERequestContext& ctx) { |