From f9a264860c23b8381adbc0b9766e1b677a07da78 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 4 Jan 2021 08:08:11 -0500
Subject: add upstream 11.5

---
 zenXml/zenxml/xml.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zenXml/zenxml/xml.h')

diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h
index f7340b39..ffd00ea0 100644
--- a/zenXml/zenxml/xml.h
+++ b/zenXml/zenxml/xml.h
@@ -275,7 +275,7 @@ public:
     {
         if (refIndex_ < refList_.size())
         {
-            bool success = readStruc(*refList_[refIndex_], value);
+            const bool success = readStruc(*refList_[refIndex_], value);
             if (!success)
                 log_.ref().notifyConversionError(getNameFormatted());
             return success;
@@ -310,7 +310,7 @@ public:
     {
         if (refIndex_ < refList_.size())
         {
-            bool success = refList_[refIndex_]->getAttribute(name, value);
+            const bool success = refList_[refIndex_]->getAttribute(name, value);
             if (!success)
                 log_.ref().notifyMissingAttribute(getNameFormatted(), utfTo<std::string>(name));
             return success;
@@ -382,7 +382,7 @@ private:
 
     static std::string getNameFormatted(const XmlElement& elem) //"<Root> <Level1> <Level2>"
     {
-        return (elem.parent() ? getNameFormatted(*elem.parent()) + ' ' : std::string()) + '<' + elem.getNameAs<std::string>() + '>';
+        return (elem.parent() ? getNameFormatted(*elem.parent()) + ' ' : std::string()) + '<' + elem.getName() + '>';
     }
 
     std::string getNameFormatted() const
-- 
cgit