diff options
| author | JosJuice <josjuice@gmail.com> | 2017-01-22 17:27:37 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-01-22 17:27:37 +0100 |
| commit | 79f3b5c5ffef9ea8d67ebe0afa05f8f80acfabda (patch) | |
| tree | 9f6054e9c94dfcfca3192b3e35fd1ec5aee0398c /Source/Core | |
| parent | ce07e5c2f9d5eca51a5d31ae6d036af797ae84cf (diff) | |
Fix -Wshadow warning for file_entry
This struct didn't follow our naming convention,
so let's rename the struct itself instead of
the variable that triggered the warning.
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; |
