Skip to content

Fix for boost 1.70 (get_io_service() was deprecated and was removed) #878

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.

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

Merged
merged 6 commits into from
Aug 12, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix for boost 1.70 (get_io_service() was deprecated and was removed)
  • Loading branch information
enricodetoma committed Aug 6, 2019
commit cf11364b28927a80cdadae7c5384185ccdff83eb
4 changes: 2 additions & 2 deletions boost/network/protocol/http/client/connection/sync_normal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ struct http_sync_connection
int timeout)
: connection_base(),
timeout_(timeout),
timer_(resolver.get_io_service()),
timer_((boost::asio::io_context &)resolver.get_executor().context()),
resolver_(resolver),
resolve_(std::move(resolve)),
socket_(resolver.get_io_service()) {}
socket_((boost::asio::io_context &)resolver.get_executor().context()) {}

void init_socket(string_type const& hostname, string_type const& port) {
connection_base::init_socket(socket_, resolver_, hostname, port, resolve_);
Expand Down
6 changes: 3 additions & 3 deletions boost/network/protocol/http/client/connection/sync_ssl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ struct https_sync_connection
long ssl_options = 0)
: connection_base(),
timeout_(timeout),
timer_(resolver.get_io_service()),
timer_((boost::asio::io_context &)resolver.get_executor().context()),
resolver_(resolver),
resolve_(std::move(resolve)),
context_(resolver.get_io_service(), boost::asio::ssl::context::sslv23_client),
socket_(resolver.get_io_service(), context_) {
context_((boost::asio::io_context &)resolver.get_executor().context(), boost::asio::ssl::context::sslv23_client),
socket_((boost::asio::io_context &)resolver.get_executor().context(), context_) {
if (ciphers) {
::SSL_CTX_set_cipher_list(context_.native_handle(), ciphers->c_str());
}
Expand Down