diff --git a/Changes b/Changes index b5531e20db..4a8ee2d12c 100644 --- a/Changes +++ b/Changes @@ -1,7 +1,10 @@ 10.7.x.x (relative to 10.7.2.0) ======== +Build +----- +- Boost : Added compatibility with Boost 1.88.0. 10.7.2.0 (relative to 10.7.1.3) ======== diff --git a/src/IECoreImage/ClientDisplayDriver.cpp b/src/IECoreImage/ClientDisplayDriver.cpp index 68e96b50e4..b76e4a79fa 100644 --- a/src/IECoreImage/ClientDisplayDriver.cpp +++ b/src/IECoreImage/ClientDisplayDriver.cpp @@ -72,7 +72,7 @@ class ClientDisplayDriver::PrivateData : public RefCounted m_socket.close(); } - boost::asio::io_service m_service; + boost::asio::io_context m_service; std::string m_host; std::string m_port; bool m_scanLineOrderOnly; @@ -96,17 +96,21 @@ ClientDisplayDriver::ClientDisplayDriver( const Imath::Box2i &displayWindow, con m_data->m_port = displayPortData->readable(); tcp::resolver resolver(m_data->m_service); - tcp::resolver::query query(m_data->m_host, m_data->m_port); boost::system::error_code error; - tcp::resolver::iterator iterator = resolver.resolve( query, error ); + auto endpoints = resolver.resolve( m_data->m_host, m_data->m_port, tcp::resolver::address_configured, error ); if( !error ) { error = boost::asio::error::host_not_found; - while( error && iterator != tcp::resolver::iterator() ) + for( const auto &e : endpoints ) { m_data->m_socket.close(); - m_data->m_socket.connect( *iterator++, error ); + m_data->m_socket.connect( e, error ); + + if( !error ) + { + break; + } } } if( error ) diff --git a/src/IECoreImage/DisplayDriverServer.cpp b/src/IECoreImage/DisplayDriverServer.cpp index 406c37aa93..9625c9273d 100644 --- a/src/IECoreImage/DisplayDriverServer.cpp +++ b/src/IECoreImage/DisplayDriverServer.cpp @@ -106,7 +106,7 @@ class DisplayDriverServer::Session : public RefCounted { public: - Session( boost::asio::io_service& io_service, MergeMap& mergeMap ); + Session( boost::asio::io_context& io_service, MergeMap& mergeMap ); ~Session() override; boost::asio::ip::tcp::socket& socket(); @@ -135,7 +135,7 @@ class DisplayDriverServer::PrivateData : public RefCounted public : boost::asio::ip::tcp::endpoint m_endpoint; - boost::asio::io_service m_service; + boost::asio::io_context m_service; boost::asio::ip::tcp::acceptor m_acceptor; std::thread m_thread; MergeMap m_mergeMap; @@ -320,7 +320,7 @@ void DisplayDriverServer::handleAccept( DisplayDriverServer::SessionPtr session, * DisplayDriverServer::Session functions */ -DisplayDriverServer::Session::Session( boost::asio::io_service& io_service, MergeMap& mergeMap ) : +DisplayDriverServer::Session::Session( boost::asio::io_context& io_service, MergeMap& mergeMap ) : m_socket( io_service ), m_displayDriver(nullptr), m_buffer( new CharVectorData( ) ), m_mergeMap( mergeMap ) { }