From 609cb04f3fef48d20990d8702ee7eed331190876 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 19:00:58 -0400 Subject: acc: Replace profile_manager include with a forward declaration This is only used in a shared_ptr, so we can forward declare it. --- src/core/hle/service/acc/acc.cpp | 4 +++- 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 @@ #include "core/hle/service/acc/acc_su.h" #include "core/hle/service/acc/acc_u0.h" #include "core/hle/service/acc/acc_u1.h" -#include "core/settings.h" +#include "core/hle/service/acc/profile_manager.h" namespace Service::Account { // TODO: RE this structure @@ -202,6 +202,8 @@ Module::Interface::Interface(std::shared_ptr module, : ServiceFramework(name), module(std::move(module)), profile_manager(std::move(profile_manager)) {} +Module::Interface::~Interface() = default; + void InstallInterfaces(SM::ServiceManager& service_manager) { auto module = std::make_shared(); auto profile_manager = std::make_shared(); 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 @@ #pragma once -#include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/service.h" namespace Service::Account { +class ProfileManager; + class Module final { public: class Interface : public ServiceFramework { public: explicit Interface(std::shared_ptr module, std::shared_ptr profile_manager, const char* name); + ~Interface() override; void GetUserCount(Kernel::HLERequestContext& ctx); void GetUserExistence(Kernel::HLERequestContext& ctx); -- cgit v1.2.3