From 8a27fa9c617533e76673ce61a65e2ba869b52208 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 31 Aug 2020 20:07:13 -0400 Subject: add upstream 11.1 --- zenXml/zenxml/dom.h | 1 - zenXml/zenxml/xml.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'zenXml/zenxml') diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h index 35226fc7..b49db90c 100644 --- a/zenXml/zenxml/dom.h +++ b/zenXml/zenxml/dom.h @@ -157,7 +157,6 @@ public: PtrIter& operator++() { ++it_; return *this; } PtrIter operator++(int) { PtrIter tmp(*this); operator++(); return tmp; } inline friend bool operator==(const PtrIter& lhs, const PtrIter& rhs) { return lhs.it_ == rhs.it_; } - inline friend bool operator!=(const PtrIter& lhs, const PtrIter& rhs) { return !(lhs == rhs); } T& operator* () const { return AccessPolicy::template objectRef(it_); } T* operator->() const { return &AccessPolicy::template objectRef(it_); } private: diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h index 4058f7bf..f7340b39 100644 --- a/zenXml/zenxml/xml.h +++ b/zenXml/zenxml/xml.h @@ -91,12 +91,12 @@ void saveXml(const XmlDoc& doc, const Zstring& filePath) //throw FileError try //only update XML file if there are changes { if (getFileSize(filePath) == stream.size()) //throw FileError - if (loadBinContainer(filePath, nullptr /*notifyUnbufferedIO*/) == stream) //throw FileError + if (getFileContent(filePath, nullptr /*notifyUnbufferedIO*/) == stream) //throw FileError return; } catch (FileError&) {} - saveBinContainer(filePath, stream, nullptr /*notifyUnbufferedIO*/); //throw FileError + setFileContent(filePath, stream, nullptr /*notifyUnbufferedIO*/); //throw FileError } -- cgit