octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1251 from lioncash/core-inc 

core/core: Remove unnecessary sm/controller include
This commit is contained in:
bunnei 2018-09-06 19:19:51 -04:00 committed by GitHub
parent 9947c6ad59 56ab608044
commit b89dda2b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/core.cpp
View File

@ -24,7 +24,6 @@
#include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/controller.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "core/perf_stats.h" #include "core/perf_stats.h"

2
src/core/hle/service/sm/controller.cpp
View File

@ -57,4 +57,6 @@ Controller::Controller() : ServiceFramework("IpcController") {
RegisterHandlers(functions); RegisterHandlers(functions);
} }
Controller::~Controller() = default;
} // namespace Service::SM } // namespace Service::SM

2
src/core/hle/service/sm/controller.h
View File

@ -11,7 +11,7 @@ namespace Service::SM {
class Controller final : public ServiceFramework<Controller> { class Controller final : public ServiceFramework<Controller> {
public: public:
Controller(); Controller();
~Controller() = default; ~Controller() override;
private: private:
void ConvertSessionToDomain(Kernel::HLERequestContext& ctx); void ConvertSessionToDomain(Kernel::HLERequestContext& ctx);

1
src/core/hle/service/sm/sm.cpp
View File

@ -15,6 +15,7 @@
namespace Service::SM { namespace Service::SM {
ServiceManager::ServiceManager() = default;
ServiceManager::~ServiceManager() = default; ServiceManager::~ServiceManager() = default;
void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) { void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) {

1
src/core/hle/service/sm/sm.h
View File

@ -46,6 +46,7 @@ class ServiceManager {
public: public:
static void InstallInterfaces(std::shared_ptr<ServiceManager> self); static void InstallInterfaces(std::shared_ptr<ServiceManager> self);
ServiceManager();
~ServiceManager(); ~ServiceManager();
ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name, ResultVal<Kernel::SharedPtr<Kernel::ServerPort>> RegisterService(std::string name,