diff options
author | Treeston <treeston.mmoc@gmail.com> | 2020-08-04 17:03:26 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-01-26 14:36:42 +0100 |
commit | fa8ab6eb98395ed468046c261fe120082d4e019b (patch) | |
tree | 333571676b0dd323744154b86167fce5d184e851 /src/common/Utilities/Util.h | |
parent | 41fe9a84d499a56e2631e20970d33367d7585391 (diff) |
Core/Common: Move old-style pointer+size HexStr methods to Trinity::Impl where they can't hurt anyone
(cherry picked from commit 7b8b999516a824b0c417631a77f133eb47b8b2f4)
Diffstat (limited to 'src/common/Utilities/Util.h')
-rw-r--r-- | src/common/Utilities/Util.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index f34b6d6ad96..18a380ea9b4 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -340,15 +340,22 @@ TC_COMMON_API bool IsIPAddress(char const* ipaddress); TC_COMMON_API uint32 CreatePIDFile(std::string const& filename); TC_COMMON_API uint32 GetPID(); -TC_COMMON_API std::string ByteArrayToHexStr(uint8 const* bytes, size_t length, bool reverse = false); +namespace Trinity::Impl +{ + TC_COMMON_API std::string ByteArrayToHexStr(uint8 const* bytes, size_t length, bool reverse = false); + TC_COMMON_API void HexStrToByteArray(std::string const& str, uint8* out, size_t outlen, bool reverse = false); +} + template <typename Container> -std::string ByteArrayToHexStr(Container const& c, bool reverse = false) { return ByteArrayToHexStr(std::data(c), std::size(c), reverse); } -TC_COMMON_API void HexStrToByteArray(std::string const& str, uint8* out, bool reverse = false); +std::string ByteArrayToHexStr(Container const& c, bool reverse = false) +{ + return Trinity::Impl::ByteArrayToHexStr(std::data(c), std::size(c), reverse); +} + template <size_t Size> void HexStrToByteArray(std::string const& str, std::array<uint8, Size>& buf, bool reverse = false) { - ASSERT(str.size() == (2 * Size)); - HexStrToByteArray(str, buf.data(), reverse); + Trinity::Impl::HexStrToByteArray(str, buf.data(), Size, reverse); } template <size_t Size> std::array<uint8, Size> HexStrToByteArray(std::string const& str, bool reverse = false) |