aboutsummaryrefslogtreecommitdiff
path: root/src/core/file_sys/vfs_layered.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-02 15:12:07 -0700
committerGitHub <noreply@github.com>2021-05-02 15:12:07 -0700
commitc17a59b58e4c78dfee976dabddd13c3c6fdf95b7 (patch)
tree7a935c140bd467ca9e5e3ca27547ee6fee14861f /src/core/file_sys/vfs_layered.h
parent0d2d0844a5b4b189c13f326466b2b2ab94676cd4 (diff)
parent1da72c7792e4f68fd44579a713288f6772c193b4 (diff)
Merge pull request #6269 from lioncash/file-shadow
file_sys: Resolve cases of variable shadowing
Diffstat (limited to 'src/core/file_sys/vfs_layered.h')
-rw-r--r--src/core/file_sys/vfs_layered.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/file_sys/vfs_layered.h b/src/core/file_sys/vfs_layered.h
index 6d7513ac6..cb4b32e91 100644
--- a/src/core/file_sys/vfs_layered.h
+++ b/src/core/file_sys/vfs_layered.h
@@ -23,8 +23,8 @@ public:
VirtualFile GetFileRelative(std::string_view path) const override;
VirtualDir GetDirectoryRelative(std::string_view path) const override;
- VirtualFile GetFile(std::string_view name) const override;
- VirtualDir GetSubdirectory(std::string_view name) const override;
+ VirtualFile GetFile(std::string_view file_name) const override;
+ VirtualDir GetSubdirectory(std::string_view subdir_name) const override;
std::string GetFullPath() const override;
std::vector<VirtualFile> GetFiles() const override;
@@ -33,11 +33,11 @@ public:
bool IsReadable() const override;
std::string GetName() const override;
VirtualDir GetParentDirectory() const override;
- VirtualDir CreateSubdirectory(std::string_view name) override;
- VirtualFile CreateFile(std::string_view name) override;
- bool DeleteSubdirectory(std::string_view name) override;
- bool DeleteFile(std::string_view name) override;
- bool Rename(std::string_view name) override;
+ VirtualDir CreateSubdirectory(std::string_view subdir_name) override;
+ VirtualFile CreateFile(std::string_view file_name) override;
+ bool DeleteSubdirectory(std::string_view subdir_name) override;
+ bool DeleteFile(std::string_view file_name) override;
+ bool Rename(std::string_view new_name) override;
private:
std::vector<VirtualDir> dirs;