--- src/net/common/clientthread.cpp.orig	2017-08-16 12:24:03 UTC

+++ src/net/common/clientthread.cpp

@@ -993,8 +993,12 @@ ClientThread::CreateContextSession()

 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));

 		else

 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));

+#if BOOST_VERSION < 106600

 		boost::asio::socket_base::non_blocking_io command(true);

 		newSock->io_control(command);

+#else

+		newSock->non_blocking(true);

+#endif

 		newSock->set_option(tcp::no_delay(true));

 		newSock->set_option(boost::asio::socket_base::keep_alive(true));

--- src/net/serveraccepthelper.h.orig	2017-08-16 12:24:03 UTC

+++ src/net/serveraccepthelper.h

@@ -122,8 +122,12 @@ class ServerAcceptHelper : public ServerAcceptInterfac

 					  const boost::system::error_code &error)

 	{

 		if (!error) {

+#if BOOST_VERSION < 106600

 			boost::asio::socket_base::non_blocking_io command(true);

 			acceptedSocket->io_control(command);

+#else

+			acceptedSocket->non_blocking(true);

+#endif

 			acceptedSocket->set_option(typename P::no_delay(true));

 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));

 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));