diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-07-12 10:31:01 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-07-12 10:33:35 +0200 |
commit | fd1c3aa14ebda34687b7a4e4e58e1836f7394df8 (patch) | |
tree | 5da6c5aa9a03bbe13c37776e3c7f6f2995e474ed /src/core/file_sys/vfs_concat.h | |
parent | Merge pull request #4275 from CrazyMax/desired_language (diff) | |
download | yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar.gz yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar.bz2 yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar.lz yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar.xz yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.tar.zst yuzu-fd1c3aa14ebda34687b7a4e4e58e1836f7394df8.zip |
Diffstat (limited to 'src/core/file_sys/vfs_concat.h')
-rw-r--r-- | src/core/file_sys/vfs_concat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_concat.h b/src/core/file_sys/vfs_concat.h index c90f9d5d1..7a26343c0 100644 --- a/src/core/file_sys/vfs_concat.h +++ b/src/core/file_sys/vfs_concat.h @@ -15,7 +15,7 @@ namespace FileSys { // read-only. class ConcatenatedVfsFile : public VfsFile { ConcatenatedVfsFile(std::vector<VirtualFile> files, std::string name); - ConcatenatedVfsFile(std::map<u64, VirtualFile> files, std::string name); + ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files, std::string name); public: ~ConcatenatedVfsFile() override; @@ -25,7 +25,7 @@ public: /// 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, std::map<u64, VirtualFile> files, + static VirtualFile MakeConcatenatedFile(u8 filler_byte, std::multimap<u64, VirtualFile> files, std::string name); std::string GetName() const override; @@ -40,7 +40,7 @@ public: private: // Maps starting offset to file -- more efficient. - std::map<u64, VirtualFile> files; + std::multimap<u64, VirtualFile> files; std::string name; }; |