diff options
| author | B Stack <bgstack15@gmail.com> | 2021-01-04 13:48:35 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-01-04 13:48:35 +0000 |
| commit | edb1c4482c0a0d91bddfee6e1f9fce234e59840a (patch) | |
| tree | 494f9fc32eeee34c6c46611ae0137c25a79517a4 /zenXml/zenxml/xml.h | |
| parent | Merge branch '11.4' into 'master' (diff) | |
| parent | add upstream 11.5 (diff) | |
| download | FreeFileSync-edb1c4482c0a0d91bddfee6e1f9fce234e59840a.tar.gz FreeFileSync-edb1c4482c0a0d91bddfee6e1f9fce234e59840a.tar.bz2 FreeFileSync-edb1c4482c0a0d91bddfee6e1f9fce234e59840a.zip | |
Merge branch '11.5' into 'master'11.5
add upstream 11.5
See merge request opensource-tracking/FreeFileSync!29
Diffstat (limited to 'zenXml/zenxml/xml.h')
| -rw-r--r-- | zenXml/zenxml/xml.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |