diff options
| author | 2018-08-20 19:00:58 -0400 | |
|---|---|---|
| committer | 2018-08-20 19:48:57 -0400 | |
| commit | 609cb04f3fef48d20990d8702ee7eed331190876 (patch) | |
| tree | 69aad6491f9a866b799f9cd5c601917b77c16d8e /src | |
| parent | acc: Simplify WriteBuffer call within LoadImage() (diff) | |
| download | yuzu-609cb04f3fef48d20990d8702ee7eed331190876.tar.gz yuzu-609cb04f3fef48d20990d8702ee7eed331190876.tar.xz yuzu-609cb04f3fef48d20990d8702ee7eed331190876.zip | |
acc: Replace profile_manager include with a forward declaration
This is only used in a shared_ptr, so we can forward declare it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/acc/acc.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/acc/acc.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 274d54653..1502dbf55 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "core/hle/service/acc/acc_su.h" | 13 | #include "core/hle/service/acc/acc_su.h" |
| 14 | #include "core/hle/service/acc/acc_u0.h" | 14 | #include "core/hle/service/acc/acc_u0.h" |
| 15 | #include "core/hle/service/acc/acc_u1.h" | 15 | #include "core/hle/service/acc/acc_u1.h" |
| 16 | #include "core/settings.h" | 16 | #include "core/hle/service/acc/profile_manager.h" |
| 17 | 17 | ||
| 18 | namespace Service::Account { | 18 | namespace Service::Account { |
| 19 | // TODO: RE this structure | 19 | // TODO: RE this structure |
| @@ -202,6 +202,8 @@ Module::Interface::Interface(std::shared_ptr<Module> module, | |||
| 202 | : ServiceFramework(name), module(std::move(module)), | 202 | : ServiceFramework(name), module(std::move(module)), |
| 203 | profile_manager(std::move(profile_manager)) {} | 203 | profile_manager(std::move(profile_manager)) {} |
| 204 | 204 | ||
| 205 | Module::Interface::~Interface() = default; | ||
| 206 | |||
| 205 | void InstallInterfaces(SM::ServiceManager& service_manager) { | 207 | void InstallInterfaces(SM::ServiceManager& service_manager) { |
| 206 | auto module = std::make_shared<Module>(); | 208 | auto module = std::make_shared<Module>(); |
| 207 | auto profile_manager = std::make_shared<ProfileManager>(); | 209 | auto profile_manager = std::make_shared<ProfileManager>(); |
diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h index d7c6d2415..c7ed74351 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/core/hle/service/acc/acc.h | |||
| @@ -4,17 +4,19 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "core/hle/service/acc/profile_manager.h" | ||
| 8 | #include "core/hle/service/service.h" | 7 | #include "core/hle/service/service.h" |
| 9 | 8 | ||
| 10 | namespace Service::Account { | 9 | namespace Service::Account { |
| 11 | 10 | ||
| 11 | class ProfileManager; | ||
| 12 | |||
| 12 | class Module final { | 13 | class Module final { |
| 13 | public: | 14 | public: |
| 14 | class Interface : public ServiceFramework<Interface> { | 15 | class Interface : public ServiceFramework<Interface> { |
| 15 | public: | 16 | public: |
| 16 | explicit Interface(std::shared_ptr<Module> module, | 17 | explicit Interface(std::shared_ptr<Module> module, |
| 17 | std::shared_ptr<ProfileManager> profile_manager, const char* name); | 18 | std::shared_ptr<ProfileManager> profile_manager, const char* name); |
| 19 | ~Interface() override; | ||
| 18 | 20 | ||
| 19 | void GetUserCount(Kernel::HLERequestContext& ctx); | 21 | void GetUserCount(Kernel::HLERequestContext& ctx); |
| 20 | void GetUserExistence(Kernel::HLERequestContext& ctx); | 22 | void GetUserExistence(Kernel::HLERequestContext& ctx); |