diff options
| author | bunnei <bunneidev@gmail.com> | 2018-09-17 09:51:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 09:51:47 -0400 |
| commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
| tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/tests/core/arm/arm_test_common.h | |
| parent | 3be048e50a2090caf1eeeb2373c7524ecc177ce8 (diff) | |
| parent | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (diff) | |
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/tests/core/arm/arm_test_common.h')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/core/arm/arm_test_common.h b/src/tests/core/arm/arm_test_common.h index e4b6df194..5de8dab4e 100644 --- a/src/tests/core/arm/arm_test_common.h +++ b/src/tests/core/arm/arm_test_common.h @@ -19,8 +19,8 @@ struct PageTable; namespace ArmTests { struct WriteRecord { - WriteRecord(size_t size, VAddr addr, u64 data) : size(size), addr(addr), data(data) {} - size_t size; + WriteRecord(std::size_t size, VAddr addr, u64 data) : size(size), addr(addr), data(data) {} + std::size_t size; VAddr addr; u64 data; bool operator==(const WriteRecord& o) const { @@ -71,14 +71,14 @@ private: boost::optional<u32> Read32(VAddr addr) override; boost::optional<u64> Read64(VAddr addr) override; - bool ReadBlock(VAddr src_addr, void* dest_buffer, size_t size) override; + bool ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size) override; bool Write8(VAddr addr, u8 data) override; bool Write16(VAddr addr, u16 data) override; bool Write32(VAddr addr, u32 data) override; bool Write64(VAddr addr, u64 data) override; - bool WriteBlock(VAddr dest_addr, const void* src_buffer, size_t size) override; + bool WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size) override; std::unordered_map<VAddr, u8> data; }; |
