diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-06-19 21:21:52 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-06-19 21:33:50 -0400 |
| commit | dddac76b8ce68ddf3f6fdfbe8e5ed0c992ceef46 (patch) | |
| tree | 28897c7a0bb129506e3be71db4216579c1b07f9c /Source/Core/Common/Debug | |
| parent | 18c3e0302f6bca8546516173f4cb3ab0aa896a90 (diff) | |
Common/MemoryPatches: Silence variable shadowing warnings
Diffstat (limited to 'Source/Core/Common/Debug')
| -rw-r--r-- | Source/Core/Common/Debug/MemoryPatches.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Common/Debug/MemoryPatches.h | 4 |
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; |
