From d0511fbd55629a078b10243b23ab1a7301fb54cf Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Sun, 27 Sep 2020 17:37:11 -0700 Subject: [cpp-netlib] Fix usage with boost 1.73 (#13671) * [cpp-netlib] Fix usage with boost 1.72 * Add dependency port boost-logic, boost-scope-exit Co-authored-by: Robert Schumacher Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/cpp-netlib/stream-handler-executor.patch | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 ports/cpp-netlib/stream-handler-executor.patch (limited to 'ports/cpp-netlib/stream-handler-executor.patch') diff --git a/ports/cpp-netlib/stream-handler-executor.patch b/ports/cpp-netlib/stream-handler-executor.patch new file mode 100644 index 000000000..7152f2349 --- /dev/null +++ b/ports/cpp-netlib/stream-handler-executor.patch @@ -0,0 +1,27 @@ +diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp +index ffb09b8..f3b3e99 100644 +--- a/boost/network/protocol/stream_handler.hpp ++++ b/boost/network/protocol/stream_handler.hpp +@@ -41,6 +40,7 @@ typedef boost::asio::ssl::context ssl_context; + + struct stream_handler { + public: ++ typedef tcp_socket::executor_type executor_type; + stream_handler(std::shared_ptr socket) + : tcp_sock_(std::move(socket)), ssl_enabled(false) {} + +@@ -52,12 +52,12 @@ struct stream_handler { + stream_handler(boost::asio::io_service& io, + std::shared_ptr ctx = + std::shared_ptr()) { +- tcp_sock_ = std::make_shared(boost::ref(io)); ++ tcp_sock_ = std::make_shared(io.get_executor()); + ssl_enabled = false; + if (ctx) { + /// SSL is enabled + ssl_sock_ = +- std::make_shared(boost::ref(io), boost::ref(*ctx)); ++ std::make_shared(io.get_executor(), boost::ref(*ctx)); + ssl_enabled = true; + } + } -- cgit v1.2.3