diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-16 01:35:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-16 01:35:46 -0700 |
| commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
| tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/arm/dynarmic/arm_dynarmic_32.cpp | |
| parent | e8d2de1f99a73d6e92ab91d448e47e087833f7f7 (diff) | |
| parent | 9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7 (diff) | |
Merge pull request #6296 from lioncash/shadow-error
core: Make variable shadowing a compile-time error
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic_32.cpp')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 42a37e84f..ab3266916 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -24,7 +24,7 @@ namespace Core { class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks { public: - explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent) : parent(parent) {} + explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_) : parent{parent_} {} u8 MemoryRead8(u32 vaddr) override { return parent.system.Memory().Read8(vaddr); |