diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-08-10 05:10:32 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:50:48 +0200 |
commit | 167bfddafadb843236c0fa683cf97eaffaa5ea1a (patch) | |
tree | bd67e895222feb751c4d4625143b9d352eb62847 /src/core/file_sys/vfs_concat.cpp | |
parent | qt: Add 'Install to NAND' option to menu (diff) | |
download | yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar.gz yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar.bz2 yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar.lz yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar.xz yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.tar.zst yuzu-167bfddafadb843236c0fa683cf97eaffaa5ea1a.zip |
Diffstat (limited to 'src/core/file_sys/vfs_concat.cpp')
-rw-r--r-- | src/core/file_sys/vfs_concat.cpp | 8 |
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 1d439e0a4..88a9a5259 100644 --- a/src/core/file_sys/vfs_concat.cpp +++ b/src/core/file_sys/vfs_concat.cpp @@ -9,17 +9,17 @@ namespace FileSys { -VirtualFile ConcatenateFiles(std::vector<VirtualFile> files, std::string_view name) { +VirtualFile ConcatenateFiles(std::vector<VirtualFile> files, std::string name) { if (files.empty()) return nullptr; if (files.size() == 1) return files[0]; - return std::shared_ptr<VfsFile>(new ConcatenatedVfsFile(std::move(files), name)); + return std::shared_ptr<VfsFile>(new ConcatenatedVfsFile(std::move(files), std::move(name))); } -ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::string_view name) - : name(name) { +ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::string name) + : name(std::move(name)) { size_t next_offset = 0; for (const auto& file : files_) { files[next_offset] = file; |