diff options
| author | 2018-10-30 05:03:25 +0100 | |
|---|---|---|
| committer | 2018-10-30 00:03:25 -0400 | |
| commit | 7a5eda59146306dedaf3e6f07f97a8c6898543dd (patch) | |
| tree | 78e07b43fb0113f95e1c8e9426d3b394b9524d4e /src/tests/core | |
| 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/tests/core')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.cpp | 10 | ||||
| -rw-r--r-- | src/tests/core/arm/arm_test_common.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp index 37e15bad0..9b8a44fa1 100644 --- a/src/tests/core/arm/arm_test_common.cpp +++ b/src/tests/core/arm/arm_test_common.cpp | |||
| @@ -64,11 +64,11 @@ void TestEnvironment::ClearWriteRecords() { | |||
| 64 | 64 | ||
| 65 | TestEnvironment::TestMemory::~TestMemory() {} | 65 | TestEnvironment::TestMemory::~TestMemory() {} |
| 66 | 66 | ||
| 67 | boost::optional<bool> TestEnvironment::TestMemory::IsValidAddress(VAddr addr) { | 67 | std::optional<bool> TestEnvironment::TestMemory::IsValidAddress(VAddr addr) { |
| 68 | return true; | 68 | return true; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | boost::optional<u8> TestEnvironment::TestMemory::Read8(VAddr addr) { | 71 | std::optional<u8> TestEnvironment::TestMemory::Read8(VAddr addr) { |
| 72 | const auto iter = data.find(addr); | 72 | const auto iter = data.find(addr); |
| 73 | 73 | ||
| 74 | if (iter == data.end()) { | 74 | if (iter == data.end()) { |
| @@ -79,15 +79,15 @@ boost::optional<u8> TestEnvironment::TestMemory::Read8(VAddr addr) { | |||
| 79 | return iter->second; | 79 | return iter->second; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | boost::optional<u16> TestEnvironment::TestMemory::Read16(VAddr addr) { | 82 | std::optional<u16> TestEnvironment::TestMemory::Read16(VAddr addr) { |
| 83 | return *Read8(addr) | static_cast<u16>(*Read8(addr + 1)) << 8; | 83 | return *Read8(addr) | static_cast<u16>(*Read8(addr + 1)) << 8; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | boost::optional<u32> TestEnvironment::TestMemory::Read32(VAddr addr) { | 86 | std::optional<u32> TestEnvironment::TestMemory::Read32(VAddr addr) { |
| 87 | return *Read16(addr) | static_cast<u32>(*Read16(addr + 2)) << 16; | 87 | return *Read16(addr) | static_cast<u32>(*Read16(addr + 2)) << 16; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | boost::optional<u64> TestEnvironment::TestMemory::Read64(VAddr addr) { | 90 | std::optional<u64> TestEnvironment::TestMemory::Read64(VAddr addr) { |
| 91 | return *Read32(addr) | static_cast<u64>(*Read32(addr + 4)) << 32; | 91 | return *Read32(addr) | static_cast<u64>(*Read32(addr + 4)) << 32; |
| 92 | } | 92 | } |
| 93 | 93 | ||
diff --git a/src/tests/core/arm/arm_test_common.h b/src/tests/core/arm/arm_test_common.h index 5de8dab4e..0b7539601 100644 --- a/src/tests/core/arm/arm_test_common.h +++ b/src/tests/core/arm/arm_test_common.h | |||
| @@ -64,12 +64,12 @@ private: | |||
| 64 | 64 | ||
| 65 | ~TestMemory() override; | 65 | ~TestMemory() override; |
| 66 | 66 | ||
| 67 | boost::optional<bool> IsValidAddress(VAddr addr) override; | 67 | std::optional<bool> IsValidAddress(VAddr addr) override; |
| 68 | 68 | ||
| 69 | boost::optional<u8> Read8(VAddr addr) override; | 69 | std::optional<u8> Read8(VAddr addr) override; |
| 70 | boost::optional<u16> Read16(VAddr addr) override; | 70 | std::optional<u16> Read16(VAddr addr) override; |
| 71 | boost::optional<u32> Read32(VAddr addr) override; | 71 | std::optional<u32> Read32(VAddr addr) override; |
| 72 | boost::optional<u64> Read64(VAddr addr) override; | 72 | std::optional<u64> Read64(VAddr addr) override; |
| 73 | 73 | ||
| 74 | bool ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size) override; | 74 | bool ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size) override; |
| 75 | 75 | ||