From 1b4d0ac20e3577b8a330a1e79881edaa0dd0143a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 23 Jul 2018 17:27:50 -0400
Subject: [PATCH] nro: Replace inclusion with a forward declaration
It's sufficient to use a forward declaration instead of a direct
inclusion here.
---
src/core/loader/nro.cpp | 3 +++
src/core/loader/nro.h | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp
index f6f12c31c..7d3ec2a76 100644
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -6,6 +6,7 @@
#include <vector>
#include "common/common_funcs.h"
+#include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/swap.h"
@@ -106,6 +107,8 @@ AppLoader_NRO::AppLoader_NRO(FileSys::VirtualFile file) : AppLoader(file) {
}
}
+AppLoader_NRO::~AppLoader_NRO() = default;
+
FileType AppLoader_NRO::IdentifyType(const FileSys::VirtualFile& file) {
// Read NSO header
NroHeader nro_header{};
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index fe6104754..04a0f497e 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -6,17 +6,21 @@
#include <string>
#include "common/common_types.h"
-#include "core/file_sys/control_metadata.h"
#include "core/hle/kernel/kernel.h"
#include "core/loader/linker.h"
#include "core/loader/loader.h"
+namespace FileSys {
+class NACP;
+}
+
namespace Loader {
/// Loads an NRO file
class AppLoader_NRO final : public AppLoader, Linker {
public:
explicit AppLoader_NRO(FileSys::VirtualFile file);
+ ~AppLoader_NRO() override;
/**
* Returns the type of the file