summaryrefslogtreecommitdiff
path: root/zen/json.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-09-03 20:50:36 +0000
committerB Stack <bgstack15@gmail.com>2019-09-03 20:50:36 +0000
commit89b5c8eb6012b7b4560958ad3c1aa5b187dafc94 (patch)
treeafc54ec004ab863262f5621fbf282c42fdff29cc /zen/json.h
parentMerge branch '10.14' into 'master' (diff)
parentadd upstream 10.15 (diff)
downloadFreeFileSync-89b5c8eb6012b7b4560958ad3c1aa5b187dafc94.tar.gz
FreeFileSync-89b5c8eb6012b7b4560958ad3c1aa5b187dafc94.tar.bz2
FreeFileSync-89b5c8eb6012b7b4560958ad3c1aa5b187dafc94.zip
Merge branch '10.15' into 'master'10.15
add upstream 10.15 See merge request opensource-tracking/FreeFileSync!12
Diffstat (limited to 'zen/json.h')
-rw-r--r--zen/json.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/json.h b/zen/json.h
index 374a3f14..9b85ccb9 100644
--- a/zen/json.h
+++ b/zen/json.h
@@ -104,10 +104,10 @@ std::string jsonEscape(const std::string& str)
else if (static_cast<unsigned char>(c) < 32)
{
- const auto hexDigits = hexify(c);
+ const auto [high, low] = hexify(c);
output += "\\u00";
- output += hexDigits.first;
- output += hexDigits.second;
+ output += high;
+ output += low;
}
else
output += c;
bgstack15