From 1c16700372528665876654da85f486105cb24e71 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 23 Jul 2018 17:19:40 -0400
Subject: nro: Remove unused forward declaration

This isn't used anywhere in the header.
---
 src/core/loader/nro.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/core/loader/nro.h')

diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index 5f3fc40d2..0024ce42b 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -13,8 +13,6 @@
 
 namespace Loader {
 
-struct AssetHeader;
-
 /// Loads an NRO file
 class AppLoader_NRO final : public AppLoader, Linker {
 public:
-- 
cgit v1.2.3


From ac8133b9eea3ad66468aaacc093f494d5e46dbbd Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 23 Jul 2018 17:20:29 -0400
Subject: nro: Make constructor explicit

Makes it consistent with the other Apploader constructors, and prevents
implicit conversions.
---
 src/core/loader/nro.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/loader/nro.h')

diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index 0024ce42b..fe6104754 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -16,7 +16,7 @@ namespace Loader {
 /// Loads an NRO file
 class AppLoader_NRO final : public AppLoader, Linker {
 public:
-    AppLoader_NRO(FileSys::VirtualFile file);
+    explicit AppLoader_NRO(FileSys::VirtualFile file);
 
     /**
      * Returns the type of the file
-- 
cgit v1.2.3


From 1b4d0ac20e3577b8a330a1e79881edaa0dd0143a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 23 Jul 2018 17:27:50 -0400
Subject: 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.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/core/loader/nro.h')

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
-- 
cgit v1.2.3