From a859a35ec861e63f8f4681665c6de132a5b159bb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Sep 2018 13:51:57 -0400 Subject: file_sys/patch_manager: Add missing includes These includes were previously being satisfied indirectly. --- src/core/file_sys/patch_manager.cpp | 4 ++++ src/core/file_sys/patch_manager.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 40675de35..6cecab336 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -2,6 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include +#include + +#include "common/logging/log.h" #include "core/file_sys/content_archive.h" #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h index 28c7ae136..b521977b2 100644 --- a/src/core/file_sys/patch_manager.h +++ b/src/core/file_sys/patch_manager.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include "common/common_types.h" #include "core/file_sys/nca_metadata.h" -- cgit v1.2.3 From b155b3ef816f5c317240dea88956bff733bfaef9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Sep 2018 13:56:13 -0400 Subject: file_sys/nca_patch: Remove unnecessary includes romfs.h doesn't need to be included in the header, the only real dependency here is common's swap.h that needs to be included. --- src/core/file_sys/nca_patch.cpp | 4 ++++ src/core/file_sys/nca_patch.h | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp index e0111bffc..4836706bb 100644 --- a/src/core/file_sys/nca_patch.cpp +++ b/src/core/file_sys/nca_patch.cpp @@ -2,6 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include +#include +#include + #include "common/assert.h" #include "core/crypto/aes_util.h" #include "core/file_sys/nca_patch.h" diff --git a/src/core/file_sys/nca_patch.h b/src/core/file_sys/nca_patch.h index 0d9ad95f5..381f3504f 100644 --- a/src/core/file_sys/nca_patch.h +++ b/src/core/file_sys/nca_patch.h @@ -5,10 +5,13 @@ #pragma once #include +#include #include -#include + +#include "common/common_funcs.h" +#include "common/common_types.h" +#include "common/swap.h" #include "core/crypto/key_manager.h" -#include "core/file_sys/romfs.h" namespace FileSys { -- cgit v1.2.3 From 54724fe9182d6a66556b7861ddfe8ee94088d86a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Sep 2018 14:00:09 -0400 Subject: file_sys/nca_patch: Amend constructor initializer list order Orders the elements in the initializer list in the order they're specified in the class. This prevents compiler warnings about initialization order. --- src/core/file_sys/nca_patch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp index 4836706bb..6fc5bd7d8 100644 --- a/src/core/file_sys/nca_patch.cpp +++ b/src/core/file_sys/nca_patch.cpp @@ -17,9 +17,9 @@ BKTR::BKTR(VirtualFile base_romfs_, VirtualFile bktr_romfs_, RelocationBlock rel std::vector subsection_buckets_, bool is_encrypted_, Core::Crypto::Key128 key_, u64 base_offset_, u64 ivfc_offset_, std::array section_ctr_) - : base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)), - relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)), + : relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)), subsection(subsection_), subsection_buckets(std::move(subsection_buckets_)), + base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)), encrypted(is_encrypted_), key(key_), base_offset(base_offset_), ivfc_offset(ivfc_offset_), section_ctr(section_ctr_) { for (size_t i = 0; i < relocation.number_buckets - 1; ++i) { -- cgit v1.2.3