diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-16 10:35:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-16 10:35:46 +0200 |
| commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
| tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/file_sys/vfs_concat.cpp | |
| parent | Merge pull request #6307 from Morph1984/fix-response-push-size (diff) | |
| parent | core: Make variable shadowing a compile-time error (diff) | |
| download | yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.gz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.bz2 yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.lz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.xz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.zst yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.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 619081502..5f8c09124 100644 --- a/src/core/file_sys/vfs_concat.cpp +++ b/src/core/file_sys/vfs_concat.cpp @@ -23,8 +23,8 @@ static bool VerifyConcatenationMapContinuity(const std::multimap<u64, VirtualFil return map.begin()->first == 0; } -ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::string name) - : name(std::move(name)) { +ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::string name_) + : name(std::move(name_)) { std::size_t next_offset = 0; for (const auto& file : files_) { files.emplace(next_offset, file); @@ -32,8 +32,8 @@ ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::s } } -ConcatenatedVfsFile::ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files_, std::string name) - : files(std::move(files_)), name(std::move(name)) { +ConcatenatedVfsFile::ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files_, std::string name_) + : files(std::move(files_)), name(std::move(name_)) { ASSERT(VerifyConcatenationMapContinuity(files)); } |