diff options
| author | 2018-09-15 15:21:06 +0200 | |
|---|---|---|
| committer | 2018-09-15 15:21:06 +0200 | |
| commit | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (patch) | |
| tree | 8a90e8ef2804f147dff7225a543a8740ecf7160c /src/core/hle/service/vi | |
| parent | Merge pull request #1310 from lioncash/kernel-ns (diff) | |
| download | yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.gz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.tar.xz yuzu-63c2e32e207d31ecadd9022e1d7cd705c9febac8.zip | |
Port #4182 from Citra: "Prefix all size_t with std::"
Diffstat (limited to 'src/core/hle/service/vi')
| -rw-r--r-- | src/core/hle/service/vi/vi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index cf94b00e6..13545d50a 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp | |||
| @@ -38,7 +38,7 @@ static_assert(sizeof(DisplayInfo) == 0x60, "DisplayInfo has wrong size"); | |||
| 38 | class Parcel { | 38 | class Parcel { |
| 39 | public: | 39 | public: |
| 40 | // This default size was chosen arbitrarily. | 40 | // This default size was chosen arbitrarily. |
| 41 | static constexpr size_t DefaultBufferSize = 0x40; | 41 | static constexpr std::size_t DefaultBufferSize = 0x40; |
| 42 | Parcel() : buffer(DefaultBufferSize) {} | 42 | Parcel() : buffer(DefaultBufferSize) {} |
| 43 | explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {} | 43 | explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {} |
| 44 | virtual ~Parcel() = default; | 44 | virtual ~Parcel() = default; |
| @@ -66,7 +66,7 @@ public: | |||
| 66 | return val; | 66 | return val; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | std::vector<u8> ReadBlock(size_t length) { | 69 | std::vector<u8> ReadBlock(std::size_t length) { |
| 70 | ASSERT(read_index + length <= buffer.size()); | 70 | ASSERT(read_index + length <= buffer.size()); |
| 71 | const u8* const begin = buffer.data() + read_index; | 71 | const u8* const begin = buffer.data() + read_index; |
| 72 | const u8* const end = begin + length; | 72 | const u8* const end = begin + length; |
| @@ -156,8 +156,8 @@ private: | |||
| 156 | static_assert(sizeof(Header) == 16, "ParcelHeader has wrong size"); | 156 | static_assert(sizeof(Header) == 16, "ParcelHeader has wrong size"); |
| 157 | 157 | ||
| 158 | std::vector<u8> buffer; | 158 | std::vector<u8> buffer; |
| 159 | size_t read_index = 0; | 159 | std::size_t read_index = 0; |
| 160 | size_t write_index = 0; | 160 | std::size_t write_index = 0; |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | class NativeWindow : public Parcel { | 163 | class NativeWindow : public Parcel { |