diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2015-12-21 11:44:51 -0500 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2015-12-21 11:44:51 -0500 |
| commit | 4c62a5c0a4a118c59251b295455c18f32c7e909e (patch) | |
| tree | 291fe864295bbcbfc9100f20b3e314222ee0293b /Source/Core/DiscIO/VolumeCreator.cpp | |
| parent | 44a35789936a9df8b01033e1209014841e4cc35c (diff) | |
| parent | aaa89d4f73d2bf6c8c551c2af3b9a27c9b9bb313 (diff) | |
Merge pull request #3370 from rohit-n/warnings
Silence -Wshadow and -Wmaybe-uninitialized warnings.
Diffstat (limited to 'Source/Core/DiscIO/VolumeCreator.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeCreator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 78d9dbfa02..a5cd74cb23 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -128,7 +128,7 @@ static std::unique_ptr<IVolume> CreateVolumeFromCryptedWiiImage(std::unique_ptr< struct SPartition { - SPartition(u64 offset, u32 type) : offset(offset), type(type) {} + SPartition(u64 offset_, u32 type_) : offset(offset_), type(type_) {} u64 offset; u32 type; |