import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / system_context.hpp

diff --git a/ceph/src/boost/boost/asio/system_context.hpp b/ceph/src/boost/boost/asio/system_context.hpp
index 62a0db261cb660e3adb0b30c87566118eb6bb892..c8c2f321a9d6af6db63877d6f5bcf8b97b5eb5ef 100644 (file)
--- a/ceph/src/boost/boost/asio/system_context.hpp
+++ b/ceph/src/boost/boost/asio/system_context.hpp
@@ -18,6 +18,7 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/scheduler.hpp>
 #include <boost/asio/detail/thread_group.hpp>
+#include <boost/asio/execution.hpp>
 #include <boost/asio/execution_context.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -25,14 +26,19 @@
 namespace boost {
 namespace asio {
 
-class system_executor;
+template <typename Blocking, typename Relationship, typename Allocator>
+class basic_system_executor;
 
 /// The executor context for the system executor.
 class system_context : public execution_context
 {
 public:
   /// The executor type associated with the context.
-  typedef system_executor executor_type;
+  typedef basic_system_executor<
+      execution::blocking_t::possibly_t,
+      execution::relationship_t::fork_t,
+      std::allocator<void>
+    > executor_type;
 
   /// Destructor shuts down all threads in the system thread pool.
   BOOST_ASIO_DECL ~system_context();
@@ -56,7 +62,7 @@ private:
   BOOST_ASIO_DECL system_context();
 
 private:
-  friend class system_executor;
+  template <typename, typename, typename> friend class basic_system_executor;
 
   struct thread_function;
 
@@ -68,6 +74,9 @@ private:
 
   // The threads in the system thread pool.
   detail::thread_group threads_;
+
+  // The number of threads in the pool.
+  std::size_t num_threads_;
 };
 
 } // namespace asio