ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7142 from lioncash/shadow 

Common/MemoryPatches: Silence variable shadowing warnings
This commit is contained in:
Markus Wick 2018-06-21 09:52:47 +02:00 committed by GitHub
parent 9f03d8ca6a dddac76b8c
commit 966cc5bc01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Debug/MemoryPatches.cpp
View File

@ -15,9 +15,9 @@ MemoryPatch::MemoryPatch(u32 address_, std::vector<u8> value_)
{ {
} }
MemoryPatch::MemoryPatch(u32 address, u32 value) MemoryPatch::MemoryPatch(u32 address_, u32 value_)
: MemoryPatch(address, {static_cast<u8>(value >> 24), static_cast<u8>(value >> 16), : MemoryPatch(address_, {static_cast<u8>(value_ >> 24), static_cast<u8>(value_ >> 16),
static_cast<u8>(value >> 8), static_cast<u8>(value)}) static_cast<u8>(value_ >> 8), static_cast<u8>(value_)})
{ {
} }

4
Source/Core/Common/Debug/MemoryPatches.h
View File

@ -20,8 +20,8 @@ struct MemoryPatch
Disabled Disabled
}; };
MemoryPatch(u32 address, std::vector<u8> value); MemoryPatch(u32 address_, std::vector<u8> value_);
MemoryPatch(u32 address, u32 value); MemoryPatch(u32 address_, u32 value_);
u32 address; u32 address;
std::vector<u8> value; std::vector<u8> value;