summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp')
-rw-r--r--3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp b/3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp
index b9dc60558c9..2fec1084dbf 100644
--- a/3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp
+++ b/3rdparty/asio/src/examples/cpp03/tutorial/daytime7/server.cpp
@@ -2,7 +2,7 @@
// 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)
@@ -12,7 +12,7 @@
#include <iostream>
#include <string>
#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 <asio.hpp>
@@ -69,7 +69,8 @@ class tcp_server
{
public:
tcp_server(asio::io_context& io_context)
- : acceptor_(io_context, tcp::endpoint(tcp::v4(), 13))
+ : io_context_(io_context),
+ acceptor_(io_context, tcp::endpoint(tcp::v4(), 13))
{
start_accept();
}
@@ -78,7 +79,7 @@ private:
void start_accept()
{
tcp_connection::pointer new_connection =
- tcp_connection::create(acceptor_.get_executor().context());
+ tcp_connection::create(io_context_);
acceptor_.async_accept(new_connection->socket(),
boost::bind(&tcp_server::handle_accept, this, new_connection,
@@ -96,6 +97,7 @@ private:
start_accept();
}
+ asio::io_context& io_context_;
tcp::acceptor acceptor_;
};
@@ -119,7 +121,7 @@ private:
void handle_receive(const asio::error_code& error)
{
- if (!error || error == asio::error::message_size)
+ if (!error)
{
boost::shared_ptr<std::string> message(
new std::string(make_daytime_string()));