aboutsummaryrefslogtreecommitdiff
path: root/src/core/file_sys/vfs_concat.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-12-08 12:25:58 -0500
committerGitHub <noreply@github.com>2023-12-08 12:25:58 -0500
commit13131e602fd26614a88efa8bb16b2dc611866ebc (patch)
tree24ae0823389770c5d27d1b463c3b635f33ad7d56 /src/core/file_sys/vfs_concat.cpp
parent7761f298922e3f79c0edca53649b9576c1f42c33 (diff)
parent07514887273edee003b26e308b7ad6bb0c3e8fbc (diff)
Merge pull request #12208 from liamwhite/romfs
romfs: optimize parsing and building
Diffstat (limited to 'src/core/file_sys/vfs_concat.cpp')
-rw-r--r--src/core/file_sys/vfs_concat.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs_concat.cpp b/src/core/file_sys/vfs_concat.cpp
index 168b9cbec..7c7298527 100644
--- a/src/core/file_sys/vfs_concat.cpp
+++ b/src/core/file_sys/vfs_concat.cpp
@@ -59,8 +59,8 @@ VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(std::string&& name,
return VirtualFile(new ConcatenatedVfsFile(std::move(name), std::move(concatenation_map)));
}
-VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(u8 filler_byte, std::string&& name,
- std::multimap<u64, VirtualFile>&& files) {
+VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(
+ u8 filler_byte, std::string&& name, std::vector<std::pair<u64, VirtualFile>>&& files) {
// Fold trivial cases.
if (files.empty()) {
return nullptr;