diff options
author | LC <mathew1800@gmail.com> | 2020-12-07 06:06:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-07 06:06:53 +0100 |
commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/core/file_sys | |
parent | Merge pull request #5155 from comex/xx-default (diff) | |
parent | video_core: Resolve more variable shadowing scenarios pt.3 (diff) | |
download | yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.bz2 yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.lz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.zst yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip |
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/vfs_vector.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/file_sys/vfs_vector.h b/src/core/file_sys/vfs_vector.h index 95d3da2f2..c214db422 100644 --- a/src/core/file_sys/vfs_vector.h +++ b/src/core/file_sys/vfs_vector.h @@ -17,9 +17,9 @@ namespace FileSys { template <std::size_t size> class ArrayVfsFile : public VfsFile { public: - explicit ArrayVfsFile(const std::array<u8, size>& data, std::string name = "", - VirtualDir parent = nullptr) - : data(data), name(std::move(name)), parent(std::move(parent)) {} + explicit ArrayVfsFile(const std::array<u8, size>& data_, std::string name_ = "", + VirtualDir parent_ = nullptr) + : data(data_), name(std::move(name_)), parent(std::move(parent_)) {} std::string GetName() const override { return name; @@ -51,12 +51,12 @@ public: return read; } - std::size_t Write(const u8* data, std::size_t length, std::size_t offset) override { + std::size_t Write(const u8* data_, std::size_t length, std::size_t offset) override { return 0; } - bool Rename(std::string_view name) override { - this->name = name; + bool Rename(std::string_view new_name) override { + name = new_name; return true; } |