Laserlicht 10 mēneši atpakaļ
vecāks
revīzija
1517dcca6c
2 mainītis faili ar 8 papildinājumiem un 0 dzēšanām
  1. 4 0
      lib/network/NetworkConnection.cpp
  2. 4 0
      lib/network/NetworkDefines.h

+ 4 - 0
lib/network/NetworkConnection.cpp

@@ -199,7 +199,11 @@ void NetworkConnection::close()
 {
 	boost::system::error_code ec;
 	socket->close(ec);
+#if BOOST_VERSION >= 108700
+	timer->cancel();
+#else
 	timer->cancel(ec);
+#endif
 
 	//NOTE: ignoring error code, intended
 }

+ 4 - 0
lib/network/NetworkDefines.h

@@ -15,7 +15,11 @@
 
 VCMI_LIB_NAMESPACE_BEGIN
 
+#if BOOST_VERSION >= 108700
+using NetworkContext = boost::asio::io_context;
+#else
 using NetworkContext = boost::asio::io_service;
+#endif
 using NetworkSocket = boost::asio::ip::tcp::socket;
 using NetworkAcceptor = boost::asio::ip::tcp::acceptor;
 using NetworkBuffer = boost::asio::streambuf;