Commit9aaa546

committed

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

1 parent5351fc6 commit9aaa546Copy full SHA for 9aaa546

File tree

+29

-40

lines changed

+29

-40

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,17 @@`
	`1`	`+#ifndef BOOST_NETWORK_COMPAT_HPP__`
	`2`	`+#defineBOOST_NETWORK_COMPAT_HPP__`
	`3`	`+`
	`4`	`+// Copyright 2010 (C) Dean Michael Berris`
	`5`	`+// Distributed under the Boost Software License, Version 1.0.`
	`6`	`+// (See accompanying file LICENSE_1_0.txt or copy at`
	`7`	`+// http://www.boost.org/LICENSE_1_0.txt)`
	`8`	`+`
	`9`	`+// This macro is used to solve a compatibility problem with Boost >= 1.70`
	`10`	`+// where the deprecated method get_io_service() was removed`
	`11`	`+#if BOOST_VERSION >= 107000`
	`12`	`+#defineCPP_NETLIB_ASIO_GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())`
	`13`	`+#else`
	`14`	`+#defineCPP_NETLIB_ASIO_GET_IO_SERVICE(s) ((s).get_io_service())`
	`15`	`+#endif`
	`16`	`+`
	`17`	`+#endif// BOOST_NETWORK_COMPAT_HPP__`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,7 @@`
`16`	`16`	`#include<boost/network/protocol/http/client/connection/async_normal.hpp>`
`17`	`17`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`18`	`18`	`#include<boost/network/traits/string.hpp>`
`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`
	`19`	`+#include<boost/network/compat.hpp>`
`27`	`20`
`28`	`21`	`namespaceboost {`
`29`	`22`	`namespacenetwork {`
`@@ -67,7 +60,7 @@ struct async_connection_base {`
`67`	`60`	`async_connection;`
`68`	`61`	`typedeftypename delegate_factory<Tag>::type delegate_factory_type;`
`69`	`62`	`auto delegate =delegate_factory_type::new_connection_delegate(`
`70`		`-GET_IO_SERVICE(resolver), https, always_verify_peer,`
	`63`	`+CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver), https, always_verify_peer,`
`71`	`64`	`certificate_filename, verify_path, certificate_file, private_key_file,`
`72`	`65`	`ciphers, sni_hostname, ssl_options);`
`73`	`66`	`auto temp = std::make_shared<async_connection>(`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,7 @@`
`32`	`32`	`#include<boost/range/algorithm/transform.hpp>`
`33`	`33`	`#include<boost/range/iterator_range.hpp>`
`34`	`34`	`#include<boost/throw_exception.hpp>`
`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`
	`35`	`+#include<boost/network/compat.hpp>`
`43`	`36`
`44`	`37`	`namespaceboost {`
`45`	`38`	`namespacenetwork {`
`@@ -162,12 +155,12 @@ struct http_async_connection`
`162`	`155`	`connection_delegate_ptr delegate)`
`163`	`156`	`: timeout_(timeout),`
`164`	`157`	`remove_chunk_markers_(remove_chunk_markers),`
`165`		`- timer_(GET_IO_SERVICE(resolver)),`
	`158`	`+ timer_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver)),`
`166`	`159`	`is_timedout_(false),`
`167`	`160`	`follow_redirect_(follow_redirect),`
`168`	`161`	`resolver_(resolver),`
`169`	`162`	`resolve_(std::move(resolve)),`
`170`		`- request_strand_(GET_IO_SERVICE(resolver)),`
	`163`	`+ request_strand_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver)),`
`171`	`164`	`delegate_(std::move(delegate)) {}`
`172`	`165`
`173`	`166`	`// This is the main entry point for the connection/request pipeline.`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,7 @@`
`16`	`16`	`#include<boost/network/protocol/http/response.hpp>`
`17`	`17`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`18`	`18`	`#include<boost/network/traits/string.hpp>`
`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`
	`19`	`+#include<boost/network/compat.hpp>`
`27`	`20`
`28`	`21`	`namespaceboost {`
`29`	`22`	`namespacenetwork {`
`@@ -57,10 +50,10 @@ struct http_sync_connection`
`57`	`50`	`int timeout)`
`58`	`51`	`: connection_base(),`
`59`	`52`	`timeout_(timeout),`
`60`		`- timer_(GET_IO_SERVICE(resolver)),`
	`53`	`+ timer_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver)),`
`61`	`54`	`resolver_(resolver),`
`62`	`55`	`resolve_(std::move(resolve)),`
`63`		`- socket_(GET_IO_SERVICE(resolver)) {}`
	`56`	`+ socket_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver)) {}`
`64`	`57`
`65`	`58`	`voidinit_socket(string_typeconst& hostname, string_typeconst& port) {`
`66`	`59`	`connection_base::init_socket(socket_, resolver_, hostname, port, resolve_);`

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,7 @@`
`16`	`16`	`#include<boost/algorithm/string/predicate.hpp>`
`17`	`17`	`#include<boost/network/protocol/http/request.hpp>`
`18`	`18`	`#include<boost/network/protocol/http/traits/resolver_policy.hpp>`
`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`
	`19`	`+#include<boost/network/compat.hpp>`
`27`	`20`
`28`	`21`	`namespaceboost {`
`29`	`22`	`namespacenetwork {`
`@@ -68,11 +61,11 @@ struct https_sync_connection`
`68`	`61`	`long ssl_options =0)`
`69`	`62`	`: connection_base(),`
`70`	`63`	`timeout_(timeout),`
`71`		`- timer_(GET_IO_SERVICE(resolver)),`
	`64`	`+ timer_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver)),`
`72`	`65`	`resolver_(resolver),`
`73`	`66`	`resolve_(std::move(resolve)),`
`74`		`- context_(GET_IO_SERVICE(resolver), boost::asio::ssl::context::sslv23_client),`
`75`		`- socket_(GET_IO_SERVICE(resolver), context_) {`
	`67`	`+ context_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver), boost::asio::ssl::context::sslv23_client),`
	`68`	`+ socket_(CPP_NETLIB_ASIO_GET_IO_SERVICE(resolver), context_) {`
`76`	`69`	`if (ciphers) {`
`77`	`70`	`::SSL_CTX_set_cipher_list(context_.native_handle(), ciphers->c_str());`
`78`	`71`	`}`

Comments

(0)