games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

boost 1.87

Browse Source
This commit is contained in:
Laserlicht 2024-12-14 22:26:26 +01:00
parent 132500b292
commit 1517dcca6c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/network/NetworkConnection.cpp
View File

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

4
lib/network/NetworkDefines.h
View File

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