Просмотр исходного кода

hle/service, hle/sm: Use structured bindings where applicable

Gets rid of the need to keep the variables separate from their actual
initialization spots.
Lioncash 7 лет назад
Родитель
Сommit
a8269fdae3
2 измененных файлов с 3 добавлено и 9 удалено
  1. 2 6
      src/core/hle/service/service.cpp
  2. 1 3
      src/core/hle/service/sm/sm.cpp

+ 2 - 6
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());

+ 1 - 3
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));