diff options
| author | 2018-10-30 05:03:25 +0100 | |
|---|---|---|
| committer | 2018-10-30 00:03:25 -0400 | |
| commit | 7a5eda59146306dedaf3e6f07f97a8c6898543dd (patch) | |
| tree | 78e07b43fb0113f95e1c8e9426d3b394b9524d4e /src/video_core/macro_interpreter.cpp | |
| 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/video_core/macro_interpreter.cpp')
| -rw-r--r-- | src/video_core/macro_interpreter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 377bd66ab..f6af132fb 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp | |||
| @@ -29,7 +29,7 @@ void MacroInterpreter::Execute(const std::vector<u32>& code, std::vector<u32> pa | |||
| 29 | void MacroInterpreter::Reset() { | 29 | void MacroInterpreter::Reset() { |
| 30 | registers = {}; | 30 | registers = {}; |
| 31 | pc = 0; | 31 | pc = 0; |
| 32 | delayed_pc = boost::none; | 32 | delayed_pc = {}; |
| 33 | method_address.raw = 0; | 33 | method_address.raw = 0; |
| 34 | parameters.clear(); | 34 | parameters.clear(); |
| 35 | // The next parameter index starts at 1, because $r1 already has the value of the first | 35 | // The next parameter index starts at 1, because $r1 already has the value of the first |
| @@ -44,10 +44,10 @@ bool MacroInterpreter::Step(const std::vector<u32>& code, bool is_delay_slot) { | |||
| 44 | pc += 4; | 44 | pc += 4; |
| 45 | 45 | ||
| 46 | // Update the program counter if we were delayed | 46 | // Update the program counter if we were delayed |
| 47 | if (delayed_pc != boost::none) { | 47 | if (delayed_pc) { |
| 48 | ASSERT(is_delay_slot); | 48 | ASSERT(is_delay_slot); |
| 49 | pc = *delayed_pc; | 49 | pc = *delayed_pc; |
| 50 | delayed_pc = boost::none; | 50 | delayed_pc = {}; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | switch (opcode.operation) { | 53 | switch (opcode.operation) { |