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_concat.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_concat.h')
| -rw-r--r-- | src/core/file_sys/vfs_concat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs_concat.h b/src/core/file_sys/vfs_concat.h index 3397d32cd..cd32960a5 100644 --- a/src/core/file_sys/vfs_concat.h +++ b/src/core/file_sys/vfs_concat.h @@ -14,8 +14,8 @@ namespace FileSys { // Class that wraps multiple vfs files and concatenates them, making reads seamless. Currently // read-only. class ConcatenatedVfsFile : public VfsFile { - ConcatenatedVfsFile(std::vector<VirtualFile> files, std::string name); - ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files, std::string name); + explicit ConcatenatedVfsFile(std::vector<VirtualFile> files, std::string name_); + explicit ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files, std::string name_); public: ~ConcatenatedVfsFile() override; |