import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / beast / test / extras / include / boost / beast / test / yield_to.hpp

diff --git a/ceph/src/boost/libs/beast/test/extras/include/boost/beast/test/yield_to.hpp b/ceph/src/boost/libs/beast/test/extras/include/boost/beast/test/yield_to.hpp
index 1fb3738ffd5f350f41836f8bb0647088891e86a0..e0064830b2d5124f0c317c93d27c0fe52328886b 100644 (file)
--- a/ceph/src/boost/libs/beast/test/extras/include/boost/beast/test/yield_to.hpp
+++ b/ceph/src/boost/libs/beast/test/extras/include/boost/beast/test/yield_to.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -10,9 +10,9 @@
 #ifndef BOOST_BEAST_TEST_YIELD_TO_HPP
 #define BOOST_BEAST_TEST_YIELD_TO_HPP
 
+#include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
-#include <boost/optional.hpp>
 #include <condition_variable>
 #include <functional>
 #include <mutex>
@@ -32,12 +32,11 @@ namespace test {
 class enable_yield_to
 {
 protected:
-    boost::asio::io_context ioc_;
+    net::io_context ioc_;
 
 private:
-    boost::optional<
-        boost::asio::executor_work_guard<
-            boost::asio::io_context::executor_type>> work_;
+    net::executor_work_guard<
+        net::io_context::executor_type> work_;
     std::vector<std::thread> threads_;
     std::mutex m_;
     std::condition_variable cv_;
@@ -46,7 +45,7 @@ private:
 public:
     /// The type of yield context passed to functions.
     using yield_context =
-        boost::asio::yield_context;
+        net::yield_context;
 
     explicit
     enable_yield_to(std::size_t concurrency = 1)
@@ -60,13 +59,13 @@ public:
 
     ~enable_yield_to()
     {
-        work_ = boost::none;
+        work_.reset();
         for(auto& t : threads_)
             t.join();
     }
 
     /// Return the `io_context` associated with the object
-    boost::asio::io_context&
+    net::io_context&
     get_io_service()
     {
         return ioc_;
@@ -121,7 +120,7 @@ void
 enable_yield_to::
 spawn(F0&& f, FN&&... fn)
 {
-    boost::asio::spawn(ioc_,
+    asio::spawn(ioc_,
         [&](yield_context yield)
         {
             f(yield);