diff options
author | Lioncash <mathew1800@gmail.com> | 2019-06-12 23:27:06 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-06-12 23:54:05 +0200 |
commit | a62088539ed02a8569814601b3b99b713c5d8a34 (patch) | |
tree | 03fe279e7651c55291f702f5a8b518cb07e35812 /src/common | |
parent | Merge pull request #2578 from lioncash/cnmt (diff) | |
download | yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.gz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.bz2 yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.lz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.xz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.zst yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/hex_util.cpp | 7 | ||||
-rw-r--r-- | src/common/hex_util.h | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/common/hex_util.cpp b/src/common/hex_util.cpp index 5b63f9e81..c2f6cf0f6 100644 --- a/src/common/hex_util.cpp +++ b/src/common/hex_util.cpp @@ -30,13 +30,6 @@ std::vector<u8> HexStringToVector(std::string_view str, bool little_endian) { return out; } -std::string HexVectorToString(const std::vector<u8>& vector, bool upper) { - std::string out; - for (u8 c : vector) - out += fmt::format(upper ? "{:02X}" : "{:02x}", c); - return out; -} - std::array<u8, 16> operator""_array16(const char* str, std::size_t len) { if (len != 32) { LOG_ERROR(Common, 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; } |