diff options
author | bunnei <bunneidev@gmail.com> | 2020-08-06 23:14:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-06 23:14:14 -0400 |
commit | f5d538f118b4b25237a0d0234a51fcb815ca98d1 (patch) | |
tree | 29583eeec7c0f9eaaab4dd5f9e8ba86d7752e457 /src/common/hex_util.cpp | |
parent | 5cc2f99fab1ec590d415605ced4e02054ba22e46 (diff) | |
parent | 4f2acc54f5f981838476e766a20cbfacd7a03dd2 (diff) |
Merge pull request #4483 from lioncash/constexpr-hex
partition_data_manager: Make data arrays constexpr
Diffstat (limited to 'src/common/hex_util.cpp')
-rw-r--r-- | src/common/hex_util.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/common/hex_util.cpp b/src/common/hex_util.cpp index c2f6cf0f6..74f52dd11 100644 --- a/src/common/hex_util.cpp +++ b/src/common/hex_util.cpp @@ -3,21 +3,9 @@ // Refer to the license.txt file included. #include "common/hex_util.h" -#include "common/logging/log.h" namespace Common { -u8 ToHexNibble(char c1) { - if (c1 >= 65 && c1 <= 70) - return c1 - 55; - if (c1 >= 97 && c1 <= 102) - return c1 - 87; - if (c1 >= 48 && c1 <= 57) - return c1 - 48; - LOG_ERROR(Common, "Invalid hex digit: 0x{:02X}", c1); - return 0; -} - std::vector<u8> HexStringToVector(std::string_view str, bool little_endian) { std::vector<u8> out(str.size() / 2); if (little_endian) { @@ -30,26 +18,4 @@ std::vector<u8> HexStringToVector(std::string_view str, bool little_endian) { return out; } -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, " - "actual={}).", - len); - return {}; - } - return HexStringToArray<16>(str); -} - -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, " - "actual={}).", - len); - return {}; - } - return HexStringToArray<32>(str); -} - } // namespace Common |