diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-01-22 17:56:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-22 17:56:51 +0100 |
| commit | 90ee85f4e83ba26ddb9dadd57f72f93405a56ca4 (patch) | |
| tree | 9206b1a159ef222ffdd05af92200028367717d19 /Source/Core | |
| parent | 9c28121af67df4a0d548805f6e14684341441832 (diff) | |
| parent | 79f3b5c5ffef9ea8d67ebe0afa05f8f80acfabda (diff) | |
Merge pull request #4714 from JosJuice/wbfs-file-entry
Fix -Wshadow warning for file_entry
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DiscIO/WbfsBlob.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/WbfsBlob.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 8c29d93202..0d249d72eb 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -146,7 +146,7 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available) u64 cluster_offset = offset & (m_wbfs_sector_size - 1); 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)) { diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h index f2c0d4bfa7..7e1ef3df1d 100644 --- a/Source/Core/DiscIO/WbfsBlob.h +++ b/Source/Core/DiscIO/WbfsBlob.h @@ -41,9 +41,9 @@ private: File::IOFile& SeekToCluster(u64 offset, u64* available); 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_) { } @@ -53,7 +53,7 @@ private: u64 size; }; - std::vector<file_entry> m_files; + std::vector<FileEntry> m_files; u64 m_size; |
