Merge branch '10.21' into 'master'10.21

add upstream 10.21

See merge request opensource-tracking/FreeFileSync!18

3 files changed, 12 insertions, 12 deletions

diff --git a/zenXml/zenxml/cvrt_struc.h b/zenXml/zenxml/cvrt_struc.h
index 9df1c7ba..45109187 100644
--- a/zenXml/zenxml/cvrt_struc.h
+++ b/zenXml/zenxml/cvrt_struc.h
@@ -57,11 +57,11 @@ ZEN_INIT_DETECT_MEMBER(insert) //
 
 template <typename T>
 using IsStlContainer = std::bool_constant<
-                       impl_2384343::HasMemberTypeV_value_type    <T> &&
-                       impl_2384343::HasMemberTypeV_iterator      <T> &&
-                       impl_2384343::HasMemberTypeV_const_iterator<T> &&
-                       impl_2384343::HasMemberV_begin             <T> &&
-                       impl_2384343::HasMemberV_end               <T> &&
+                       impl_2384343::HasMemberTypeV_value_type    <T>&&
+                       impl_2384343::HasMemberTypeV_iterator      <T>&&
+                       impl_2384343::HasMemberTypeV_const_iterator<T>&&
+                       impl_2384343::HasMemberV_begin             <T>&&
+                       impl_2384343::HasMemberV_end               <T>&&
                        impl_2384343::HasMemberV_insert            <T>>;
 
 
diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h
index 0f456822..35226fc7 100644
--- a/zenXml/zenxml/dom.h
+++ b/zenXml/zenxml/dom.h
@@ -230,7 +230,7 @@ public:
       \code
         auto iterPair = elem.getAttributes();
         for (auto it = iterPair.first; it != iterPair.second; ++it)
-           std::cout << "name: " << it->name << " value: " << it->value << "\n";
+           std::cout << "name: " << it->name << " value: " << it->value << '\n';
       \endcode
       \return A pair of STL begin/end iterators to access all attributes sequentially as a list of name/value pairs of std::string.
     */
diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h
index 80b60730..4058f7bf 100644
--- a/zenXml/zenxml/xml.h
+++ b/zenXml/zenxml/xml.h
@@ -369,8 +369,8 @@ public:
     {
         std::vector<String> output;
 
-		for (const std::string& str : log_.ref().elementList())
-			output.push_back(utfTo<String>(str));
+        for (const std::string& str : log_.ref().elementList())
+            output.push_back(utfTo<String>(str));
 
         return output;
     }
@@ -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.getNameAs<std::string>() + '>';
     }
 
     std::string getNameFormatted() const
@@ -399,7 +399,7 @@ private:
     std::string getChildNameFormatted(const std::string& childName) const
     {
         std::string parentName = getNameFormatted();
-        return (parentName.empty() ? std::string() : (parentName + " ")) + "<" + childName + ">";
+        return (parentName.empty() ? std::string() : (parentName + ' ')) + '<' + childName + '>';
     }
 
     class ErrorLog
@@ -440,9 +440,9 @@ void checkXmlMappingErrors(const XmlIn& xmlInput, const Zstring& filePath) //thr
 {
     if (xmlInput.haveErrors())
     {
-        std::wstring msg = _("The following XML elements could not be read:") + L"\n";
+        std::wstring msg = _("The following XML elements could not be read:") + L'\n';
         for (const std::wstring& elem : xmlInput.getErrorsAs<std::wstring>())
-            msg += L"\n" + elem;
+            msg += L'\n' + elem;
 
         throw FileError(replaceCpy(_("Configuration file %x is incomplete. The missing elements will be set to their default values."), L"%x", fmtPath(filePath)) + L"\n\n" + msg);
     }