diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-06 07:29:17 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-06 07:31:26 +0100 |
commit | a8269fdae345690f28742c5c39470fb9d40ca7cf (patch) | |
tree | 45221243c910eedaa6f71eb3931c63e0f612d520 /src/core/hle | |
parent | Merge pull request #1870 from heapo/pagetable_shrink_to_fit (diff) | |
download | yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar.gz yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar.bz2 yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar.lz yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar.xz yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.tar.zst yuzu-a8269fdae345690f28742c5c39470fb9d40ca7cf.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/service.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.cpp | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 1ec340466..7de2c5a40 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -110,9 +110,7 @@ void ServiceFrameworkBase::InstallAsNamedPort() { ASSERT(port == nullptr); auto& kernel = Core::System::GetInstance().Kernel(); - SharedPtr<ServerPort> server_port; - SharedPtr<ClientPort> client_port; - std::tie(server_port, client_port) = + auto [server_port, client_port] = ServerPort::CreatePortPair(kernel, max_sessions, service_name); server_port->SetHleHandler(shared_from_this()); kernel.AddNamedPort(service_name, std::move(client_port)); @@ -122,9 +120,7 @@ Kernel::SharedPtr<Kernel::ClientPort> ServiceFrameworkBase::CreatePort() { ASSERT(port == nullptr); auto& kernel = Core::System::GetInstance().Kernel(); - Kernel::SharedPtr<Kernel::ServerPort> server_port; - Kernel::SharedPtr<Kernel::ClientPort> client_port; - std::tie(server_port, client_port) = + 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->SetHleHandler(shared_from_this()); diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 0d0f63a78..d0e35b4d6 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -54,9 +54,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> ServiceManager::RegisterService return ERR_ALREADY_REGISTERED; auto& kernel = Core::System::GetInstance().Kernel(); - Kernel::SharedPtr<Kernel::ServerPort> server_port; - Kernel::SharedPtr<Kernel::ClientPort> client_port; - std::tie(server_port, client_port) = + auto [server_port, client_port] = Kernel::ServerPort::CreatePortPair(kernel, max_sessions, name); registered_services.emplace(std::move(name), std::move(client_port)); |