aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/sm/sm.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-04-20 19:29:04 -0400
committerLioncash <mathew1800@gmail.com>2018-04-20 19:44:32 -0400
commit659a612368c98002037d904d511473d8da8e69e4 (patch)
treeeb3a8d9007462f1864174ea4ffe9e5a80d56c9d5 /src/core/hle/service/sm/sm.cpp
parent1df3a7710e92f7bd79c0779925d00217f2948658 (diff)
core: Relocate g_service_manager to the System class
Converts the service manager from a global into an instance-based variable.
Diffstat (limited to 'src/core/hle/service/sm/sm.cpp')
-rw-r--r--src/core/hle/service/sm/sm.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 297a4f2c6..4578fc05f 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -14,6 +14,8 @@
namespace Service::SM {
+ServiceManager::~ServiceManager() = default;
+
void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) {
controller_interface->InvokeRequest(context);
}
@@ -72,7 +74,7 @@ ResultVal<Kernel::SharedPtr<Kernel::ClientSession>> ServiceManager::ConnectToSer
return client_port->Connect();
}
-std::shared_ptr<ServiceManager> g_service_manager;
+SM::~SM() = default;
/**
* SM::Initialize service function