diff options
| author | bunnei <bunneidev@gmail.com> | 2018-09-07 01:19:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 01:19:51 +0200 |
| commit | b89dda2b98d923d211fb72ca66fda6de7d31cec1 (patch) | |
| tree | 7b0fd1c6f62aa7e45cd3df7e9dea5e49b296c164 | |
| parent | Merge pull request #1252 from lioncash/header (diff) | |
| parent | core/core: Remove unnecessary sm/controller include (diff) | |
| download | yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar.gz yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar.bz2 yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar.lz yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar.xz yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.tar.zst yuzu-b89dda2b98d923d211fb72ca66fda6de7d31cec1.zip | |
| -rw-r--r-- | src/core/core.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/sm/controller.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/sm/controller.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/sm/sm.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/sm/sm.h | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index cbab80881..bf39ad689 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -24,7 +24,6 @@ #include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" #include "core/hle/service/service.h" -#include "core/hle/service/sm/controller.h" #include "core/hle/service/sm/sm.h" #include "core/loader/loader.h" #include "core/perf_stats.h" diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index 1cef73216..cdf328a26 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -57,4 +57,6 @@ Controller::Controller() : ServiceFramework("IpcController") { RegisterHandlers(functions); } +Controller::~Controller() = default; + } // namespace Service::SM diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/controller.h index a4de52cd2..dc66c9e37 100644 --- a/src/core/hle/service/sm/controller.h +++ b/src/core/hle/service/sm/controller.h @@ -11,7 +11,7 @@ namespace Service::SM { class Controller final : public ServiceFramework<Controller> { public: Controller(); - ~Controller() = default; + ~Controller() override; 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 b240d7eed..18d1641b8 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -15,6 +15,7 @@ namespace Service::SM { +ServiceManager::ServiceManager() = default; ServiceManager::~ServiceManager() = default; void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) { diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index e8ea62f08..a58d922a0 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -46,6 +46,7 @@ class ServiceManager { public: static void InstallInterfaces(std::shared_ptr<ServiceManager> self); + ServiceManager(); ~ServiceManager(); ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name, |