yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

loader: Remove Linker inheritance from NRO and NSO loaders 

Neither the NRO or NSO loaders actually make use of the functions or
members provided by the Linker interface, so we can just remove the
inheritance altogether.
This commit is contained in:
Lioncash 2019-03-19 20:45:55 -04:00
parent 746167f11a
commit ab00552118
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/loader/nro.h
View File

@ -4,10 +4,10 @@
#pragma once #pragma once
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/loader/linker.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
namespace FileSys { namespace FileSys {
@ -21,7 +21,7 @@ class Process;
namespace Loader { namespace Loader {
/// Loads an NRO file /// Loads an NRO file
class AppLoader_NRO final : public AppLoader, Linker { class AppLoader_NRO final : public AppLoader {
public: public:
explicit AppLoader_NRO(FileSys::VirtualFile file); explicit AppLoader_NRO(FileSys::VirtualFile file);
~AppLoader_NRO() override; ~AppLoader_NRO() override;

4
src/core/loader/nso.h
View File

@ -6,8 +6,8 @@
#include <optional> #include <optional>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
#include "core/loader/linker.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
namespace Kernel { namespace Kernel {
@ -26,7 +26,7 @@ struct NSOArgumentHeader {
static_assert(sizeof(NSOArgumentHeader) == 0x20, "NSOArgumentHeader has incorrect size."); static_assert(sizeof(NSOArgumentHeader) == 0x20, "NSOArgumentHeader has incorrect size.");
/// Loads an NSO file /// Loads an NSO file
class AppLoader_NSO final : public AppLoader, Linker { class AppLoader_NSO final : public AppLoader {
public: public:
explicit AppLoader_NSO(FileSys::VirtualFile file); explicit AppLoader_NSO(FileSys::VirtualFile file);