diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-06 07:33:19 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-06 07:33:22 +0100 |
commit | d8625f5544dd0caba80d9ba0be51d0ba96414ae2 (patch) | |
tree | fbbc4412dc29c0624e10d7b80716fe6675ccf1cc /src | |
parent | hle/service, hle/sm: Use structured bindings where applicable (diff) | |
download | yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.gz yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.bz2 yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.lz yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.xz yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.tar.zst yuzu-d8625f5544dd0caba80d9ba0be51d0ba96414ae2.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/service.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 7de2c5a40..0ca234d50 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -122,7 +122,7 @@ Kernel::SharedPtr<Kernel::ClientPort> ServiceFrameworkBase::CreatePort() { auto& kernel = Core::System::GetInstance().Kernel(); auto [server_port, client_port] = Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name); - port = MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)).Unwrap(); + port = MakeResult(std::move(server_port)).Unwrap(); port->SetHleHandler(shared_from_this()); return client_port; } diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index d0e35b4d6..d73530086 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -58,7 +58,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> ServiceManager::RegisterService Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name); registered_services.emplace(std::move(name), std::move(client_port)); - return MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)); + return MakeResult(std::move(server_port)); } ResultCode ServiceManager::UnregisterService(const std::string& name) { @@ -81,7 +81,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> ServiceManager::GetServicePort( return ERR_SERVICE_NOT_REGISTERED; } - return MakeResult<Kernel::SharedPtr<Kernel::ClientPort>>(it->second); + return MakeResult(it->second); } ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToService( |