diff options
| author | 2020-12-30 23:05:01 -0800 | |
|---|---|---|
| committer | 2021-01-11 14:23:16 -0800 | |
| commit | 354130cd84b41ade9541fabc73f22144e6b521ce (patch) | |
| tree | 1fed022f4efa042b8e0d47806315b6527dc120be /src/core | |
| parent | core: hle: Add missing calls to MicroProfileOnThreadExit. (diff) | |
| download | yuzu-354130cd84b41ade9541fabc73f22144e6b521ce.tar.gz yuzu-354130cd84b41ade9541fabc73f22144e6b521ce.tar.xz yuzu-354130cd84b41ade9541fabc73f22144e6b521ce.zip | |
core: arm: arm_interface: Fix shadowing errors.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/arm_interface.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 70098c526..9a0151736 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h | |||
| @@ -26,9 +26,10 @@ using CPUInterrupts = std::array<CPUInterruptHandler, Core::Hardware::NUM_CPU_CO | |||
| 26 | /// Generic ARMv8 CPU interface | 26 | /// Generic ARMv8 CPU interface |
| 27 | class ARM_Interface : NonCopyable { | 27 | class ARM_Interface : NonCopyable { |
| 28 | public: | 28 | public: |
| 29 | explicit ARM_Interface(System& system_, CPUInterrupts& interrupt_handlers, bool uses_wall_clock) | 29 | explicit ARM_Interface(System& system_, CPUInterrupts& interrupt_handlers_, |
| 30 | : system{system_}, interrupt_handlers{interrupt_handlers}, uses_wall_clock{ | 30 | bool uses_wall_clock_) |
| 31 | uses_wall_clock} {} | 31 | : system{system_}, interrupt_handlers{interrupt_handlers_}, uses_wall_clock{ |
| 32 | uses_wall_clock_} {} | ||
| 32 | virtual ~ARM_Interface() = default; | 33 | virtual ~ARM_Interface() = default; |
| 33 | 34 | ||
| 34 | struct ThreadContext32 { | 35 | struct ThreadContext32 { |