netsocket: provide the shorthand net::result<T> for `tl::expected<T…

…, std::error_code>` Plus, add the necessary dependency for the `netplay` library in order for it to find `tl::expected` header files. Signed-off-by: Pavel Solodovnikov <[email protected]>
Warzone2100 · Oct 13, 2024 · 30eeaf6 · 30eeaf6
1 parent e565f36
commit 30eeaf6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/netplay/CMakeLists.txt b/lib/netplay/CMakeLists.txt
@@ -57,7 +57,9 @@ add_dependencies(netplay autorevision_netcodeversion)
 set_property(TARGET netplay PROPERTY FOLDER "lib")
 include(WZTargetConfiguration)
 WZ_TARGET_CONFIGURATION(netplay)
-target_link_libraries(netplay PRIVATE framework re2::re2 nlohmann_json plum-static Threads::Threads ZLIB::ZLIB)
+target_link_libraries(netplay
+	PRIVATE framework re2::re2 nlohmann_json plum-static Threads::Threads ZLIB::ZLIB
+	PUBLIC tl::expected)
 
 if(WZ_USE_IMPORTED_MINIUPNPC)
 	target_link_libraries(netplay PRIVATE imported-miniupnpc)

diff --git a/lib/netplay/netsocket.h b/lib/netplay/netsocket.h
@@ -23,8 +23,17 @@
 
 #include "lib/framework/types.h"
 #include <string>
+#include <system_error>
 #include <vector>
 
+#include <tl/expected.hpp>
+
+namespace net
+{
+	template <typename T>
+	using result = ::tl::expected<T, std::error_code>;
+} // namespace net
+
 #if   defined(WZ_OS_UNIX)
 # include <arpa/inet.h>
 # include <errno.h>