diff options
author | raven02 <jacky.kktsui@yahoo.com.hk> | 2018-09-19 19:53:11 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 19:53:11 +0800 |
commit | c8f9bbbf859c0e38cf691b64c67761382fcebfc2 (patch) | |
tree | 99529c2277a6b740a6e278985c5147fa649c5497 /src/common/hex_util.cpp | |
parent | b91f7d5d67a67115926ad03526f71a7cc3dfb326 (diff) | |
parent | b33ce787b7959e1bfd3b5ae4886b6e137fb97711 (diff) |
Merge branch 'master' into tlds
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, " |