2
0
mirror of https://github.com/boostorg/asio.git synced 2026-02-02 08:22:08 +00:00

Initial merge of Networking TS compatibility.

Merged from chriskohlhoff/asio master branch as of commit
4a4d28b0d24c53236e229bd1b5f378c9964b1ebb.
This commit is contained in:
Christopher Kohlhoff
2017-10-23 14:27:36 +11:00
parent b002097359
commit b60e92b13e
617 changed files with 43380 additions and 21694 deletions

View File

@@ -23,12 +23,12 @@ class client
{
public:
/// Constructor starts the asynchronous connect operation.
client(boost::asio::io_service& io_service,
client(boost::asio::io_context& io_context,
const std::string& host, const std::string& service)
: connection_(io_service)
: connection_(io_context)
{
// Resolve the host name into an IP address.
boost::asio::ip::tcp::resolver resolver(io_service);
boost::asio::ip::tcp::resolver resolver(io_context);
boost::asio::ip::tcp::resolver::query query(host, service);
boost::asio::ip::tcp::resolver::iterator endpoint_iterator =
resolver.resolve(query);
@@ -54,7 +54,7 @@ public:
else
{
// An error occurred. Log it and return. Since we are not starting a new
// operation the io_service will run out of work to do and the client will
// operation the io_context will run out of work to do and the client will
// exit.
std::cerr << e.message() << std::endl;
}
@@ -87,7 +87,7 @@ public:
std::cerr << e.message() << std::endl;
}
// Since we are not starting a new operation the io_service will run out of
// Since we are not starting a new operation the io_context will run out of
// work to do and the client will exit.
}
@@ -112,9 +112,9 @@ int main(int argc, char* argv[])
return 1;
}
boost::asio::io_service io_service;
s11n_example::client client(io_service, argv[1], argv[2]);
io_service.run();
boost::asio::io_context io_context;
s11n_example::client client(io_context, argv[1], argv[2]);
io_context.run();
}
catch (std::exception& e)
{