Fix compile error from resolver::iterator on pre 1.66 boost

wesnoth · Mar 8, 2021 · c1f534c · c1f534c
1 parent 66848be
commit c1f534c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/network_asio.cpp b/src/network_asio.cpp
@@ -214,7 +214,12 @@ void connection::fallback_to_unencrypted()
 	utils::get<raw_socket>(socket_).close();
 
 	utils::get<raw_socket>(socket_).async_connect(endpoint,
-		std::bind(&connection::handle_connect, this, std::placeholders::_1, endpoint));
+#if BOOST_VERSION >= 106600
+		std::bind(&connection::handle_connect, this, std::placeholders::_1, endpoint)
+#else
+		std::bind(&connection::handle_connect, this, std::placeholders::_1, resolver_.resolve(endpoint))
+#endif
+	);
 }
 
 void connection::transfer(const config& request, config& response)

diff --git a/src/wesnothd_connection.cpp b/src/wesnothd_connection.cpp
@@ -259,7 +259,12 @@ void wesnothd_connection::fallback_to_unencrypted()
 	utils::get<raw_socket>(socket_).close();
 
 	utils::get<raw_socket>(socket_).async_connect(endpoint,
-		std::bind(&wesnothd_connection::handle_connect, this, std::placeholders::_1, endpoint));
+#if BOOST_VERSION >= 106600
+		std::bind(&wesnothd_connection::handle_connect, this, std::placeholders::_1, endpoint)
+#else
+		std::bind(&wesnothd_connection::handle_connect, this, std::placeholders::_1, resolver_.resolve(endpoint))
+#endif
+	);
 }
 
 // main thread