From 9e726a9250033f5c8fbddd917c7779b808d99705 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 May 2021 04:04:05 -0400 Subject: service: Resolve cases of member field shadowing Now all that remains is for kernel code to be 'shadow-free' and then -Wshadow can be turned into an error. --- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/arm/dynarmic/arm_dynarmic_32.cpp') diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 7aeb2a658..42a37e84f 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -198,13 +198,13 @@ void ARM_Dynarmic_32::Step() { jit->Step(); } -ARM_Dynarmic_32::ARM_Dynarmic_32(System& system, CPUInterrupts& interrupt_handlers, - bool uses_wall_clock, ExclusiveMonitor& exclusive_monitor, - std::size_t core_index) - : ARM_Interface{system, interrupt_handlers, uses_wall_clock}, +ARM_Dynarmic_32::ARM_Dynarmic_32(System& system_, CPUInterrupts& interrupt_handlers_, + bool uses_wall_clock_, ExclusiveMonitor& exclusive_monitor_, + std::size_t core_index_) + : ARM_Interface{system_, interrupt_handlers_, uses_wall_clock_}, cb(std::make_unique(*this)), - cp15(std::make_shared(*this)), core_index{core_index}, - exclusive_monitor{dynamic_cast(exclusive_monitor)}, + cp15(std::make_shared(*this)), core_index{core_index_}, + exclusive_monitor{dynamic_cast(exclusive_monitor_)}, jit(MakeJit(nullptr)) {} ARM_Dynarmic_32::~ARM_Dynarmic_32() = default; -- cgit v1.2.3