From bd337129c6706f4a7a00bd81f1ba4ff51515e49a Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 4 Apr 2018 07:20:08 +0900 Subject: [PATCH 1/2] Updated the boost version to 1.66.0 on travis-ci. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 77316769..818ae330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: # valgrind - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi # boost - - if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi + - if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.zip && unzip -q boost_1_66_0.zip && cd boost_1_66_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi matrix: From 88ffd080873c9cd4042770bc1eaf6b6873c5bda3 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 4 Apr 2018 07:44:49 +0900 Subject: [PATCH 2/2] Supported boost 1.66.0 or later on the examples. --- example/boost/asio_send_recv.cpp | 11 ++++++++++- example/boost/asio_send_recv_zlib.cpp | 11 +++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/example/boost/asio_send_recv.cpp b/example/boost/asio_send_recv.cpp index 4d4a71e7..a730141d 100644 --- a/example/boost/asio_send_recv.cpp +++ b/example/boost/asio_send_recv.cpp @@ -70,13 +70,22 @@ int main() { // Client auto host = "localhost"; boost::asio::ip::tcp::resolver r(ios); + +#if BOOST_VERSION < 106600 boost::asio::ip::tcp::resolver::query q(host, boost::lexical_cast(port)); auto it = r.resolve(q); + boost::asio::ip::tcp::resolver::iterator end; +#else // BOOST_VERSION < 106600 + auto eps = r.resolve(host, boost::lexical_cast(port)); + auto it = eps.begin(); + auto end = eps.end(); +#endif // BOOST_VERSION < 106600 + boost::asio::ip::tcp::socket cs(ios); boost::asio::async_connect( cs, - it, + end, [&] (boost::system::error_code const& e, boost::asio::ip::tcp::resolver::iterator) { if (e) { diff --git a/example/boost/asio_send_recv_zlib.cpp b/example/boost/asio_send_recv_zlib.cpp index f9d3c31e..885e8807 100644 --- a/example/boost/asio_send_recv_zlib.cpp +++ b/example/boost/asio_send_recv_zlib.cpp @@ -136,13 +136,24 @@ int main() { // Client auto host = "localhost"; + boost::asio::ip::tcp::resolver r(ios); + +#if BOOST_VERSION < 106600 boost::asio::ip::tcp::resolver::query q(host, boost::lexical_cast(port)); auto it = r.resolve(q); + boost::asio::ip::tcp::resolver::iterator end; +#else // BOOST_VERSION < 106600 + auto eps = r.resolve(host, boost::lexical_cast(port)); + auto it = eps.begin(); + auto end = eps.end(); +#endif // BOOST_VERSION < 106600 + boost::asio::ip::tcp::socket cs(ios); boost::asio::async_connect( cs, it, + end, [&] (boost::system::error_code const& e, boost::asio::ip::tcp::resolver::iterator) { if (e) {