From a8269fdae345690f28742c5c39470fb9d40ca7cf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Dec 2018 01:29:17 -0500 Subject: hle/service, hle/sm: Use structured bindings where applicable Gets rid of the need to keep the variables separate from their actual initialization spots. --- src/core/hle/service/service.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/core/hle/service/service.cpp') 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 server_port; - SharedPtr 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 ServiceFrameworkBase::CreatePort() { ASSERT(port == nullptr); auto& kernel = Core::System::GetInstance().Kernel(); - Kernel::SharedPtr server_port; - Kernel::SharedPtr client_port; - std::tie(server_port, client_port) = + auto [server_port, client_port] = Kernel::ServerPort::CreatePortPair(kernel, max_sessions, service_name); port = MakeResult>(std::move(server_port)).Unwrap(); port->SetHleHandler(shared_from_this()); -- cgit v1.2.3