Commit5351fc6

committed

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

1 parentcf11364 commit5351fc6Copy full SHA for 5351fc6

File tree

+46

-9

lines changed

+46

-9

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@`
`17`	`17`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`18`	`18`	`#include<boost/network/traits/string.hpp>`
`19`	`19`
	`20`	`+#ifndef GET_IO_SERVICE`
	`21`	`+#if BOOST_VERSION >= 107000`
	`22`	`+#defineGET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())`
	`23`	`+#else`
	`24`	`+#defineGET_IO_SERVICE(s) ((s).get_io_service())`
	`25`	`+#endif`
	`26`	`+#endif`
	`27`	`+`
`20`	`28`	`namespaceboost {`
`21`	`29`	`namespacenetwork {`
`22`	`30`	`namespacehttp {`
`@@ -59,7 +67,7 @@ struct async_connection_base {`
`59`	`67`	`async_connection;`
`60`	`68`	`typedeftypename delegate_factory<Tag>::type delegate_factory_type;`
`61`	`69`	`auto delegate =delegate_factory_type::new_connection_delegate(`
`62`		`-(boost::asio::io_context &)resolver.get_executor().context(), https, always_verify_peer,`
	`70`	`+GET_IO_SERVICE(resolver), https, always_verify_peer,`
`63`	`71`	`certificate_filename, verify_path, certificate_file, private_key_file,`
`64`	`72`	`ciphers, sni_hostname, ssl_options);`
`65`	`73`	`auto temp = std::make_shared<async_connection>(`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,14 @@`
`33`	`33`	`#include<boost/range/iterator_range.hpp>`
`34`	`34`	`#include<boost/throw_exception.hpp>`
`35`	`35`
	`36`	`+#ifndef GET_IO_SERVICE`
	`37`	`+#if BOOST_VERSION >= 107000`
	`38`	`+#defineGET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())`
	`39`	`+#else`
	`40`	`+#defineGET_IO_SERVICE(s) ((s).get_io_service())`
	`41`	`+#endif`
	`42`	`+#endif`
	`43`	`+`
`36`	`44`	`namespaceboost {`
`37`	`45`	`namespacenetwork {`
`38`	`46`	`namespacehttp {`
`@@ -154,12 +162,12 @@ struct http_async_connection`
`154`	`162`	`connection_delegate_ptr delegate)`
`155`	`163`	`: timeout_(timeout),`
`156`	`164`	`remove_chunk_markers_(remove_chunk_markers),`
`157`		`- timer_((boost::asio::io_context &)resolver.get_executor().context()),`
	`165`	`+ timer_(GET_IO_SERVICE(resolver)),`
`158`	`166`	`is_timedout_(false),`
`159`	`167`	`follow_redirect_(follow_redirect),`
`160`	`168`	`resolver_(resolver),`
`161`	`169`	`resolve_(std::move(resolve)),`
`162`		`- request_strand_((boost::asio::io_context &)resolver.get_executor().context()),`
	`170`	`+ request_strand_(GET_IO_SERVICE(resolver)),`
`163`	`171`	`delegate_(std::move(delegate)) {}`
`164`	`172`
`165`	`173`	`// This is the main entry point for the connection/request pipeline.`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,12 @@ struct connection_delegate_factory {`
`34`	`34`	`// This is the factory method that actually returns the delegate instance.`
`35`	`35`	`// TODO(dberris): Support passing in proxy settings when crafting connections.`
`36`	`36`	`static connection_delegate_ptrnew_connection_delegate(`
`37`		`- boost::asio::io_context& service,bool https,bool always_verify_peer,`
	`37`	`+#if BOOST_VERSION >= 107000`
	`38`	`+ boost::asio::io_context& service,`
	`39`	`+#else`
	`40`	`+ boost::asio::io_service& service,`
	`41`	`+#endif`
	`42`	`+bool https,bool always_verify_peer,`
`38`	`43`	`optional<string_type> certificate_filename,`
`39`	`44`	`optional<string_type> verify_path, optional<string_type> certificate_file,`
`40`	`45`	`optional<string_type> private_key_file, optional<string_type> ciphers,`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@`
`17`	`17`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`18`	`18`	`#include<boost/network/traits/string.hpp>`
`19`	`19`
	`20`	`+#ifndef GET_IO_SERVICE`
	`21`	`+#if BOOST_VERSION >= 107000`
	`22`	`+#defineGET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())`
	`23`	`+#else`
	`24`	`+#defineGET_IO_SERVICE(s) ((s).get_io_service())`
	`25`	`+#endif`
	`26`	`+#endif`
	`27`	`+`
`20`	`28`	`namespaceboost {`
`21`	`29`	`namespacenetwork {`
`22`	`30`	`namespacehttp {`
`@@ -49,10 +57,10 @@ struct http_sync_connection`
`49`	`57`	`int timeout)`
`50`	`58`	`: connection_base(),`
`51`	`59`	`timeout_(timeout),`
`52`		`- timer_((boost::asio::io_context &)resolver.get_executor().context()),`
	`60`	`+ timer_(GET_IO_SERVICE(resolver)),`
`53`	`61`	`resolver_(resolver),`
`54`	`62`	`resolve_(std::move(resolve)),`
`55`		`- socket_((boost::asio::io_context &)resolver.get_executor().context()) {}`
	`63`	`+ socket_(GET_IO_SERVICE(resolver)) {}`
`56`	`64`
`57`	`65`	`voidinit_socket(string_typeconst& hostname, string_typeconst& port) {`
`58`	`66`	`connection_base::init_socket(socket_, resolver_, hostname, port, resolve_);`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@`
`17`	`17`	`#include<boost/network/protocol/http/request.hpp>`
`18`	`18`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`19`	`19`
	`20`	`+#ifndef GET_IO_SERVICE`
	`21`	`+#if BOOST_VERSION >= 107000`
	`22`	`+#defineGET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())`
	`23`	`+#else`
	`24`	`+#defineGET_IO_SERVICE(s) ((s).get_io_service())`
	`25`	`+#endif`
	`26`	`+#endif`
	`27`	`+`
`20`	`28`	`namespaceboost {`
`21`	`29`	`namespacenetwork {`
`22`	`30`	`namespacehttp {`
`@@ -60,11 +68,11 @@ struct https_sync_connection`
`60`	`68`	`long ssl_options =0)`
`61`	`69`	`: connection_base(),`
`62`	`70`	`timeout_(timeout),`
`63`		`- timer_((boost::asio::io_context &)resolver.get_executor().context()),`
	`71`	`+ timer_(GET_IO_SERVICE(resolver)),`
`64`	`72`	`resolver_(resolver),`
`65`	`73`	`resolve_(std::move(resolve)),`
`66`		`- context_((boost::asio::io_context &)resolver.get_executor().context(), boost::asio::ssl::context::sslv23_client),`
`67`		`- socket_((boost::asio::io_context &)resolver.get_executor().context(), context_) {`
	`74`	`+ context_(GET_IO_SERVICE(resolver), boost::asio::ssl::context::sslv23_client),`
	`75`	`+ socket_(GET_IO_SERVICE(resolver), context_) {`
`68`	`76`	`if (ciphers) {`
`69`	`77`	`::SSL_CTX_set_cipher_list(context_.native_handle(), ciphers->c_str());`
`70`	`78`	`}`

Comments

(0)