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/cpp11/spawn/echo_server.cpp | |
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/cpp11/spawn/echo_server.cpp')
-rw-r--r-- | 3rdparty/asio/src/examples/cpp11/spawn/echo_server.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/3rdparty/asio/src/examples/cpp11/spawn/echo_server.cpp b/3rdparty/asio/src/examples/cpp11/spawn/echo_server.cpp index 5397a4efe22..95adffd604e 100644 --- a/3rdparty/asio/src/examples/cpp11/spawn/echo_server.cpp +++ b/3rdparty/asio/src/examples/cpp11/spawn/echo_server.cpp @@ -2,7 +2,7 @@ // echo_server.cpp // ~~~~~~~~~~~~~~~ // -// 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) @@ -21,10 +21,10 @@ using asio::ip::tcp; class session : public std::enable_shared_from_this<session> { public: - explicit session(tcp::socket socket) + explicit session(asio::io_context& io_context, tcp::socket socket) : socket_(std::move(socket)), - timer_(socket_.get_io_context()), - strand_(socket_.get_io_context()) + timer_(io_context), + strand_(io_context.get_executor()) { } @@ -67,7 +67,7 @@ public: private: tcp::socket socket_; asio::steady_timer timer_; - asio::io_context::strand strand_; + asio::strand<asio::io_context::executor_type> strand_; }; int main(int argc, char* argv[]) @@ -93,7 +93,10 @@ int main(int argc, char* argv[]) asio::error_code ec; tcp::socket socket(io_context); acceptor.async_accept(socket, yield[ec]); - if (!ec) std::make_shared<session>(std::move(socket))->go(); + if (!ec) + { + std::make_shared<session>(io_context, std::move(socket))->go(); + } } }); |