import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / impl / awaitable.hpp

diff --git a/ceph/src/boost/boost/asio/impl/awaitable.hpp b/ceph/src/boost/boost/asio/impl/awaitable.hpp
index 088d03d14b495057aa503e38fc4dc6b0950a64d0..094e647f721061c913b8d21b97b0c2e573485ff0 100644 (file)
--- a/ceph/src/boost/boost/asio/impl/awaitable.hpp
+++ b/ceph/src/boost/boost/asio/impl/awaitable.hpp
@@ -112,7 +112,7 @@ public:
 
       void await_suspend(coroutine_handle<void>) noexcept
       {
-        this_->pop_frame();
+        this->this_->pop_frame();
       }
 
       void await_resume() const noexcept
@@ -406,6 +406,19 @@ protected:
 } // namespace boost
 
 #if !defined(GENERATING_DOCUMENTATION)
+# if defined(BOOST_ASIO_HAS_STD_COROUTINE)
+
+namespace std {
+
+template <typename T, typename Executor, typename... Args>
+struct coroutine_traits<boost::asio::awaitable<T, Executor>, Args...>
+{
+  typedef boost::asio::detail::awaitable_frame<T, Executor> promise_type;
+};
+
+} // namespace std
+
+# else // defined(BOOST_ASIO_HAS_STD_COROUTINE)
 
 namespace std { namespace experimental {
 
@@ -417,6 +430,7 @@ struct coroutine_traits<boost::asio::awaitable<T, Executor>, Args...>
 
 }} // namespace std::experimental
 
+# endif // defined(BOOST_ASIO_HAS_STD_COROUTINE)
 #endif // !defined(GENERATING_DOCUMENTATION)
 
 #include <boost/asio/detail/pop_options.hpp>