diff options
author | 2021-11-15 04:15:13 +1100 | |
---|---|---|
committer | 2021-11-15 04:15:13 +1100 | |
commit | 44ec6d2e0ee569202b75b73eea40972595866779 (patch) | |
tree | b286443c264704198789514e0594dc24b3ca9f96 /3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp | |
parent | 137f254b918f1f1ebee43dfbed86793b0dae73eb (diff) |
3rdparty: Updated ASIO to version 1.20.0.
The doc folder isn't included as it's pretty big.
This required include/asio/detail/win_iocp_socket_accept_op.hpp due to
mismatched order in the member declarations and initialiser list for the
win_iocp_socket_accept_op class. I reversed the declaration order so it
matches win_iocp_socket_move_accept_op.
Diffstat (limited to '3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp')
-rw-r--r-- | 3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp index 6a573c539f6..c08091dcefe 100644 --- a/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp +++ b/3rdparty/asio/src/examples/cpp03/http/server2/io_context_pool.hpp @@ -2,7 +2,7 @@ // io_context_pool.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 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) @@ -12,6 +12,7 @@ #define HTTP_SERVER2_IO_SERVICE_POOL_HPP #include <asio.hpp> +#include <list> #include <vector> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> @@ -38,14 +39,12 @@ public: private: typedef boost::shared_ptr<asio::io_context> io_context_ptr; - typedef asio::executor_work_guard< - asio::io_context::executor_type> io_context_work; /// The pool of io_contexts. std::vector<io_context_ptr> io_contexts_; - /// The work that keeps the io_contexts running. - std::vector<io_context_work> work_; + /// The work-tracking executors that keep the io_contexts running. + std::list<asio::any_io_executor> work_; /// The next io_context to use for a connection. std::size_t next_io_context_; |