summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys/vfs_concat.cpp
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-07-12 10:31:01 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-07-12 10:33:35 +0200
commitfd1c3aa14ebda34687b7a4e4e58e1836f7394df8 (patch)
tree5da6c5aa9a03bbe13c37776e3c7f6f2995e474ed /src/core/file_sys/vfs_concat.cpp
parentMerge pull request #4275 from CrazyMax/desired_language (diff)
downloadyuzu-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.cpp')
-rw-r--r--src/core/file_sys/vfs_concat.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/file_sys/vfs_concat.cpp b/src/core/file_sys/vfs_concat.cpp
index 16d801c0c..e0ff70174 100644
--- a/src/core/file_sys/vfs_concat.cpp
+++ b/src/core/file_sys/vfs_concat.cpp
@@ -11,7 +11,7 @@
namespace FileSys {
-static bool VerifyConcatenationMapContinuity(const std::map<u64, VirtualFile>& map) {
+static bool VerifyConcatenationMapContinuity(const std::multimap<u64, VirtualFile>& map) {
const auto last_valid = --map.end();
for (auto iter = map.begin(); iter != last_valid;) {
const auto old = iter++;
@@ -27,12 +27,12 @@ ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::s
: name(std::move(name)) {
std::size_t next_offset = 0;
for (const auto& file : files_) {
- files[next_offset] = file;
+ files.emplace(next_offset, file);
next_offset += file->GetSize();
}
}
-ConcatenatedVfsFile::ConcatenatedVfsFile(std::map<u64, VirtualFile> files_, std::string name)
+ConcatenatedVfsFile::ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files_, std::string name)
: files(std::move(files_)), name(std::move(name)) {
ASSERT(VerifyConcatenationMapContinuity(files));
}
@@ -50,7 +50,7 @@ VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(std::vector<VirtualFile> f
}
VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(u8 filler_byte,
- std::map<u64, VirtualFile> files,
+ std::multimap<u64, VirtualFile> files,
std::string name) {
if (files.empty())
return nullptr;