From ad073846bce4c372e14e0b2fc827067df0e3e624 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 28 Dec 2017 15:27:30 -0500 Subject: [PATCH] service: Clean up apm/lm/applet_oe/controller/sm ctor/dtor. --- src/core/hle/service/am/applet_oe.cpp | 2 -- src/core/hle/service/am/applet_oe.h | 4 ++-- src/core/hle/service/apm/apm.cpp | 2 -- src/core/hle/service/apm/apm.h | 4 ++-- src/core/hle/service/lm/lm.cpp | 2 -- src/core/hle/service/lm/lm.h | 4 ++-- src/core/hle/service/sm/controller.cpp | 2 -- src/core/hle/service/sm/controller.h | 4 ++-- src/core/hle/service/sm/sm.cpp | 2 -- src/core/hle/service/sm/sm.h | 4 ++-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp index a5d80f5c7e..cd8901d2f4 100644 --- a/src/core/hle/service/am/applet_oe.cpp +++ b/src/core/hle/service/am/applet_oe.cpp @@ -16,7 +16,5 @@ AppletOE::AppletOE() : ServiceFramework("appletOE") { RegisterHandlers(functions); } -AppletOE::~AppletOE() = default; - } // namespace AM } // namespace Service diff --git a/src/core/hle/service/am/applet_oe.h b/src/core/hle/service/am/applet_oe.h index 1385428b18..6e1173f010 100644 --- a/src/core/hle/service/am/applet_oe.h +++ b/src/core/hle/service/am/applet_oe.h @@ -11,8 +11,8 @@ namespace AM { class AppletOE final : public ServiceFramework { public: - explicit AppletOE(); - ~AppletOE(); + AppletOE(); + ~AppletOE() = default; }; } // namespace AM diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index 37b5bd6471..3cb7d58610 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -21,7 +21,5 @@ APM::APM() : ServiceFramework("apm") { RegisterHandlers(functions); } -APM::~APM() = default; - } // namespace APM } // namespace Service diff --git a/src/core/hle/service/apm/apm.h b/src/core/hle/service/apm/apm.h index ce6ac0f66e..58472e1890 100644 --- a/src/core/hle/service/apm/apm.h +++ b/src/core/hle/service/apm/apm.h @@ -11,8 +11,8 @@ namespace APM { class APM final : public ServiceFramework { public: - explicit APM(); - ~APM(); + APM(); + ~APM() = default; }; /// Registers all AM services with the specified service manager. diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 72fa6db6be..210c1958e9 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -92,7 +92,5 @@ LM::LM() : ServiceFramework("lm") { RegisterHandlers(functions); } -LM::~LM() = default; - } // namespace LM } // namespace Service diff --git a/src/core/hle/service/lm/lm.h b/src/core/hle/service/lm/lm.h index 05a92f712f..a86798f191 100644 --- a/src/core/hle/service/lm/lm.h +++ b/src/core/hle/service/lm/lm.h @@ -14,8 +14,8 @@ namespace LM { class LM final : public ServiceFramework { public: - explicit LM(); - ~LM(); + LM(); + ~LM() = default; private: void Initialize(Kernel::HLERequestContext& ctx); diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index 174ee81610..414a7d8091 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -54,7 +54,5 @@ Controller::Controller() : ServiceFramework("IpcController") { RegisterHandlers(functions); } -Controller::~Controller() = default; - } // namespace SM } // namespace Service diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/controller.h index bb5a815f8f..e68676ab6c 100644 --- a/src/core/hle/service/sm/controller.h +++ b/src/core/hle/service/sm/controller.h @@ -11,8 +11,8 @@ namespace SM { class Controller final : public ServiceFramework { public: - explicit Controller(); - ~Controller(); + Controller(); + ~Controller() = default; private: void ConvertSessionToDomain(Kernel::HLERequestContext& ctx); diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index e77ec8df96..a976385aca 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -147,7 +147,5 @@ SM::SM(std::shared_ptr service_manager) RegisterHandlers(functions); } -SM::~SM() = default; - } // namespace SM } // namespace Service diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index eb463a6560..e43a351b37 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -23,8 +23,8 @@ namespace SM { /// Interface to "sm:" service class SM final : public ServiceFramework { public: - explicit SM(std::shared_ptr service_manager); - ~SM(); + SM(std::shared_ptr service_manager); + ~SM() = default; private: void Initialize(Kernel::HLERequestContext& ctx);