diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-05 04:51:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-05 04:51:08 +0200 |
commit | 403cf6be696b44219e3612b773f5adcdf63c997e (patch) | |
tree | 587ac77fbf0c4aa24c80710c802385bc4ac9b4d6 /src/core/hle/service/pctl/module.cpp | |
parent | Merge pull request #6278 from lioncash/misc-shadow (diff) | |
parent | service: Resolve cases of member field shadowing (diff) | |
download | yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.gz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.bz2 yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.lz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.xz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.zst yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/pctl/module.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/module.cpp index dc59702f1..96f6e90d0 100644 --- a/src/core/hle/service/pctl/module.cpp +++ b/src/core/hle/service/pctl/module.cpp @@ -24,9 +24,8 @@ constexpr ResultCode ResultNoRestrictionEnabled{ErrorModule::PCTL, 181}; class IParentalControlService final : public ServiceFramework<IParentalControlService> { public: - explicit IParentalControlService(Core::System& system_, Capability capability) - : ServiceFramework{system_, "IParentalControlService"}, system(system_), - capability(capability) { + explicit IParentalControlService(Core::System& system_, Capability capability_) + : ServiceFramework{system_, "IParentalControlService"}, capability{capability_} { // clang-format off static const FunctionInfo functions[] = { {1, &IParentalControlService::Initialize, "Initialize"}, @@ -363,7 +362,6 @@ private: ParentalControlSettings settings{}; std::array<char, 8> pin_code{}; bool can_use_stereo_vision = true; - Core::System& system; Capability capability{}; }; @@ -386,8 +384,8 @@ void Module::Interface::CreateServiceWithoutInitialize(Kernel::HLERequestContext } Module::Interface::Interface(Core::System& system_, std::shared_ptr<Module> module_, - const char* name, Capability capability) - : ServiceFramework{system_, name}, module{std::move(module_)}, capability(capability) {} + const char* name_, Capability capability_) + : ServiceFramework{system_, name_}, module{std::move(module_)}, capability{capability_} {} Module::Interface::~Interface() = default; |