mirror of
https://github.com/boostorg/asio.git
synced 2026-01-22 05:02:08 +00:00
Initial merge of Networking TS compatibility.
Merged from chriskohlhoff/asio master branch as of commit 4a4d28b0d24c53236e229bd1b5f378c9964b1ebb.
This commit is contained in:
@@ -120,8 +120,8 @@ class session
|
||||
: public boost::enable_shared_from_this<session>
|
||||
{
|
||||
public:
|
||||
session(boost::asio::io_service& io_service)
|
||||
: socket_(io_service)
|
||||
session(boost::asio::io_context& io_context)
|
||||
: socket_(io_context)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -183,11 +183,11 @@ typedef boost::shared_ptr<session> session_ptr;
|
||||
class server
|
||||
{
|
||||
public:
|
||||
server(boost::asio::io_service& io_service, short port)
|
||||
: io_service_(io_service),
|
||||
acceptor_(io_service, tcp::endpoint(tcp::v4(), port))
|
||||
server(boost::asio::io_context& io_context, short port)
|
||||
: io_context_(io_context),
|
||||
acceptor_(io_context, tcp::endpoint(tcp::v4(), port))
|
||||
{
|
||||
session_ptr new_session(new session(io_service_));
|
||||
session_ptr new_session(new session(io_context_));
|
||||
acceptor_.async_accept(new_session->socket(),
|
||||
boost::bind(&server::handle_accept, this, new_session,
|
||||
boost::asio::placeholders::error));
|
||||
@@ -201,14 +201,14 @@ public:
|
||||
new_session->start();
|
||||
}
|
||||
|
||||
new_session.reset(new session(io_service_));
|
||||
new_session.reset(new session(io_context_));
|
||||
acceptor_.async_accept(new_session->socket(),
|
||||
boost::bind(&server::handle_accept, this, new_session,
|
||||
boost::asio::placeholders::error));
|
||||
}
|
||||
|
||||
private:
|
||||
boost::asio::io_service& io_service_;
|
||||
boost::asio::io_context& io_context_;
|
||||
tcp::acceptor acceptor_;
|
||||
};
|
||||
|
||||
@@ -222,12 +222,12 @@ int main(int argc, char* argv[])
|
||||
return 1;
|
||||
}
|
||||
|
||||
boost::asio::io_service io_service;
|
||||
boost::asio::io_context io_context;
|
||||
|
||||
using namespace std; // For atoi.
|
||||
server s(io_service, atoi(argv[1]));
|
||||
server s(io_context, atoi(argv[1]));
|
||||
|
||||
io_service.run();
|
||||
io_context.run();
|
||||
}
|
||||
catch (std::exception& e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user