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_vector.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_vector.cpp')
-rw-r--r-- | src/core/file_sys/vfs_vector.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs_vector.cpp b/src/core/file_sys/vfs_vector.cpp index 1a3f06227..f64b88639 100644 --- a/src/core/file_sys/vfs_vector.cpp +++ b/src/core/file_sys/vfs_vector.cpp @@ -7,8 +7,8 @@ #include "core/file_sys/vfs_vector.h" namespace FileSys { -VectorVfsFile::VectorVfsFile(std::vector<u8> initial_data, std::string name, VirtualDir parent) - : data(std::move(initial_data)), parent(std::move(parent)), name(std::move(name)) {} +VectorVfsFile::VectorVfsFile(std::vector<u8> initial_data, std::string name_, VirtualDir parent_) + : data(std::move(initial_data)), parent(std::move(parent_)), name(std::move(name_)) {} VectorVfsFile::~VectorVfsFile() = default; |