diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-16 01:35:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-16 01:35:46 -0700 |
| commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
| tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/file_sys/vfs_vector.h | |
| parent | e8d2de1f99a73d6e92ab91d448e47e087833f7f7 (diff) | |
| parent | 9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7 (diff) | |
Merge pull request #6296 from lioncash/shadow-error
core: Make variable shadowing a compile-time error
Diffstat (limited to 'src/core/file_sys/vfs_vector.h')
| -rw-r--r-- | src/core/file_sys/vfs_vector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs_vector.h b/src/core/file_sys/vfs_vector.h index c10c527b6..73f180070 100644 --- a/src/core/file_sys/vfs_vector.h +++ b/src/core/file_sys/vfs_vector.h @@ -75,8 +75,8 @@ std::shared_ptr<ArrayVfsFile<Size>> MakeArrayFile(const std::array<u8, Size>& da // An implementation of VfsFile that is backed by a vector optionally supplied upon construction class VectorVfsFile : public VfsFile { public: - explicit VectorVfsFile(std::vector<u8> initial_data = {}, std::string name = "", - VirtualDir parent = nullptr); + explicit VectorVfsFile(std::vector<u8> initial_data = {}, std::string name_ = "", + VirtualDir parent_ = nullptr); ~VectorVfsFile() override; std::string GetName() const override; |