summaryrefslogtreecommitdiffstats
path: root/src/core/loader
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-03-20 01:45:55 +0100
committerLioncash <mathew1800@gmail.com>2019-03-20 02:31:59 +0100
commitab00552118eeba8330362a54ab8748916b5a5c65 (patch)
tree74e48c8b16e9a979a1bfcae22239411bb6f7fc79 /src/core/loader
parentMerge pull request #2258 from lioncash/am (diff)
downloadyuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar.gz
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar.bz2
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar.lz
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar.xz
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.tar.zst
yuzu-ab00552118eeba8330362a54ab8748916b5a5c65.zip
Diffstat (limited to '')
-rw-r--r--src/core/loader/nro.h4
-rw-r--r--src/core/loader/nso.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/loader/nro.h b/src/core/loader/nro.h
index 013d629c0..85b0ed644 100644
--- a/src/core/loader/nro.h
+++ b/src/core/loader/nro.h
@@ -4,10 +4,10 @@
#pragma once
+#include <memory>
#include <string>
#include <vector>
#include "common/common_types.h"
-#include "core/loader/linker.h"
#include "core/loader/loader.h"
namespace FileSys {
@@ -21,7 +21,7 @@ class Process;
namespace Loader {
/// Loads an NRO file
-class AppLoader_NRO final : public AppLoader, Linker {
+class AppLoader_NRO final : public AppLoader {
public:
explicit AppLoader_NRO(FileSys::VirtualFile file);
~AppLoader_NRO() override;
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h
index 135b6ea5a..167c8a694 100644
--- a/src/core/loader/nso.h
+++ b/src/core/loader/nso.h
@@ -6,8 +6,8 @@
#include <optional>
#include "common/common_types.h"
+#include "common/swap.h"
#include "core/file_sys/patch_manager.h"
-#include "core/loader/linker.h"
#include "core/loader/loader.h"
namespace Kernel {
@@ -26,7 +26,7 @@ struct NSOArgumentHeader {
static_assert(sizeof(NSOArgumentHeader) == 0x20, "NSOArgumentHeader has incorrect size.");
/// Loads an NSO file
-class AppLoader_NSO final : public AppLoader, Linker {
+class AppLoader_NSO final : public AppLoader {
public:
explicit AppLoader_NSO(FileSys::VirtualFile file);