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 #4714 from JosJuice/wbfs-file-entry 

Fix -Wshadow warning for file_entry
This commit is contained in:
Markus Wick 2017-01-22 17:56:51 +01:00 committed by GitHub
parent 9c28121af6 79f3b5c5ff
commit 90ee85f4e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/WbfsBlob.cpp
View File

@ -146,7 +146,7 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
u64 cluster_offset = offset & (m_wbfs_sector_size - 1); u64 cluster_offset = offset & (m_wbfs_sector_size - 1);
u64 final_address = cluster_address + cluster_offset; u64 final_address = cluster_address + cluster_offset;
for (file_entry& file_entry : m_files) for (FileEntry& file_entry : m_files)
{ {
if (final_address < (file_entry.base_address + file_entry.size)) if (final_address < (file_entry.base_address + file_entry.size))
{ {

6
Source/Core/DiscIO/WbfsBlob.h
View File

@ -41,9 +41,9 @@ private:
File::IOFile& SeekToCluster(u64 offset, u64* available); File::IOFile& SeekToCluster(u64 offset, u64* available);
bool IsGood() { return m_good; } bool IsGood() { return m_good; }
struct file_entry struct FileEntry
{ {
file_entry(File::IOFile file_, u64 base_address_, u64 size_) FileEntry(File::IOFile file_, u64 base_address_, u64 size_)
: file(std::move(file_)), base_address(base_address_), size(size_) : file(std::move(file_)), base_address(base_address_), size(size_)
{ {
} }
@ -53,7 +53,7 @@ private:
u64 size; u64 size;
}; };
std::vector<file_entry> m_files; std::vector<FileEntry> m_files;
u64 m_size; u64 m_size;