diff options
author | Liam <byteslice@airmail.cc> | 2023-10-13 19:34:41 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-10-13 20:22:52 +0200 |
commit | 053a16799ef2746763f33a67918a7b87daddf2d0 (patch) | |
tree | c26537689565094cf3df8be17bccee33bc317540 /src/core/file_sys/vfs_concat.h | |
parent | Merge pull request #11769 from liamwhite/qt-ownership-issue (diff) | |
download | yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar.gz yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar.bz2 yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar.lz yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar.xz yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.tar.zst yuzu-053a16799ef2746763f33a67918a7b87daddf2d0.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; |