From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001

From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>

Date: Wed, 17 Apr 2019 10:06:18 +0000

Subject: [PATCH] Fix missed entries; fix testing

---

 websocketpp/transport/asio/connection.hpp | 3 +--

 websocketpp/transport/asio/endpoint.hpp   | 7 ++-----

 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp

index 1ccda8f3..57dda74a 100644

--- a/websocketpp/transport/asio/connection.hpp

+++ b/websocketpp/transport/asio/connection.hpp

@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {

         m_io_service = io_service;

         if (config::enable_multithreading) {

-            m_strand = lib::make_shared<lib::asio::io_service::strand>(

-                lib::ref(*io_service));

+            m_strand.reset(new lib::asio::io_service::strand(*io_service));

         }

         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,

diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp

index 4b719a97..94509adb 100644

--- a/websocketpp/transport/asio/endpoint.hpp

+++ b/websocketpp/transport/asio/endpoint.hpp

@@ -687,9 +687,7 @@ class endpoint : public config::socket_type {

      * @since 0.3.0

      */

     void start_perpetual() {

-        m_work = lib::make_shared<lib::asio::io_service::work>(

-            lib::ref(*m_io_service)

-        );

+        m_work.reset(new lib::asio::io_service::work(*m_io_service));

     }

     /// Clears the endpoint's perpetual flag, allowing it to exit when empty

@@ -853,8 +851,7 @@ class endpoint : public config::socket_type {

         // Create a resolver

         if (!m_resolver) {

-            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(

-                lib::ref(*m_io_service));

+            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));

         }

         tcon->set_uri(u);