diff options
| author |  bunnei | 2021-05-16 01:35:46 -0700 |
|---|---|---|
| committer |  GitHub | 2021-05-16 01:35:46 -0700 |
| commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
| tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/loader/loader.h | |
| parent | Merge pull request #6307 from Morph1984/fix-response-push-size (diff) | |
| parent | core: Make variable shadowing a compile-time error (diff) | |
| download | yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.gz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.xz yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.zip | |
Merge pull request #6296 from lioncash/shadow-error
core: Make variable shadowing a compile-time error
Diffstat (limited to 'src/core/loader/loader.h')
| -rw-r--r-- | src/core/loader/loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 9eac11dec..edc8bb257 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -147,7 +147,7 @@ public: | |||
| 147 | }; | 147 | }; |
| 148 | using LoadResult = std::pair<ResultStatus, std::optional<LoadParameters>>; | 148 | using LoadResult = std::pair<ResultStatus, std::optional<LoadParameters>>; |
| 149 | 149 | ||
| 150 | explicit AppLoader(FileSys::VirtualFile file); | 150 | explicit AppLoader(FileSys::VirtualFile file_); |
| 151 | virtual ~AppLoader(); | 151 | virtual ~AppLoader(); |
| 152 | 152 | ||
| 153 | /** | 153 | /** |