diff options
author | Lioncash <mathew1800@gmail.com> | 2018-10-16 13:16:02 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-10-16 13:22:31 -0400 |
commit | 871350ae357de050a9588ff84b7b1b7539467234 (patch) | |
tree | ba9f17acd7b426ced09803ad298d2b7bbb686be6 /src | |
parent | 441b5b97bd4f0c01b33785ef4d32b3ef3d7ea4fa (diff) |
content_archive: Simpify assignment of bktr_base_romfs in the constructor
std::move doesn't actually dereference the data, so it doesn't matter
whether or not the type is null.
Diffstat (limited to 'src')
-rw-r--r-- | src/core/file_sys/content_archive.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 6ce1cb0ae..6c356d85d 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -103,8 +103,7 @@ static bool IsValidNCA(const NCAHeader& header) { } NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset) - : file(std::move(file_)), - bktr_base_romfs(bktr_base_romfs_ ? std::move(bktr_base_romfs_) : nullptr) { + : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)) { if (file == nullptr) { status = Loader::ResultStatus::ErrorNullFile; return; |