diff options
author | Lioncash <mathew1800@gmail.com> | 2019-06-12 17:27:06 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-06-12 17:54:05 -0400 |
commit | a62088539ed02a8569814601b3b99b713c5d8a34 (patch) | |
tree | 03fe279e7651c55291f702f5a8b518cb07e35812 /src/common/hex_util.h | |
parent | 7e2bcf04b471579054424fd26746826747c0d335 (diff) |
common/hex_util: Combine HexVectorToString() and HexArrayToString()
These can be generified together by using a concept type to designate
them. This also has the benefit of not making copies of potentially very
large arrays.
Diffstat (limited to 'src/common/hex_util.h')
-rw-r--r-- | src/common/hex_util.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/common/hex_util.h b/src/common/hex_util.h index 68f003cb6..a64c9b485 100644 --- a/src/common/hex_util.h +++ b/src/common/hex_util.h @@ -7,6 +7,7 @@ #include <array> #include <cstddef> #include <string> +#include <type_traits> #include <vector> #include <fmt/format.h> #include "common/common_types.h" @@ -30,13 +31,15 @@ std::array<u8, Size> HexStringToArray(std::string_view str) { return out; } -std::string HexVectorToString(const std::vector<u8>& vector, bool upper = true); +template <typename ContiguousContainer> +std::string HexToString(const ContiguousContainer& data, bool upper = true) { + static_assert(std::is_same_v<typename ContiguousContainer::value_type, u8>, + "Underlying type within the contiguous container must be u8."); -template <std::size_t Size> -std::string HexArrayToString(std::array<u8, Size> array, bool upper = true) { std::string out; - for (u8 c : array) + for (const u8 c : data) { out += fmt::format(upper ? "{:02X}" : "{:02x}", c); + } return out; } |