games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Fix build with Boost versioni >= 1.70 (#615)

Browse Source
This commit is contained in:
krkos
2020-01-21 09:55:28 +01:00
committed by Alexander Shishkin
parent 8bfe510e9c
commit ac81d0f7b4
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/CVCMIServer.cpp
View File

@@ -214,8 +214,8 @@ void CVCMIServer::threadAnnounceLobby()
if(acceptor)
{
acceptor->get_io_service().reset();
acceptor->get_io_service().poll();
io->reset();
io->poll();
}
}
@@ -272,7 +272,11 @@ void CVCMIServer::startAsyncAccept()
assert(!upcomingConnection);
assert(acceptor);
#if BOOST_VERSION >= 107000 // Boost version >= 1.70
upcomingConnection = std::make_shared<TSocket>(acceptor->get_executor());
#else
upcomingConnection = std::make_shared<TSocket>(acceptor->get_io_service());
#endif
acceptor->async_accept(*upcomingConnection, std::bind(&CVCMIServer::connectionAccepted, this, _1));
}