summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys/vfs_concat.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-12-08 18:25:58 +0100
committerGitHub <noreply@github.com>2023-12-08 18:25:58 +0100
commit13131e602fd26614a88efa8bb16b2dc611866ebc (patch)
tree24ae0823389770c5d27d1b463c3b635f33ad7d56 /src/core/file_sys/vfs_concat.cpp
parentMerge pull request #11214 from lat9nq/ff-deprecated (diff)
parentfsmitm_romfsbuild: optimize for data locality (diff)
downloadyuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar.gz
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar.bz2
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar.lz
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar.xz
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.tar.zst
yuzu-13131e602fd26614a88efa8bb16b2dc611866ebc.zip
Diffstat (limited to '')
-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;