From 22bdddd6f01e1976590e6df55fd3bcb29cb8aeef Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 10 Aug 2018 20:47:51 -0400 Subject: nca_metadata: Remove unnecessary reference to base file --- src/core/file_sys/nca_metadata.cpp | 4 ++-- src/core/file_sys/nca_metadata.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core') 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()) { +CNMT::CNMT(VirtualFile file) : header(std::make_unique()) { 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 content_records, std::vector meta_records) - : file(nullptr), header(std::make_unique(std::move(header))), + : header(std::make_unique(std::move(header))), opt_header(std::make_unique(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 Serialize() const; private: - VirtualFile file; std::unique_ptr header; std::unique_ptr opt_header; std::vector content_records; -- cgit v1.2.3