diff options
| author | 2018-10-30 05:03:25 +0100 | |
|---|---|---|
| committer | 2018-10-30 00:03:25 -0400 | |
| commit | 7a5eda59146306dedaf3e6f07f97a8c6898543dd (patch) | |
| tree | 78e07b43fb0113f95e1c8e9426d3b394b9524d4e /src/core/loader | |
| parent | Merge pull request #1621 from lioncash/ipc (diff) | |
| download | yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.gz yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.xz yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.zip | |
global: Use std::optional instead of boost::optional (#1578)
* get rid of boost::optional
* Remove optional references
* Use std::reference_wrapper for optional references
* Fix clang format
* Fix clang format part 2
* Adressed feedback
* Fix clang format and MacOS build
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/loader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index e562b3a04..7686634bf 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -6,10 +6,11 @@ | |||
| 6 | 6 | ||
| 7 | #include <iosfwd> | 7 | #include <iosfwd> |
| 8 | #include <memory> | 8 | #include <memory> |
| 9 | #include <optional> | ||
| 9 | #include <string> | 10 | #include <string> |
| 10 | #include <utility> | 11 | #include <utility> |
| 11 | #include <vector> | 12 | #include <vector> |
| 12 | #include <boost/optional.hpp> | 13 | |
| 13 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 14 | #include "core/file_sys/vfs.h" | 15 | #include "core/file_sys/vfs.h" |
| 15 | 16 | ||
| @@ -145,7 +146,7 @@ public: | |||
| 145 | * information. | 146 | * information. |
| 146 | * @returns A pair with the optional system mode, and and the status. | 147 | * @returns A pair with the optional system mode, and and the status. |
| 147 | */ | 148 | */ |
| 148 | virtual std::pair<boost::optional<u32>, ResultStatus> LoadKernelSystemMode() { | 149 | virtual std::pair<std::optional<u32>, ResultStatus> LoadKernelSystemMode() { |
| 149 | // 96MB allocated to the application. | 150 | // 96MB allocated to the application. |
| 150 | return std::make_pair(2, ResultStatus::Success); | 151 | return std::make_pair(2, ResultStatus::Success); |
| 151 | } | 152 | } |