netplay: Tweak optional.hpp usage

Warzone2100 · Nov 12, 2024 · 84c26e6 · 84c26e6
1 parent 9e4c59a
commit 84c26e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/netplay/netsocket.cpp b/lib/netplay/netsocket.cpp
@@ -72,7 +72,7 @@ struct Socket
 
 	SOCKET fd[SOCK_COUNT];
 	bool ready;
-	nonstd::optional<std::error_code> writeErrorCode;
+	optional<std::error_code> writeErrorCode = nullopt;
 	bool deleteLater;
 	char textAddress[40] = {};
 

diff --git a/lib/netplay/netsocket.h b/lib/netplay/netsocket.h
@@ -27,6 +27,8 @@
 #include <vector>
 
 #include <nonstd/optional.hpp>
+using nonstd::optional;
+using nonstd::nullopt;
 #include <tl/expected.hpp>
 
 namespace net
@@ -158,7 +160,7 @@ struct OpenConnectionResult
 		void operator()(Socket* b) { if (b) { socketClose(b); } }
 	};
 	std::unique_ptr<Socket, SocketDeleter> open_socket;
-	nonstd::optional<std::error_code> errorCode;
+	optional<std::error_code> errorCode = nullopt;
 	std::string errorString;
 };
 typedef std::function<void (OpenConnectionResult&& result)> OpenConnectionToHostResultCallback;