summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-06 00:53:32 +0200
committerGitHub <noreply@github.com>2018-09-06 00:53:32 +0200
commit94f193af6507d80b01f3ec1923edacf16e00e393 (patch)
treeb9f8116f7a5db1e5b262939e4f2eabf12d3c73da
parentMerge pull request #1179 from DarkLordZach/bktr (diff)
parentfile_sys/submission_package: Correct constructor initialization list order (diff)
downloadyuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar.gz
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar.bz2
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar.lz
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar.xz
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.tar.zst
yuzu-94f193af6507d80b01f3ec1923edacf16e00e393.zip
-rw-r--r--src/core/file_sys/submission_package.cpp12
-rw-r--r--src/core/file_sys/submission_package.h13
2 files changed, 17 insertions, 8 deletions
diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp
index 182b40698..11264878d 100644
--- a/src/core/file_sys/submission_package.cpp
+++ b/src/core/file_sys/submission_package.cpp
@@ -2,9 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+#include <cstring>
+#include <string_view>
+
#include <fmt/ostream.h>
-#include "common/assert.h"
+
#include "common/hex_util.h"
+#include "common/logging/log.h"
+#include "core/crypto/key_manager.h"
#include "core/file_sys/content_archive.h"
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/partition_filesystem.h"
@@ -13,8 +19,8 @@
namespace FileSys {
NSP::NSP(VirtualFile file_)
- : file(std::move(file_)),
- pfs(std::make_shared<PartitionFilesystem>(file)), status{Loader::ResultStatus::Success} {
+ : file(std::move(file_)), status{Loader::ResultStatus::Success},
+ pfs(std::make_shared<PartitionFilesystem>(file)) {
if (pfs->GetStatus() != Loader::ResultStatus::Success) {
status = pfs->GetStatus();
return;
diff --git a/src/core/file_sys/submission_package.h b/src/core/file_sys/submission_package.h
index 0292164f9..1120a4920 100644
--- a/src/core/file_sys/submission_package.h
+++ b/src/core/file_sys/submission_package.h
@@ -4,20 +4,23 @@
#pragma once
-#include <array>
#include <map>
+#include <memory>
#include <vector>
#include "common/common_types.h"
-#include "common/swap.h"
-#include "core/file_sys/content_archive.h"
-#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/vfs.h"
-#include "core/loader/loader.h"
+
+namespace Loader {
+enum class ResultStatus : u16;
+}
namespace FileSys {
+class NCA;
class PartitionFilesystem;
+enum class ContentRecordType : u8;
+
class NSP : public ReadOnlyVfsDirectory {
public:
explicit NSP(VirtualFile file);