summaryrefslogtreecommitdiff
path: root/zen/string_tools.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-11-02 12:45:42 +0000
committerB Stack <bgstack15@gmail.com>2020-11-02 12:45:42 +0000
commit3162cbdd63eaf7e930c8b2ebe604e10ecb369d08 (patch)
tree9939cdd1735bf15e97ad6700419c0604cac7c59e /zen/string_tools.h
parentMerge branch '11.2' into 'master' (diff)
parentadd upstream 11.3 (diff)
downloadFreeFileSync-3162cbdd63eaf7e930c8b2ebe604e10ecb369d08.tar.gz
FreeFileSync-3162cbdd63eaf7e930c8b2ebe604e10ecb369d08.tar.bz2
FreeFileSync-3162cbdd63eaf7e930c8b2ebe604e10ecb369d08.zip
Merge branch '11.3' into 'master'11.3
add upstream 11.3 See merge request opensource-tracking/FreeFileSync!27
Diffstat (limited to 'zen/string_tools.h')
-rw-r--r--zen/string_tools.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/string_tools.h b/zen/string_tools.h
index fc715961..83d87244 100644
--- a/zen/string_tools.h
+++ b/zen/string_tools.h
@@ -83,7 +83,7 @@ template <class Num, class S> Num stringTo(const S& str);
std::pair<char, char> hexify (unsigned char c, bool upperCase = true);
char unhexify(char high, char low);
-std::string formatAsHexString(const std::string& blob); //bytes -> (human-readable) hex string
+std::string formatAsHexString(const std::string_view& blob); //bytes -> (human-readable) hex string
template <class S, class T, class Num> S printNumber(const T& format, const Num& number); //format a single number using std::snprintf()
@@ -859,7 +859,7 @@ char unhexify(char high, char low)
inline
-std::string formatAsHexString(const std::string& blob)
+std::string formatAsHexString(const std::string_view& blob)
{
std::string output;
for (const char c : blob)
bgstack15