From d737652d08ad40ff235772f0ff3daaa9a4478cef Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 6 Apr 2022 17:37:00 -0700 Subject: [PATCH] hle: service: sm: Remove manual tracking of KServerPorts. --- src/core/hle/service/sm/sm.cpp | 7 +------ src/core/hle/service/sm/sm.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 97f8958528..2ac6dc5969 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -153,7 +153,6 @@ ResultVal SM::GetServiceImpl(Kernel::HLERequestContext& auto& port = port_result.Unwrap(); SCOPE_EXIT({ port->GetClientPort().Close(); }); - server_ports.emplace_back(&port->GetServerPort()); // Create a new session. Kernel::KClientSession* session{}; @@ -224,10 +223,6 @@ SM::SM(ServiceManager& service_manager_, Core::System& system_) }); } -SM::~SM() { - for (auto& server_port : server_ports) { - server_port->Close(); - } -} +SM::~SM() = default; } // namespace Service::SM diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 021eb51b40..f3ff7b27e9 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -22,7 +22,6 @@ class KClientPort; class KClientSession; class KernelCore; class KPort; -class KServerPort; class SessionRequestHandler; } // namespace Kernel @@ -48,7 +47,6 @@ private: ServiceManager& service_manager; bool is_initialized{}; Kernel::KernelCore& kernel; - std::vector server_ports; }; class ServiceManager {