| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 080fc37949114184d4832f7acffe2613745833f3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> |
| 3 | Date: Tue, 16 Apr 2019 08:38:01 +0200 |
| 4 | Subject: [PATCH 1/2] Replace make_shared with new in some cases |
| 5 | |
| 6 | Replace make_shared for asio types that take a lib::ref as a parameter. |
| 7 | This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, |
| 8 | while keeping it backwards compatible to older boost versions. |
| 9 | --- |
| 10 | websocketpp/transport/asio/connection.hpp | 7 ++++--- |
| 11 | websocketpp/transport/asio/endpoint.hpp | 3 +-- |
| 12 | websocketpp/transport/asio/security/none.hpp | 3 +-- |
| 13 | websocketpp/transport/asio/security/tls.hpp | 3 +-- |
| 14 | 4 files changed, 7 insertions(+), 9 deletions(-) |
| 15 | |
| 16 | diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp |
| 17 | index 60f88a7..1ccda8f 100644 |
| 18 | --- a/websocketpp/transport/asio/connection.hpp |
| 19 | +++ b/websocketpp/transport/asio/connection.hpp |
| 20 | @@ -311,9 +311,10 @@ public: |
| 21 | * needed. |
| 22 | */ |
| 23 | timer_ptr set_timer(long duration, timer_handler callback) { |
| 24 | - timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>( |
| 25 | - lib::ref(*m_io_service), |
| 26 | - lib::asio::milliseconds(duration) |
| 27 | + timer_ptr new_timer( |
| 28 | + new lib::asio::steady_timer( |
| 29 | + *m_io_service, |
| 30 | + lib::asio::milliseconds(duration)) |
| 31 | ); |
| 32 | |
| 33 | if (config::enable_multithreading) { |
| 34 | diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp |
| 35 | index ddab2c7..4b719a9 100644 |
| 36 | --- a/websocketpp/transport/asio/endpoint.hpp |
| 37 | +++ b/websocketpp/transport/asio/endpoint.hpp |
| 38 | @@ -195,8 +195,7 @@ public: |
| 39 | |
| 40 | m_io_service = ptr; |
| 41 | m_external_io_service = true; |
| 42 | - m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>( |
| 43 | - lib::ref(*m_io_service)); |
| 44 | + m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); |
| 45 | |
| 46 | m_state = READY; |
| 47 | ec = lib::error_code(); |
| 48 | diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp |
| 49 | index 5c8293d..6c7d352 100644 |
| 50 | --- a/websocketpp/transport/asio/security/none.hpp |
| 51 | +++ b/websocketpp/transport/asio/security/none.hpp |
| 52 | @@ -168,8 +168,7 @@ protected: |
| 53 | return socket::make_error_code(socket::error::invalid_state); |
| 54 | } |
| 55 | |
| 56 | - m_socket = lib::make_shared<lib::asio::ip::tcp::socket>( |
| 57 | - lib::ref(*service)); |
| 58 | + m_socket.reset(new lib::asio::ip::tcp::socket(*service)); |
| 59 | |
| 60 | if (m_socket_init_handler) { |
| 61 | m_socket_init_handler(m_hdl, *m_socket); |
| 62 | diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp |
| 63 | index c76fd9a..04ac379 100644 |
| 64 | --- a/websocketpp/transport/asio/security/tls.hpp |
| 65 | +++ b/websocketpp/transport/asio/security/tls.hpp |
| 66 | @@ -193,8 +193,7 @@ protected: |
| 67 | if (!m_context) { |
| 68 | return socket::make_error_code(socket::error::invalid_tls_context); |
| 69 | } |
| 70 | - m_socket = lib::make_shared<socket_type>( |
| 71 | - _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); |
| 72 | + m_socket.reset(new socket_type(*service, *m_context)); |
| 73 | |
| 74 | if (m_socket_init_handler) { |
| 75 | m_socket_init_handler(m_hdl, get_socket()); |
| 76 | -- |
| 77 | 2.23.0 |
| 78 | |