- one more fix in boost patch; release 6 (boost 1.73)

[packages/pokerth.git] / pokerth-boost.patch

--- pokerth-1.1.2-rc/src/net/common/clientthread.cpp.orig	2017-08-16 14:24:03.000000000 +0200
+++ pokerth-1.1.2-rc/src/net/common/clientthread.cpp	2019-05-06 20:01:16.461183436 +0200
@@ -993,8 +993,7 @@
 			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()));
-		boost::asio::socket_base::non_blocking_io command(true);
-		newSock->io_control(command);
+		newSock->non_blocking(true);
 		newSock->set_option(tcp::no_delay(true));
 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
 
--- pokerth-1.1.2-rc/src/net/serveraccepthelper.h.orig	2017-08-16 14:24:03.000000000 +0200
+++ pokerth-1.1.2-rc/src/net/serveraccepthelper.h	2019-05-06 20:28:04.582779720 +0200
@@ -122,8 +122,7 @@
 					  const boost::system::error_code &error)
 	{
 		if (!error) {
-			boost::asio::socket_base::non_blocking_io command(true);
-			acceptedSocket->io_control(command);
+			acceptedSocket->non_blocking(true);
 			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));
--- pokerth-1.1.2-rc/src/net/common/serveracceptwebhelper.cpp.orig	2017-08-16 14:24:03.000000000 +0200
+++ pokerth-1.1.2-rc/src/net/common/serveracceptwebhelper.cpp	2020-07-31 21:14:47.238374433 +0200
@@ -58,10 +58,10 @@
 
 	m_webSocketServer->init_asio(m_ioService.get());
 
-	m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, _1));
-	m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, _1));
-	m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, _1));
-	m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, _1, _2));
+	m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, boost::placeholders::_1));
+	m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, boost::placeholders::_1));
+	m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, boost::placeholders::_1));
+	m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, boost::placeholders::_1, boost::placeholders::_2));
 
 	m_webSocketServer->listen(serverPort);
 	m_webSocketServer->start_accept();