package/websocketpp: fix build with boost 1.70.0
PATCH 1/1 package/websocketpp: fix build with boost 1.70.0
Fix build of libcpprestsdk with boost 1.70.0
Fixes:
- http://autobuild.buildroot.org/results/65840c7c5b337f1d4e5768d8e68198a5449603fd
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...e-make_shared-with-new-in-some-cases.patch | 79 +++++++++++++++++++ .../0002-Fix-missed-entries-fix-testing.patch | 66 ++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch create mode 100644 package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch new file +79 -0
@@ -0,0 +1,79 @@ +From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001 +From: Stefan Floeren <[email protected]> +Date: Tue, 16 Apr 2019 08:38:01 +0200 +Subject: [PATCH] Replace make_shared with new in some cases + +Replace make_shared for asio types that take a lib::ref as a parameter. +This should fix the ASIO change (boostorg/asio at 59066d8) for 1.70, +while keeping it backwards compatible to older boost versions. + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/zaphoyd/websocketpp/pull/814/commits/c769c9238ad62178f506038178714a1c35aa2769] +--- + websocketpp/transport/asio/connection.hpp | 7 ++++--- + websocketpp/transport/asio/endpoint.hpp | 3 +-- + websocketpp/transport/asio/security/none.hpp | 3 +-- + websocketpp/transport/asio/security/tls.hpp | 3 +-- + 4 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +index 60f88a79..1ccda8f3 100644 +--- a/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type { + * needed. + */ + timer_ptr set_timer(long duration, timer_handler callback) { +- timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>( +- lib::ref(*m_io_service), +- lib::asio::milliseconds(duration) ++ timer_ptr new_timer( ++ new lib::asio::steady_timer( ++ *m_io_service, ++ lib::asio::milliseconds(duration)) + ); + + if (config::enable_multithreading) { +diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +index ddab2c74..4b719a97 100644 +--- a/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -195,8 +195,7 @@ class endpoint : public config::socket_type { + + m_io_service = ptr; + m_external_io_service = true; +- m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>( +- lib::ref(*m_io_service)); ++ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); + + m_state = READY; + ec = lib::error_code(); +diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp +index 5c8293db..6c7d3524 100644 +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> { + return socket::make_error_code(socket::error::invalid_state); + } + +- m_socket = lib::make_shared<lib::asio::ip::tcp::socket>( +- lib::ref(*service)); ++ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, *m_socket); +diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp +index c76fd9aa..04ac3790 100644 +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> { + if (!m_context) { + return socket::make_error_code(socket::error::invalid_tls_context); + } +- m_socket = lib::make_shared<socket_type>( +- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); ++ m_socket.reset(new socket_type(*service, *m_context)); + + if (m_socket_init_handler) { + m_socket_init_handler(m_hdl, get_socket());
package/websocketpp/0002-Fix-missed-entries-fix-testing.patch new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/websocketpp: fix build with boost 1.70.0
Quoted 5 lines · On Thu, 25 Apr 2019 23:34:28 +0200 Fabrice Fontaine…
Fix build of libcpprestsdk with boost 1.70.0
Fixes:
- http://autobuild.buildroot.org/results/65840c7c5b337f1d4e5768d8e68198a5449603fd
Quoted 7 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- ...e-make_shared-with-new-in-some-cases.patch | 79 +++++++++++++++++++ .../0002-Fix-missed-entries-fix-testing.patch | 66 ++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch create mode 100644 package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com