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/nca_metadata.cpp | |
| 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/nca_metadata.cpp')
| -rw-r--r-- | src/core/file_sys/nca_metadata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/file_sys/nca_metadata.cpp b/src/core/file_sys/nca_metadata.cpp index 3596541b2..f5cb4aa8c 100644 --- a/src/core/file_sys/nca_metadata.cpp +++ b/src/core/file_sys/nca_metadata.cpp @@ -39,10 +39,10 @@ CNMT::CNMT(VirtualFile file) { } } -CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records, - std::vector<MetaRecord> meta_records) - : header(std::move(header)), opt_header(std::move(opt_header)), - content_records(std::move(content_records)), meta_records(std::move(meta_records)) {} +CNMT::CNMT(CNMTHeader header_, OptionalHeader opt_header_, + std::vector<ContentRecord> content_records_, std::vector<MetaRecord> meta_records_) + : header(std::move(header_)), opt_header(std::move(opt_header_)), + content_records(std::move(content_records_)), meta_records(std::move(meta_records_)) {} CNMT::~CNMT() = default; |
