SERVER-30269 Upgrade ASIO

(cherry picked from commit 1bef1a5c3a5ed09b2efc899cf2ddba93e1ec1079)

1 files changed, 4 insertions, 28 deletions

diff --git a/src/third_party/asio-master/asio/include/asio/system_executor.hpp b/src/third_party/asio-master/asio/include/asio/system_executor.hpp
index f23e35f04b6..3cf3703ee78 100644
--- a/src/third_party/asio-master/asio/include/asio/system_executor.hpp
+++ b/src/third_party/asio-master/asio/include/asio/system_executor.hpp
@@ -2,7 +2,7 @@
 // system_executor.hpp
 // ~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff 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)
@@ -16,14 +16,13 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include "asio/detail/scheduler.hpp"
-#include "asio/detail/thread_group.hpp"
-#include "asio/execution_context.hpp"
 
 #include "asio/detail/push_options.hpp"
 
 namespace asio {
 
+class system_context;
+
 /// An executor that uses arbitrary threads.
 /**
  * The system executor represents an execution context where functions are
@@ -35,7 +34,7 @@ class system_executor
 {
 public:
   /// Obtain the underlying execution context.
-  execution_context& context() const ASIO_NOEXCEPT;
+  system_context& context() const ASIO_NOEXCEPT;
 
   /// Inform the executor that it has some outstanding work to do.
   /**
@@ -119,26 +118,6 @@ public:
   {
     return false;
   }
-
-private:
-  struct thread_function;
-
-  // Hidden implementation of the system execution context.
-  struct context_impl
-    : public execution_context
-  {
-    // Constructor creates all threads in the system thread pool.
-    ASIO_DECL context_impl();
-
-    // Destructor shuts down all threads in the system thread pool.
-    ASIO_DECL ~context_impl();
-
-    // The underlying scheduler.
-    detail::scheduler& scheduler_;
-
-    // The threads in the system thread pool.
-    detail::thread_group threads_;
-  };
 };
 
 } // namespace asio
@@ -146,8 +125,5 @@ private:
 #include "asio/detail/pop_options.hpp"
 
 #include "asio/impl/system_executor.hpp"
-#if defined(ASIO_HEADER_ONLY)
-# include "asio/impl/system_executor.ipp"
-#endif // defined(ASIO_HEADER_ONLY)
 
 #endif // ASIO_SYSTEM_EXECUTOR_HPP