Merge pull request #7142 from lioncash/shadow

Common/MemoryPatches: Silence variable shadowing warnings

2 files changed, 5 insertions, 5 deletions

diff --git a/Source/Core/Common/Debug/MemoryPatches.cpp b/Source/Core/Common/Debug/MemoryPatches.cpp
index 38f96863d0..9b49929d4e 100644
--- a/Source/Core/Common/Debug/MemoryPatches.cpp
+++ b/Source/Core/Common/Debug/MemoryPatches.cpp
@@ -15,9 +15,9 @@ MemoryPatch::MemoryPatch(u32 address_, std::vector<u8> value_)
 {
 }
 
-MemoryPatch::MemoryPatch(u32 address, u32 value)
-    : MemoryPatch(address, {static_cast<u8>(value >> 24), static_cast<u8>(value >> 16),
-                            static_cast<u8>(value >> 8), static_cast<u8>(value)})
+MemoryPatch::MemoryPatch(u32 address_, u32 value_)
+    : MemoryPatch(address_, {static_cast<u8>(value_ >> 24), static_cast<u8>(value_ >> 16),
+                             static_cast<u8>(value_ >> 8), static_cast<u8>(value_)})
 {
 }
 
diff --git a/Source/Core/Common/Debug/MemoryPatches.h b/Source/Core/Common/Debug/MemoryPatches.h
index 6307833abe..2f76443747 100644
--- a/Source/Core/Common/Debug/MemoryPatches.h
+++ b/Source/Core/Common/Debug/MemoryPatches.h
@@ -20,8 +20,8 @@ struct MemoryPatch
     Disabled
   };
 
-  MemoryPatch(u32 address, std::vector<u8> value);
-  MemoryPatch(u32 address, u32 value);
+  MemoryPatch(u32 address_, std::vector<u8> value_);
+  MemoryPatch(u32 address_, u32 value_);
 
   u32 address;
   std::vector<u8> value;