diff options
| author | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-03-08 20:21:31 -0500 |
|---|---|---|
| committer | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-06-02 18:28:14 -0400 |
| commit | 37bec598ea28662462dcaab65d5abd6db8372dbc (patch) | |
| tree | e1aa020f3884d601182155791d9c474df04fd133 /src/core/loader/loader.h | |
| parent | 1ecb322daa0e2521fe0e179e87889db9aaaf63b0 (diff) | |
Made some changes from review comments:
- Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review).
- Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore.
- Made dialog messages more clear.
- Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic.
- Cleaned up some other stuff.
Diffstat (limited to 'src/core/loader/loader.h')
| -rw-r--r-- | src/core/loader/loader.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 21f73503eb..0a2d4a10e6 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -8,8 +8,11 @@ #include <initializer_list> #include <memory> #include <string> +#include <utility> #include <vector> + #include <boost/optional.hpp> + #include "common/common_types.h" #include "common/file_util.h" @@ -100,13 +103,11 @@ public: * Loads the system mode that this application needs. * This function defaults to 2 (96MB allocated to the application) if it can't read the * information. - * @param boost::optional<u32> Reference to Boost optional to store system mode. - * @ return Result of operation. + * @return A pair with the system mode (If found) and the result. */ - virtual ResultStatus LoadKernelSystemMode(boost::optional<u32>& system_mode) { + virtual std::pair<boost::optional<u32>, ResultStatus> LoadKernelSystemMode() { // 96MB allocated to the application. - system_mode = 2; - return ResultStatus::Success; + return std::make_pair(2, ResultStatus::Success); } /** |