diff options
Diffstat (limited to 'src')
| -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() { | |||
| 122 | auto& kernel = Core::System::GetInstance().Kernel(); | 122 | auto& kernel = Core::System::GetInstance().Kernel(); |
| 123 | auto [server_port, client_port] = | 123 | auto [server_port, client_port] = |
| 124 | Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name); | 124 | Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name); |
| 125 | port = MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)).Unwrap(); | 125 | port = MakeResult(std::move(server_port)).Unwrap(); |
| 126 | port->SetHleHandler(shared_from_this()); | 126 | port->SetHleHandler(shared_from_this()); |
| 127 | return client_port; | 127 | return client_port; |
| 128 | } | 128 | } |
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 | |||
| 58 | Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name); | 58 | Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name); |
| 59 | 59 | ||
| 60 | registered_services.emplace(std::move(name), std::move(client_port)); | 60 | registered_services.emplace(std::move(name), std::move(client_port)); |
| 61 | return MakeResult<Kernel::SharedPtr<Kernel::ServerPort>>(std::move(server_port)); | 61 | return MakeResult(std::move(server_port)); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | ResultCode ServiceManager::UnregisterService(const std::string& name) { | 64 | ResultCode ServiceManager::UnregisterService(const std::string& name) { |
| @@ -81,7 +81,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ClientPort>> ServiceManager::GetServicePort( | |||
| 81 | return ERR_SERVICE_NOT_REGISTERED; | 81 | return ERR_SERVICE_NOT_REGISTERED; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | return MakeResult<Kernel::SharedPtr<Kernel::ClientPort>>(it->second); | 84 | return MakeResult(it->second); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToService( | 87 | ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToService( |