From 5ed9f7712efac315ddda5c1922a2bce7e24398c9 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Thu, 14 Feb 2019 12:54:32 -0800
Subject: [PATCH] basic_stream uses boost::shared_ptr

---
 CHANGELOG.md                                   |  6 ++++++
 include/boost/beast/core/basic_stream.hpp      |  9 +++++----
 include/boost/beast/core/impl/basic_stream.hpp | 15 ++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1035c79..887bde5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 215:
+
+* basic_stream uses boost::shared_ptr
+
+--------------------------------------------------------------------------------
+
 Version 214:
 
 * Handler binders use the associated allocator
diff --git a/include/boost/beast/core/basic_stream.hpp b/include/boost/beast/core/basic_stream.hpp
index 03019be9..97866e00 100644
--- a/include/boost/beast/core/basic_stream.hpp
+++ b/include/boost/beast/core/basic_stream.hpp
@@ -21,8 +21,9 @@
 #include <boost/core/empty_value.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/optional.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
 #include <chrono>
-#include <memory>
 
 namespace boost {
 namespace asio {
@@ -200,7 +201,7 @@ class basic_stream
 public:
 #endif
     struct impl_type
-        : std::enable_shared_from_this<impl_type>
+        : boost::enable_shared_from_this<impl_type>
         , boost::empty_value<Executor>
     {
         op_state read;
@@ -227,7 +228,7 @@ public:
         Executor const&
         ex() const noexcept
         {
-            return this->get();
+            return this->boost::empty_value<Executor>::get();
         }
 
         void reset();       // set timeouts to never
@@ -241,7 +242,7 @@ private:
     // outlive the destruction of the stream_socket object,
     // in the case where there is no outstanding read or write
     // but the implementation is still waiting on a timer.
-    std::shared_ptr<impl_type> impl_;
+    boost::shared_ptr<impl_type> impl_;
 
     // Restricted until P1322R0 is incorporated into Boost.Asio.
     static_assert(
diff --git a/include/boost/beast/core/impl/basic_stream.hpp b/include/boost/beast/core/impl/basic_stream.hpp
index c0cb0743..925f981e 100644
--- a/include/boost/beast/core/impl/basic_stream.hpp
+++ b/include/boost/beast/core/impl/basic_stream.hpp
@@ -17,6 +17,7 @@
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/assert.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/core/exchange.hpp>
 #include <cstdlib>
 #include <type_traits>
@@ -118,7 +119,7 @@ struct basic_stream<
     Protocol, Executor>::timeout_handler
 {
     op_state& state;
-    std::weak_ptr<impl_type> wp;
+    boost::weak_ptr<impl_type> wp;
     tick_type tick;
 
     void
@@ -163,7 +164,7 @@ class basic_stream<Protocol, Executor>::async_op
     : public async_op_base<Handler, Executor>
     , public boost::asio::coroutine
 {
-    std::shared_ptr<impl_type> impl_;
+    boost::shared_ptr<impl_type> impl_;
     pending_guard pg_;
     Buffers b_;
 
@@ -292,7 +293,7 @@ class basic_stream_connect_op
     using timeout_handler =
         typename stream_type::timeout_handler;
 
-    std::shared_ptr<typename
+    boost::shared_ptr<typename
         stream_type::impl_type> impl_;
     typename stream_type::pending_guard pg0_;
     typename stream_type::pending_guard pg1_;
@@ -437,7 +438,7 @@ template<class Protocol, class Executor>
 template<class ExecutionContext, class... Args, class>
 basic_stream<Protocol, Executor>::
 basic_stream(ExecutionContext& ctx, Args&&... args)
-    : impl_(std::make_shared<impl_type>(
+    : impl_(boost::make_shared<impl_type>(
         ctx.get_executor(),
         ctx, std::forward<Args>(args)...))
 {
@@ -452,7 +453,7 @@ template<class... Args>
 basic_stream<Protocol, Executor>::
 basic_stream(
     executor_type const& ex, Args&&... args)
-    : impl_(std::make_shared<impl_type>(
+    : impl_(boost::make_shared<impl_type>(
         ex,
         ex.context(), std::forward<Args>(args)...))
 {
@@ -462,7 +463,7 @@ template<class Protocol, class Executor>
 template<class OtherProtocol, class>
 basic_stream<Protocol, Executor>::
 basic_stream(net::basic_stream_socket<OtherProtocol>&& socket)
-    : impl_(std::make_shared<impl_type>(
+    : impl_(boost::make_shared<impl_type>(
         std::move(socket),
         std::is_constructible<Executor,
         decltype(std::declval<net::basic_stream_socket<
@@ -473,7 +474,7 @@ basic_stream(net::basic_stream_socket<OtherProtocol>&& socket)
 template<class Protocol, class Executor>
 basic_stream<Protocol, Executor>::
 basic_stream(basic_stream&& other)
-    : impl_(std::make_shared<impl_type>(
+    : impl_(boost::make_shared<impl_type>(
         std::move(*other.impl_)))
 {
     // VFALCO I'm not sure this implementation is correct...