From 17994eb3eda9d2be9aad55dae41562ce13531d99 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 15 Aug 2019 15:51:34 -0400 Subject: add upstream 10.15 --- zenXml/zenxml/parser.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'zenXml/zenxml/parser.h') diff --git a/zenXml/zenxml/parser.h b/zenXml/zenxml/parser.h index 70bf6654..f7604ebf 100644 --- a/zenXml/zenxml/parser.h +++ b/zenXml/zenxml/parser.h @@ -82,7 +82,7 @@ std::string normalize(const std::string& str, Predicate pred) //pred: unary func { if (c == '&') // output += "&"; - else if (c == '<') //normalization mandatory: http://www.w3.org/TR/xml/#syntax + else if (c == '<') //normalization mandatory: https://www.w3.org/TR/xml/#syntax output += "<"; else if (c == '>') // output += ">"; @@ -95,9 +95,9 @@ std::string normalize(const std::string& str, Predicate pred) //pred: unary func else { output += "&#x"; - const auto hexDigits = hexify(c); - output += hexDigits.first; - output += hexDigits.second; + const auto [high, low] = hexify(c); + output += high; + output += low; output += ';'; } } @@ -176,7 +176,7 @@ std::string denormalize(const std::string& str) else output += c; //unexpected char! } - else if (c == '\r') //map all end-of-line characters to \n http://www.w3.org/TR/xml/#sec-line-ends + else if (c == '\r') //map all end-of-line characters to \n https://www.w3.org/TR/xml/#sec-line-ends { auto itNext = it + 1; if (itNext != str.end() && *itNext == '\n') -- cgit