Skip to content

Fix Boost.Asio io_service compatibility #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RacleRay wants to merge 1 commit into
base: cpp17
Choose a base branch
from
Open

Fix Boost.Asio io_service compatibility #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions examples/ace/ttcp/ttcp_asio_async.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class TtcpServerConnection : public std::enable_shared_from_this<TtcpServerConne
TtcpServerConnection(boost::asio::io_service& io_service)
: socket_(io_service), count_(0), payload_(NULL), ack_(0)
#else
TtcpServerConnection(const boost::asio::executor& executor)
: socket_(executor), count_(0), payload_(NULL), ack_(0)
TtcpServerConnection(boost::asio::io_context& io_context)
: socket_(io_context), count_(0), payload_(NULL), ack_(0)
#endif
{
sessionMessage_.number = 0;
Expand Down Expand Up @@ -152,7 +152,7 @@ void doAccept(tcp::acceptor& acceptor)
// no need to pre-create new_connection if we use asio 1.12 or boost 1.66+
TtcpServerConnectionPtr new_connection(new TtcpServerConnection(acceptor.get_io_service()));
#else
TtcpServerConnectionPtr new_connection(new TtcpServerConnection(acceptor.get_executor()));
TtcpServerConnectionPtr new_connection(new TtcpServerConnection(static_cast<boost::asio::io_context&>(acceptor.get_executor().context())));
#endif
acceptor.async_accept(
new_connection->socket(),
Expand All @@ -170,10 +170,19 @@ void receive(const Options& opt)
{
try
{
#if BOOST_VERSION < 107000L
boost::asio::io_service io_service;
tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v4(), opt.port));
#else
boost::asio::io_context io_context;
tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v4(), opt.port));
#endif
doAccept(acceptor);
#if BOOST_VERSION < 107000L
io_service.run();
#else
io_context.run();
#endif
}
catch (std::exception& e)
{
Expand Down
7 changes: 7 additions & 0 deletions examples/ace/ttcp/ttcp_asio_sync.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ void receive(const Options& opt)
{
try
{
#if BOOST_VERSION < 107000L
boost::asio::io_service io_service;
tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v4(), opt.port));
tcp::socket socket(io_service);
#else
boost::asio::io_context io_context;
tcp::acceptor acceptor(io_context, tcp::endpoint(tcp::v4(), opt.port));
tcp::socket socket(io_context);
#endif

acceptor.accept(socket);

struct SessionMessage sessionMessage = { 0, 0 };
Expand Down