Merge branch '10.4' into 'master'10.4

pull in latest 10.4 from upstream

See merge request opensource-tracking/FreeFileSync!1

1 files changed, 4 insertions, 4 deletions

diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h
index 8793d5bd..d95f5aa1 100755
--- a/zenXml/zenxml/dom.h
+++ b/zenXml/zenxml/dom.h
@@ -237,7 +237,7 @@ public:
     std::pair<AttrIter, AttrIter> getAttributes() const { return { attributes_.begin(), attributes_.end() }; }
 
     //swap two elements while keeping references to parent.  -> disabled documentation extraction
-    void swapSubtree(XmlElement& other)
+    void swapSubtree(XmlElement& other) noexcept
     {
         name_               .swap(other.name_);
         value_              .swap(other.value_);
@@ -283,8 +283,8 @@ public:
     ///Default constructor setting up an empty XML document with a standard declaration: <?xml version="1.0" encoding="utf-8" ?>
     XmlDoc() {}
 
-    XmlDoc(XmlDoc&& tmp) { swap(tmp); }
-    XmlDoc& operator=(XmlDoc&& tmp) { swap(tmp); return *this; }
+    XmlDoc(XmlDoc&& tmp) noexcept { swap(tmp); }
+    XmlDoc& operator=(XmlDoc&& tmp) noexcept { swap(tmp); return *this; }
 
     //Setup an empty XML document
     /**
@@ -342,7 +342,7 @@ public:
     void setStandalone(const String& standalone) { standalone_ = utfTo<std::string>(standalone); }
 
     //Transactionally swap two elements.  -> disabled documentation extraction
-    void swap(XmlDoc& other)
+    void swap(XmlDoc& other) noexcept
     {
         version_   .swap(other.version_);
         encoding_  .swap(other.encoding_);