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, 1 insertions, 1 deletions

diff --git a/zen/socket.h b/zen/socket.h
index c92071e2..e551a5ba 100755
--- a/zen/socket.h
+++ b/zen/socket.h
@@ -53,7 +53,7 @@ public:
             return testSocket;
         };
 
-        Opt<SysError> firstError;
+        std::optional<SysError> firstError;
         for (const auto* /*::addrinfo*/ si = servinfo; si; si = si->ai_next)
             try
             {