diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-17 15:51:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-17 15:51:47 +0200 |
commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/core/file_sys/romfs.cpp | |
parent | Merge pull request #1329 from raven02/bgr5a1u (diff) | |
parent | Port #4182 from Citra: "Prefix all size_t with std::" (diff) | |
download | yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.gz yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.bz2 yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.lz yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.xz yuzu-076add4ccddff3940e20fc320615e3d330f77119.tar.zst yuzu-076add4ccddff3940e20fc320615e3d330f77119.zip |
Diffstat (limited to 'src/core/file_sys/romfs.cpp')
-rw-r--r-- | src/core/file_sys/romfs.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp index e490c8ace..9f6e41cdf 100644 --- a/src/core/file_sys/romfs.cpp +++ b/src/core/file_sys/romfs.cpp @@ -49,7 +49,7 @@ struct FileEntry { static_assert(sizeof(FileEntry) == 0x20, "FileEntry has incorrect size."); template <typename Entry> -static std::pair<Entry, std::string> GetEntry(const VirtualFile& file, size_t offset) { +static std::pair<Entry, std::string> GetEntry(const VirtualFile& file, std::size_t offset) { Entry entry{}; if (file->ReadObject(&entry, offset) != sizeof(Entry)) return {}; @@ -59,8 +59,8 @@ static std::pair<Entry, std::string> GetEntry(const VirtualFile& file, size_t of return {entry, string}; } -void ProcessFile(VirtualFile file, size_t file_offset, size_t data_offset, u32 this_file_offset, - std::shared_ptr<VectorVfsDirectory> parent) { +void ProcessFile(VirtualFile file, std::size_t file_offset, std::size_t data_offset, + u32 this_file_offset, std::shared_ptr<VectorVfsDirectory> parent) { while (true) { auto entry = GetEntry<FileEntry>(file, file_offset + this_file_offset); @@ -74,8 +74,9 @@ void ProcessFile(VirtualFile file, size_t file_offset, size_t data_offset, u32 t } } -void ProcessDirectory(VirtualFile file, size_t dir_offset, size_t file_offset, size_t data_offset, - u32 this_dir_offset, std::shared_ptr<VectorVfsDirectory> parent) { +void ProcessDirectory(VirtualFile file, std::size_t dir_offset, std::size_t file_offset, + std::size_t data_offset, u32 this_dir_offset, + std::shared_ptr<VectorVfsDirectory> parent) { while (true) { auto entry = GetEntry<DirectoryEntry>(file, dir_offset + this_dir_offset); auto current = std::make_shared<VectorVfsDirectory>( |