Merge branch 'develop'

.travis.yml

@@ -8,32 +8,24 @@ dist: trusty
 
 language: c++
 
-addons:
-    apt:
-        packages:
-            - libboost-tools-dev
-
 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.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
@@ -65,7 +57,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 -j 3 cxxstd=$CXXSTD -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include

doc/Jamfile.v2

@@ -15,7 +15,7 @@ boostbook standalone : hash :
     <xsl:param>generate.section.toc.level=2
     <xsl:param>toc.section.depth=1
     <xsl:param>toc.max.depth=1
-    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/container_hash/hash/doc/html
+    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/container_hash/doc/html
     ;
 
 ###############################################################################

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 `<boost/container_hash/hash/*.hpp>` headers. Now a single header,
-  <[headerref boost/container_hash/hash.hpp]> is used.
+* Deprecated the `<boost/functional/hash/*.hpp>` 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]
 

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]

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]

meta/explicit-failures-markup.xml

@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 Daniel James
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+-->
 <explicit-failures-markup>
     <!-- container_hash -->
     <library name="container_hash">