import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / detail / memory.hpp

diff --git a/ceph/src/boost/boost/asio/detail/memory.hpp b/ceph/src/boost/boost/asio/detail/memory.hpp
index 0f92263c4259dabfa6db7dcd3ce08e5774aea88e..438abceb673320f1d4a5470b826a7a3ba0d6a65c 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/memory.hpp
+++ b/ceph/src/boost/boost/asio/detail/memory.hpp
@@ -19,6 +19,7 @@
 #include <memory>
 
 #if !defined(BOOST_ASIO_HAS_STD_SHARED_PTR)
+# include <boost/make_shared.hpp>
 # include <boost/shared_ptr.hpp>
 # include <boost/weak_ptr.hpp>
 #endif // !defined(BOOST_ASIO_HAS_STD_SHARED_PTR)
@@ -32,9 +33,11 @@ namespace asio {
 namespace detail {
 
 #if defined(BOOST_ASIO_HAS_STD_SHARED_PTR)
+using std::make_shared;
 using std::shared_ptr;
 using std::weak_ptr;
 #else // defined(BOOST_ASIO_HAS_STD_SHARED_PTR)
+using boost::make_shared;
 using boost::shared_ptr;
 using boost::weak_ptr;
 #endif // defined(BOOST_ASIO_HAS_STD_SHARED_PTR)