boost/asio
2
0
Fork 0
mirror of https://github.com/boostorg/asio.git synced 2026-01-23 17:32:07 +00:00
Code Issues Projects Releases Wiki Activity

Initial merge of Networking TS compatibility.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
example/cpp11/allocation/server.cpp
View File

@@ -166,9 +166,8 @@ private:
class server
{
public:
server(boost::asio::io_service& io_service, short port)
: acceptor_(io_service, tcp::endpoint(tcp::v4(), port)),
socket_(io_service)
server(boost::asio::io_context& io_context, short port)
: acceptor_(io_context, tcp::endpoint(tcp::v4(), port))
{
do_accept();
}
@@ -176,12 +175,12 @@ public:
private:
void do_accept()
{
acceptor_.async_accept(socket_,
[this](boost::system::error_code ec)
acceptor_.async_accept(
[this](boost::system::error_code ec, tcp::socket socket)
{
if (!ec)
{
std::make_shared<session>(std::move(socket_))->start();
std::make_shared<session>(std::move(socket))->start();
}
do_accept();
@@ -189,7 +188,6 @@ private:
}
tcp::acceptor acceptor_;
tcp::socket socket_;
};
int main(int argc, char* argv[])
@@ -202,9 +200,9 @@ int main(int argc, char* argv[])
return 1;
}
boost::asio::io_service io_service;
server s(io_service, std::atoi(argv[1]));
io_service.run();
boost::asio::io_context io_context;
server s(io_context, std::atoi(argv[1]));
io_context.run();
}
catch (std::exception& e)
{