summaryrefslogtreecommitdiff
path: root/src/core/loader/nso.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-15 17:48:36 -0400
committerGitHub <noreply@github.com>2018-10-15 17:48:36 -0400
commit50e6205c21e398da6554b8c70b801f98035cc456 (patch)
tree4929a2300446ae6965191ac5c600a3f767468089 /src/core/loader/nso.h
parent76654113176b1f8759504080a6ccdfd422cd6777 (diff)
parentbed872ed38e19d34c6c2e3d1a3d35a9f72e46970 (diff)
Merge pull request #1499 from lioncash/nro
nro/nso: Minor error handling changes
Diffstat (limited to 'src/core/loader/nso.h')
-rw-r--r--src/core/loader/nso.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/loader/nso.h b/src/core/loader/nso.h
index 70ab3b718..433306139 100644
--- a/src/core/loader/nso.h
+++ b/src/core/loader/nso.h
@@ -4,6 +4,7 @@
#pragma once
+#include <optional>
#include "common/common_types.h"
#include "core/file_sys/patch_manager.h"
#include "core/loader/linker.h"
@@ -36,8 +37,9 @@ public:
return IdentifyType(file);
}
- static VAddr LoadModule(FileSys::VirtualFile file, VAddr load_base, bool should_pass_arguments,
- boost::optional<FileSys::PatchManager> pm = boost::none);
+ static std::optional<VAddr> LoadModule(const FileSys::VfsFile& file, VAddr load_base,
+ bool should_pass_arguments,
+ std::optional<FileSys::PatchManager> pm = {});
ResultStatus Load(Kernel::Process& process) override;
};