Просмотр исходного кода

nro: Replace inclusion with a forward declaration

It's sufficient to use a forward declaration instead of a direct
inclusion here.
Lioncash 8 лет назад
Родитель
Сommit
1b4d0ac20e
2 измененных файлов с 8 добавлено и 1 удалено
  1. 3 0
      src/core/loader/nro.cpp
  2. 5 1
      src/core/loader/nro.h

+ 3 - 0
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{};

+ 5 - 1
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