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_static.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_static.h')
| -rw-r--r-- | src/core/file_sys/vfs_static.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/vfs_static.h b/src/core/file_sys/vfs_static.h index c840b24b9..f5b66cf71 100644 --- a/src/core/file_sys/vfs_static.h +++ b/src/core/file_sys/vfs_static.h @@ -14,9 +14,9 @@ namespace FileSys { class StaticVfsFile : public VfsFile { public: - explicit StaticVfsFile(u8 value, std::size_t size = 0, std::string name = "", - VirtualDir parent = nullptr) - : value{value}, size{size}, name{std::move(name)}, parent{std::move(parent)} {} + explicit StaticVfsFile(u8 value_, std::size_t size_ = 0, std::string name_ = "", + VirtualDir parent_ = nullptr) + : value{value_}, size{size_}, name{std::move(name_)}, parent{std::move(parent_)} {} std::string GetName() const override { return name; |