From b985f6339ea159a02f747ee7618245e4e3d76852 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 17 Apr 2024 16:40:30 -0500 Subject: [PATCH] Base/Toponaming: Correct string hasher output --- src/App/StringHasher.cpp | 4 +++- src/Mod/Part/App/TopoShapeExpansion.cpp | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/App/StringHasher.cpp b/src/App/StringHasher.cpp index ff3218d054..71d06c2ed8 100644 --- a/src/App/StringHasher.cpp +++ b/src/App/StringHasher.cpp @@ -507,6 +507,7 @@ void StringHasher::SaveDocFile(Base::Writer& writer) const void StringHasher::saveStream(std::ostream& stream) const { + Base::TextOutputStream textStreamWrapper(stream); boost::io::ios_flags_saver ifs(stream); stream << std::hex; @@ -594,8 +595,9 @@ void StringHasher::saveStream(std::ostream& stream) const } else { // Reaching here means the string may contain space and newlines + // We rely on OutputStream (i.e. textStreamWrapper) to save the string. stream << ' '; - stream << std::dec << d._data.constData() << std::hex; + textStreamWrapper << d._data.constData(); } } } diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp index b767801e70..037c39687d 100644 --- a/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -158,9 +158,6 @@ Data::ElementMapPtr TopoShape::resetElementMap(Data::ElementMapPtr elementMap) _cache->subLocation.Identity(); _subLocation.Identity(); _parentCache.reset(); - if ( ! elementMap->hasher && Hasher ) { - elementMap->hasher = Hasher; - } } return Data::ComplexGeoData::resetElementMap(elementMap); }