From b40b79557279ec812b7a41520018acc269e81e6c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 6 Jan 2018 13:45:56 +0000 Subject: [PATCH 1/6] Use boost 1.66.0 in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c13f8f8..a675f27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ matrix: USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" before_script: - - export BOOST_VERSION=1.65.1 - - export BOOST_FILENAME=boost_1_65_1 + - export BOOST_VERSION=1.66.0 + - export BOOST_FILENAME=boost_1_66_0 - export BOOST_ROOT=${HOME}/boost - cd ${TRAVIS_BUILD_DIR} - touch Jamroot.jam From c64e5165185373c2adc7594515f5ad9e570709a7 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 6 Jan 2018 13:45:56 +0000 Subject: [PATCH 2/6] Build boost build ourself --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a675f27..d495b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,6 @@ dist: trusty language: c++ -addons: - apt: - packages: - - libboost-tools-dev - matrix: include: - compiler: gcc @@ -65,7 +60,11 @@ before_script: tar -xjf $HOME/download/boost.tar.bz2 mv * ${BOOST_ROOT} - rm -r ${BOOST_ROOT}/boost/functional + - cd ${BOOST_ROOT}/tools/build + - mkdir ${HOME}/opt + - ./bootstrap.sh + - ./b2 install --prefix=$HOME/opt script: - cd ${TRAVIS_BUILD_DIR}/test - - bjam -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include From e80c0c84bb6fc7cf4fbad29a10af3c3b1bdcf03a Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 6 Jan 2018 13:45:56 +0000 Subject: [PATCH 3/6] Use cxxstd to set language version --- .travis.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d495b4a..b8ed768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,19 +12,16 @@ matrix: include: - compiler: gcc env: | - USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++03 ;" - - compiler: gcc - env: | - USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++11 ;" + USER_CONFIG="using gcc : : g++-4.8 -Werror ;" + CXXSTD=03,11 - compiler: clang env: | - USER_CONFIG="using clang : : clang++ -Werror --std=c++03 ;" + USER_CONFIG="using clang : : clang++ -Werror ;" + CXXSTD=03,11 - compiler: clang env: | - USER_CONFIG="using clang : : clang++ -Werror --std=c++11 ;" - - compiler: clang - env: | - USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" + USER_CONFIG="using clang : : clang++ -Werror -D_HAS_AUTO_PTR_ETC=0 ;" + CXXSTD=11 before_script: - export BOOST_VERSION=1.66.0 @@ -67,4 +64,4 @@ before_script: script: - cd ${TRAVIS_BUILD_DIR}/test - - ${HOME}/opt/bin/b2 -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include From 9d5a16c2886850abd10e75317c61ed66cf22441e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 6 Jan 2018 14:29:05 +0000 Subject: [PATCH 4/6] Run concurrent test processes in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8ed768..21f9e8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,4 +64,4 @@ before_script: script: - cd ${TRAVIS_BUILD_DIR}/test - - ${HOME}/opt/bin/b2 cxxstd=$CXXSTD -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include + - ${HOME}/opt/bin/b2 -j 3 cxxstd=$CXXSTD -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include From c3e070a244314b07ac06bf665e127bc880941cd8 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 10 Jan 2018 14:03:21 +0000 Subject: [PATCH 5/6] Fix some paths --- doc/Jamfile.v2 | 2 +- doc/changes.qbk | 8 ++++---- doc/portability.qbk | 2 +- doc/tutorial.qbk | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 3482448..86f889a 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -15,7 +15,7 @@ boostbook standalone : hash : generate.section.toc.level=2 toc.section.depth=1 toc.max.depth=1 - pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/libs/container_hash/hash/doc/html + pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/libs/container_hash/doc/html ; ############################################################################### diff --git a/doc/changes.qbk b/doc/changes.qbk index 6cf74a8..2625e0c 100644 --- a/doc/changes.qbk +++ b/doc/changes.qbk @@ -19,8 +19,8 @@ * Use declarations for standard classes, so that the library doesn't need to include all of their headers -* Deprecated the `` headers. Now a single header, - <[headerref boost/container_hash/hash.hpp]> is used. +* Deprecated the `` headers. Now a single header, + <[headerref boost/functional/hash.hpp]> is used. * Add support for the `BOOST_HASH_NO_EXTENSIONS` macro, which disables the extensions to TR1. @@ -72,9 +72,9 @@ * Changed the warnings in the deprecated headers from 1.34.0 to errors. These will be removed in a future version of Boost. * Moved detail headers out of `boost/container_hash/detail`, since they are part of - container_hash/hash, not container_hash. `boost/container_hash/detail/container_fwd.hpp` + functional/hash, not container_hash. `boost/container_hash/detail/container_fwd.hpp` has been moved to `boost/detail/container_fwd.hpp` as it's used outside of - this library, the others have been moved to `boost/container_hash/hash/detail`. + this library, the others have been moved to `boost/functional/hash/detail`. [h2 Boost 1.39.0] diff --git a/doc/portability.qbk b/doc/portability.qbk index 7db3e56..d667b89 100644 --- a/doc/portability.qbk +++ b/doc/portability.qbk @@ -88,6 +88,6 @@ boost namespace: } Full code for this example is at -[@boost:/libs/container_hash/hash/examples/portable.cpp /libs/container_hash/hash/examples/portable.cpp]. +[@boost:/libs/container_hash/examples/portable.cpp /libs/container_hash/examples/portable.cpp]. [endsect] diff --git a/doc/tutorial.qbk b/doc/tutorial.qbk index 2c0d1f3..f91f173 100644 --- a/doc/tutorial.qbk +++ b/doc/tutorial.qbk @@ -110,9 +110,9 @@ And you can now use [classref boost::hash] with book: assert(books.find(dandelion) == books.end()); The full example can be found in: -[@boost:/libs/container_hash/hash/examples/books.hpp /libs/container_hash/hash/examples/books.hpp] +[@boost:/libs/container_hash/examples/books.hpp /libs/container_hash/examples/books.hpp] and -[@boost:/libs/container_hash/hash/examples/books.cpp /libs/container_hash/hash/examples/books.cpp]. +[@boost:/libs/container_hash/examples/books.cpp /libs/container_hash/examples/books.cpp]. [tip When writing a hash function, first look at how the equality function works. @@ -170,7 +170,7 @@ of point, it can be repeatedly called for any number of elements. It calls [funcref boost::hash_value hash_value] on the supplied element, and combines it with the seed. Full code for this example is at -[@boost:/libs/container_hash/hash/examples/point.cpp /libs/container_hash/hash/examples/point.cpp]. +[@boost:/libs/container_hash/examples/point.cpp /libs/container_hash/examples/point.cpp]. [note When using [funcref boost::hash_combine] the order of the @@ -206,7 +206,7 @@ header which forward declares [classref boost::hash], include the main header before instantiating [classref boost::hash]. When using a container that uses [classref boost::hash] it should do that for you, so your type will work fine with the boost hash containers. There's an example of this -in [@boost:/libs/container_hash/hash/examples/template.hpp template.hpp] and -[@boost:/libs/container_hash/hash/examples/template.cpp template.cpp]. +in [@boost:/libs/container_hash/examples/template.hpp template.hpp] and +[@boost:/libs/container_hash/examples/template.cpp template.cpp]. [endsect] From f460c21dd0e2dc8662d63935be8c82668152a45c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 10 Jan 2018 15:17:33 +0000 Subject: [PATCH 6/6] Add missing copyright --- meta/explicit-failures-markup.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/explicit-failures-markup.xml b/meta/explicit-failures-markup.xml index 7f94140..bb205cc 100644 --- a/meta/explicit-failures-markup.xml +++ b/meta/explicit-failures-markup.xml @@ -1,4 +1,10 @@ +