Permalink
Browse files

Merge pull request #7142 from lioncash/shadow

Common/MemoryPatches: Silence variable shadowing warnings
  • Loading branch information...
degasus committed Jun 21, 2018
2 parents 9f03d8c + dddac76 commit 966cc5bc012b18d09e12be71fb246caed755fde3
Showing with 5 additions and 5 deletions.
  1. +3 −3 Source/Core/Common/Debug/MemoryPatches.cpp
  2. +2 −2 Source/Core/Common/Debug/MemoryPatches.h
@@ -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_)})
{
}
@@ -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;

0 comments on commit 966cc5b

Please sign in to comment.