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/nonblocking/third_party_lib.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/cpp03/nonblocking/third_party_lib.cpp')
-rw-r--r-- | 3rdparty/asio/src/examples/cpp03/nonblocking/third_party_lib.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/3rdparty/asio/src/examples/cpp03/nonblocking/third_party_lib.cpp b/3rdparty/asio/src/examples/cpp03/nonblocking/third_party_lib.cpp index 8ec06f6034d..bc3d02f02f6 100644 --- a/3rdparty/asio/src/examples/cpp03/nonblocking/third_party_lib.cpp +++ b/3rdparty/asio/src/examples/cpp03/nonblocking/third_party_lib.cpp @@ -2,7 +2,7 @@ // third_party_lib.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) @@ -10,7 +10,7 @@ #include <asio.hpp> #include <boost/array.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <iostream> @@ -83,9 +83,9 @@ class connection public: typedef boost::shared_ptr<connection> pointer; - static pointer create(asio::io_context& io_context) + static pointer create(const asio::any_io_executor& ex) { - return pointer(new connection(io_context)); + return pointer(new connection(ex)); } tcp::socket& socket() @@ -102,8 +102,8 @@ public: } private: - connection(asio::io_context& io_context) - : socket_(io_context), + connection(const asio::any_io_executor& ex) + : socket_(ex), session_impl_(socket_), read_in_progress_(false), write_in_progress_(false) @@ -193,7 +193,7 @@ private: void start_accept() { connection::pointer new_connection = - connection::create(acceptor_.get_executor().context()); + connection::create(acceptor_.get_executor()); acceptor_.async_accept(new_connection->socket(), boost::bind(&server::handle_accept, this, new_connection, |