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/common/hex_util.cpp | |
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/common/hex_util.cpp')
-rw-r--r-- | src/common/hex_util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/hex_util.cpp b/src/common/hex_util.cpp index 8e0a9e46f..589ae5cbf 100644 --- a/src/common/hex_util.cpp +++ b/src/common/hex_util.cpp @@ -18,7 +18,7 @@ u8 ToHexNibble(char c1) { return 0; } -std::array<u8, 16> operator""_array16(const char* str, size_t len) { +std::array<u8, 16> operator""_array16(const char* str, std::size_t len) { if (len != 32) { LOG_ERROR(Common, "Attempting to parse string to array that is not of correct size (expected=32, " @@ -29,7 +29,7 @@ std::array<u8, 16> operator""_array16(const char* str, size_t len) { return HexStringToArray<16>(str); } -std::array<u8, 32> operator""_array32(const char* str, size_t len) { +std::array<u8, 32> operator""_array32(const char* str, std::size_t len) { if (len != 64) { LOG_ERROR(Common, "Attempting to parse string to array that is not of correct size (expected=64, " |