diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-08-11 02:47:51 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-08-12 04:50:48 +0200 |
| commit | 22bdddd6f01e1976590e6df55fd3bcb29cb8aeef (patch) | |
| tree | c225bafd4c02e06be37d22e360be2f9d29fb51cf /src/core/file_sys | |
| parent | bis_factory: Create NAND dirs if they don't exist (diff) | |
| download | yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar.gz yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar.bz2 yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar.lz yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar.xz yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.tar.zst yuzu-22bdddd6f01e1976590e6df55fd3bcb29cb8aeef.zip | |
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/nca_metadata.cpp | 4 | ||||
| -rw-r--r-- | src/core/file_sys/nca_metadata.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/file_sys/nca_metadata.cpp b/src/core/file_sys/nca_metadata.cpp index 118a0c287..38b5eae80 100644 --- a/src/core/file_sys/nca_metadata.cpp +++ b/src/core/file_sys/nca_metadata.cpp @@ -10,7 +10,7 @@ namespace FileSys { -CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<CNMTHeader>()) { +CNMT::CNMT(VirtualFile file) : header(std::make_unique<CNMTHeader>()) { if (file->ReadObject(header.get()) != sizeof(CNMTHeader)) return; @@ -41,7 +41,7 @@ CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique< CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records, std::vector<MetaRecord> meta_records) - : file(nullptr), header(std::make_unique<CNMTHeader>(std::move(header))), + : header(std::make_unique<CNMTHeader>(std::move(header))), opt_header(std::make_unique<OptionalHeader>(std::move(opt_header))), content_records(std::move(content_records)), meta_records(std::move(meta_records)) {} diff --git a/src/core/file_sys/nca_metadata.h b/src/core/file_sys/nca_metadata.h index 6cd919e54..c1ca9b061 100644 --- a/src/core/file_sys/nca_metadata.h +++ b/src/core/file_sys/nca_metadata.h @@ -96,7 +96,6 @@ public: std::vector<u8> Serialize() const; private: - VirtualFile file; std::unique_ptr<CNMTHeader> header; std::unique_ptr<OptionalHeader> opt_header; std::vector<ContentRecord> content_records; |