From 2c81be72eef5363736cf1892646c74a3311ee4c1 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 17:03:17 -0400 Subject: add upstream 11.21 --- zenXml/zenxml/cvrt_struc.h | 12 ++++++------ zenXml/zenxml/cvrt_text.h | 4 ++-- zenXml/zenxml/dom.h | 49 ++++++++++++++++++++++++---------------------- 3 files changed, 34 insertions(+), 31 deletions(-) (limited to 'zenXml/zenxml') diff --git a/zenXml/zenxml/cvrt_struc.h b/zenXml/zenxml/cvrt_struc.h index a437604c..0bfe5996 100644 --- a/zenXml/zenxml/cvrt_struc.h +++ b/zenXml/zenxml/cvrt_struc.h @@ -57,12 +57,12 @@ ZEN_INIT_DETECT_MEMBER(insert) // template using IsStlContainer = std::bool_constant< - impl_2384343::HasMemberTypeV_value_type && - impl_2384343::HasMemberTypeV_iterator && - impl_2384343::HasMemberTypeV_const_iterator&& - impl_2384343::HasMemberV_begin && - impl_2384343::HasMemberV_end && - impl_2384343::HasMemberV_insert >; + impl_2384343::hasMemberType_value_type && + impl_2384343::hasMemberType_iterator && + impl_2384343::hasMemberType_const_iterator&& + impl_2384343::hasMember_begin && + impl_2384343::hasMember_end && + impl_2384343::hasMember_insert >; template diff --git a/zenXml/zenxml/cvrt_text.h b/zenXml/zenxml/cvrt_text.h index c06a62e0..9c2cbe45 100644 --- a/zenXml/zenxml/cvrt_text.h +++ b/zenXml/zenxml/cvrt_text.h @@ -130,8 +130,8 @@ enum class TextType template struct GetTextType : std::integral_constant ? TextType::boolean : - IsStringLikeV ? TextType::string : //string before number to correctly handle char/wchar_t -> this was an issue with Loki only! - IsArithmeticV ? TextType::number : // + isStringLike ? TextType::string : //string before number to correctly handle char/wchar_t -> this was an issue with Loki only! + isArithmetic ? TextType::number : // IsChronoDuration::value ? TextType::chrono : TextType::other> {}; diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h index 8d5bc0f5..7a551f69 100644 --- a/zenXml/zenxml/dom.h +++ b/zenXml/zenxml/dom.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include "cvrt_text.h" //"readText/writeText" @@ -59,11 +59,11 @@ public: template bool getAttribute(const std::string& name, T& value) const { - auto it = attributesSorted_.find(name); - return it == attributesSorted_.end() ? false : readText(it->second->value, value); + auto it = attributesByName.find(name); + return it == attributesByName.end() ? false : readText(it->second->value, value); } - bool hasAttribute(const std::string& name) const { return attributesSorted_.contains(name); } + bool hasAttribute(const std::string& name) const { return attributesByName.contains(name); } ///Create or update an XML attribute. /** @@ -77,24 +77,25 @@ public: std::string attrValue; writeText(value, attrValue); - auto it = attributesSorted_.find(name); - if (it != attributesSorted_.end()) + auto it = attributesByName.find(name); + if (it != attributesByName.end()) it->second->value = std::move(attrValue); else { auto itBack = attributes_.insert(attributes_.end(), {name, std::move(attrValue)}); - attributesSorted_.emplace(std::move(name), itBack); + attributesByName.emplace(std::move(name), itBack); } + static_assert(std::is_same_v>); //must NOT invalidate references used in "attributesByName"! } ///Remove the attribute with the given name. void removeAttribute(const std::string& name) { - auto it = attributesSorted_.find(name); - if (it != attributesSorted_.end()) + auto it = attributesByName.find(name); + if (it != attributesByName.end()) { attributes_.erase(it->second); - attributesSorted_.erase(it); + attributesByName.erase(it); } } @@ -106,7 +107,9 @@ public: { childElements_.emplace_back(name, this); XmlElement& newElement = childElements_.back(); - childElementsSorted_.emplace(std::move(name), &newElement); + childElementsByName_.emplace(std::move(name), &newElement); + + static_assert(std::is_same_v>); //must NOT invalidate references used in "childElementsByName_"! return newElement; } @@ -117,8 +120,8 @@ public: */ const XmlElement* getChild(const std::string& name) const { - auto it = childElementsSorted_.find(name); - return it == childElementsSorted_.end() ? nullptr : it->second; + auto it = childElementsByName_.find(name); + return it == childElementsByName_.end() ? nullptr : it->second; } ///\sa getChild @@ -156,8 +159,8 @@ public: T& objectRef(const IterTy& it) const { return *(it->second); } }; - using ChildIter2 = PtrIter::iterator, XmlElement, AccessMapElement>; - using ChildIterConst2 = PtrIter::const_iterator, const XmlElement, AccessMapElement>; + using ChildIter2 = PtrIter::iterator, XmlElement, AccessMapElement>; + using ChildIterConst2 = PtrIter::const_iterator, const XmlElement, AccessMapElement>; ///Access all child elements with the given name via STL iterators. /** @@ -169,10 +172,10 @@ public: \param name The name of the child elements to be retrieved. \return A pair of STL begin/end iterators to access the child elements sequentially. */ - std::pair getChildren(const std::string& name) const { return childElementsSorted_.equal_range(name); } + std::pair getChildren(const std::string& name) const { return childElementsByName_.equal_range(name); } ///\sa getChildren - std::pair getChildren(const std::string& name) { return childElementsSorted_.equal_range(name); } + std::pair getChildren(const std::string& name) { return childElementsByName_.equal_range(name); } struct AccessListElement { @@ -225,9 +228,9 @@ public: name_ .swap(other.name_); value_ .swap(other.value_); attributes_ .swap(other.attributes_); - attributesSorted_ .swap(other.attributesSorted_); + attributesByName .swap(other.attributesByName); childElements_ .swap(other.childElements_); - childElementsSorted_.swap(other.childElementsSorted_); + childElementsByName_.swap(other.childElementsByName_); for (XmlElement& child : childElements_) child.parent_ = this; @@ -242,11 +245,11 @@ private: std::string name_; std::string value_; - std::list attributes_; //attributes in order of creation - std::map::iterator> attributesSorted_; //alternate view: sorted by attribute name + std::list attributes_; //attributes in order of creation + std::unordered_map::iterator> attributesByName; //alternate view for lookup - std::list childElements_; //child elements in order of creation - std::multimap childElementsSorted_; //alternate view: sorted by element name + std::list childElements_; //child elements in order of creation + std::unordered_multimap childElementsByName_; //alternate view for lookup XmlElement* parent_ = nullptr; }; -- cgit