diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-17 17:49:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-17 17:49:11 +0200 |
commit | bd05ace08d04fe42b9cc94dae611adf2859d7c99 (patch) | |
tree | 185415915b3aec7b42f4e4be2ae53790c751d168 /src/core/file_sys/vfs_concat.h | |
parent | Merge pull request #11747 from Kelebek1/image_alias_sample_names (diff) | |
parent | fsmitm_romfsbuild: avoid unnecessary copies of vfs pointers (diff) | |
download | yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.gz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.bz2 yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.lz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.xz yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.tar.zst yuzu-bd05ace08d04fe42b9cc94dae611adf2859d7c99.zip |
Diffstat (limited to 'src/core/file_sys/vfs_concat.h')
-rw-r--r-- | src/core/file_sys/vfs_concat.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/file_sys/vfs_concat.h b/src/core/file_sys/vfs_concat.h index 6b329d545..cbddd12bd 100644 --- a/src/core/file_sys/vfs_concat.h +++ b/src/core/file_sys/vfs_concat.h @@ -24,22 +24,20 @@ private: }; using ConcatenationMap = std::vector<ConcatenationEntry>; - explicit ConcatenatedVfsFile(std::vector<ConcatenationEntry>&& concatenation_map, - std::string&& name); + explicit ConcatenatedVfsFile(std::string&& name, + std::vector<ConcatenationEntry>&& concatenation_map); bool VerifyContinuity() const; public: ~ConcatenatedVfsFile() override; /// Wrapper function to allow for more efficient handling of files.size() == 0, 1 cases. - static VirtualFile MakeConcatenatedFile(const std::vector<VirtualFile>& files, - std::string&& name); + static VirtualFile MakeConcatenatedFile(std::string&& name, std::vector<VirtualFile>&& files); /// Convenience function that turns a map of offsets to files into a concatenated file, filling /// gaps with a given filler byte. - static VirtualFile MakeConcatenatedFile(u8 filler_byte, - const std::multimap<u64, VirtualFile>& files, - std::string&& name); + static VirtualFile MakeConcatenatedFile(u8 filler_byte, std::string&& name, + std::multimap<u64, VirtualFile>&& files); std::string GetName() const override; std::size_t GetSize() const override; |