Add benchmark/string_view.cpp

Rearrange and comment out the non-FNV-1a tests in string.cpp
Add missing multiplication by sizeof(T)
2026-08-06 05:34:09 +02:00 · 2022-03-08 02:44:30 +02:00 · 2022-03-08 02:37:13 +02:00 · 2022-03-08 02:06:21 +02:00 · 2022-03-08 01:31:59 +02:00 · 2022-03-08 01:06:04 +02:00
129 changed files with 28983 additions and 24432 deletions
@@ -0,0 +1,57 @@
+# Copyright 2017 Daniel James
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+    - /feature\/.*/
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+      ADDRMD: 32
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0,msvc-14.0
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: msvc-14.1
+      CXXSTD: 14,17
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: 14
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: 17
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: latest
+      ADDRMD: 32,64
+
+install:
+  - set BOOST_BRANCH=develop
+  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
+  - cd ..
+  - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/boostdep
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\unordered\
+  - python tools/boostdep/depinst/depinst.py unordered
+  - cmd /c bootstrap
+  - b2 -d0 headers
+
+build: off
+
+test_script:
+  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
+  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+  - b2 -j3 libs/unordered/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release embed-manifest-via=linker
@@ -0,0 +1,7 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+
+[*.?pp]
+indent_size = 2
@@ -0,0 +1,212 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - feature/**
+
+env:
+  UBSAN_OPTIONS: print_stacktrace=1
+
+jobs:
+  posix:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolset: gcc-4.8
+            cxxstd: "03,11"
+            os: ubuntu-18.04
+            install: g++-4.8
+          - toolset: gcc-5
+            cxxstd: "03,11,14,1z"
+            os: ubuntu-18.04
+            install: g++-5
+          - toolset: gcc-6
+            cxxstd: "03,11,14,1z"
+            os: ubuntu-18.04
+            install: g++-6
+          - toolset: gcc-7
+            cxxstd: "03,11,14,17"
+            os: ubuntu-18.04
+          - toolset: gcc-8
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
+            install: g++-8
+          - toolset: gcc-9
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-18.04
+          - toolset: gcc-9
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+          - toolset: gcc-10
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+          - toolset: gcc-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+            install: g++-11
+            sanitizers: true
+          - toolset: clang
+            compiler: clang++-3.9
+            cxxstd: "03,11,14"
+            os: ubuntu-18.04
+            install: clang-3.9
+          - toolset: clang
+            compiler: clang++-4.0
+            cxxstd: "03,11,14"
+            os: ubuntu-18.04
+            install: clang-4.0
+          - toolset: clang
+            compiler: clang++-5.0
+            cxxstd: "03,11,14,1z"
+            os: ubuntu-18.04
+            install: clang-5.0
+          - toolset: clang
+            compiler: clang++-6.0
+            cxxstd: "03,11,14,17"
+            os: ubuntu-18.04
+            install: clang-6.0
+          - toolset: clang
+            compiler: clang++-7
+            cxxstd: "03,11,14,17"
+            os: ubuntu-18.04
+            install: clang-7
+          - toolset: clang
+            compiler: clang++-8
+            cxxstd: "03,11,14,17"
+            os: ubuntu-20.04
+            install: clang-8
+          - toolset: clang
+            compiler: clang++-9
+            cxxstd: "03,11,14,17"
+            os: ubuntu-20.04
+            install: clang-9
+          - toolset: clang
+            compiler: clang++-10
+            cxxstd: "03,11,14,17"
+            os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
+            sanitizers: true
+          - toolset: clang
+            cxxstd: "03,11,14,17"
+            os: macos-10.15
+            sanitizers: true
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          ./bootstrap.sh
+          ./b2 -d0 headers
+
+      - name: Create user-config.jam
+        if: matrix.compiler
+        run: |
+          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
+
+      - name: Run tests
+        run: |
+          cd ../boost-root
+          ./b2 -j3 libs/$LIBRARY/test \
+                   toolset=${{matrix.toolset}} \
+                   cxxstd=${{matrix.cxxstd}} \
+                   variant=debug,release \
+                   ${{(matrix.sanitizers && 'address-sanitizer=norecover undefined-sanitizer=norecover') || ''}}
+
+  windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolset: msvc-14.0
+            cxxstd: 14,latest
+            addrmd: 32,64
+            os: windows-2019
+          - toolset: msvc-14.1
+            cxxstd: "14,17,latest"
+            addrmd: 32,64
+            os: windows-2016
+          - toolset: msvc-14.2
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2019
+          - toolset: msvc-14.3
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2022
+          - toolset: clang-win
+            cxxstd: "14,17,latest"
+            addrmd: 32,64
+            os: windows-2022
+          - toolset: gcc
+            cxxstd: "03,11,14,17,2a"
+            addrmd: 64
+            os: windows-2019
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          cmd /c bootstrap
+          b2 -d0 headers
+
+      - name: Run tests
+        shell: cmd
+        run: |
+          cd ../boost-root
+          b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release embed-manifest-via=linker
@@ -11,56 +11,77 @@ language: c++
 addons:
    apt:
        packages:
-            - libboost-tools-dev
            - libxml2-utils
            - g++-multilib

 matrix:
    include:
      - compiler: gcc
-        env: BJAM_TOOLSET=gcc
+        env: |
+            label="gcc C++03/11";
+            user_config="using gcc : : g++-4.8 --coverage -fsanitize=address ;"
+            enable_coverage=1
+            CXXSTD=03,11
      - compiler: gcc
-        env: BJAM_TOOLSET=gcc-std11
-      #- compiler: gcc
-      #  env: BJAM_TOOLSET=gcc-m32
-      - compiler: gcc
-        env: BJAM_TOOLSET=gcc-std11m32
-      #- compiler: clang
-      #  env: BJAM_TOOLSET=clang
+        env: |
+            label="gcc 32 bit C++11";
+            user_config="using gcc : : g++-4.8 -m32 -fsanitize=address ;"
+            CXXSTD=11
      - compiler: clang
-        env: BJAM_TOOLSET=clang-std11
+        env: |
+            label="clang C++11/17";
+            user_config="using clang : : clang++ -fsanitize=address ;"
+            CXXSTD=11,17
+        # sanitized=address not available for 32-bit clang on travis.
      - compiler: clang
-        env: BJAM_TOOLSET=clang-m32
-      #- compiler: clang
-      #  env: BJAM_TOOLSET=clang-std11m32
-      - compiler: gcc
-        env: BJAM_TOOLSET=gcc-interopable
-      - compiler: clang
-        env: BJAM_TOOLSET=clang-interopable
+        env: |
+            label="clang 32 bit";
+            user_config="using clang : : clang++ -m32 ;"
+            CXXSTD=03
+
+before_install:
+    - if [ -n $enable_coverage ]; then pip install --user cpp-coveralls; fi

 before_script:
+    - export BOOST_VERSION=1.67.0
+    - export BOOST_FILENAME=boost_1_67_0
+    - export BOOST_ROOT=${HOME}/boost
    - cd ${TRAVIS_BUILD_DIR}
    - touch Jamroot.jam
    - cd $HOME
-    - |
-        echo "using gcc : : g++-4.8 -Werror --std=c++03 -fsanitize=address ;" > ~/user-config.jam
-        echo "using gcc : std11 : g++-4.8 -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
-        echo "using gcc : m32 : g++-4.8 -m32 -Werror -fsanitize=address ;" >> ~/user-config.jam
-        echo "using gcc : std11m32 : g++-4.8 -m32 -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
-        echo "using clang : : clang++ -Werror --std=c++03 -fsanitize=address ;" >> ~/user-config.jam
-        echo "using clang : std11 : clang++ -Werror --std=c++11 -fsanitize=address ;" >> ~/user-config.jam
-        # sanitized=address not available for 32-bit clang on travis.
-        echo "using clang : m32 : clang++ -m32 -Werror --std=c++03 ;" >> ~/user-config.jam
-        echo "using clang : std11m32 : clang++ -m32 -Werror --std=c++11 ;" >> ~/user-config.jam
-        echo "using gcc : interopable : g++-4.8 -Werror --std=c++03 -fsanitize=address -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;" >> ~/user-config.jam
-        echo "using clang : interopable : clang++ -Werror --std=c++11 -fsanitize=address -DBOOST_UNORDERED_INTEROPERABLE_NODES=1 ;" >> ~/user-config.jam
+    - echo $user_config > ~/user-config.jam
    - cat ~/user-config.jam
-    - wget -O boost.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.bz2
-    - tar -xjf boost.tar.bz2
-    - mv boost_1_63_0 boost
-    - rm -r boost/boost/unordered
+    - |
+        # Pick snapshot to use
+        if [ "$TRAVIS_EVENT_TYPE" == "cron" ]
+        then
+            if [ "$TRAVIS_BRANCH" == "master" ]
+            then
+                snapshot=master
+            else
+                snapshot=develop
+            fi
+        else
+            #snapshot=stable
+            snapshot=master
+        fi
+
+        # Download and extract snapshot
+        echo "Downloading ${download_url}"
+        mkdir $HOME/download
+        cd $HOME/download
+        python ${TRAVIS_BUILD_DIR}/ci/download-boost-snapshot.py $snapshot
+        mv * ${BOOST_ROOT}
+    - rm -r ${BOOST_ROOT}/boost/unordered
+    - cd ${BOOST_ROOT}/tools/build
+    - mkdir ${HOME}/opt
+    - bash bootstrap.sh
+    - ./b2 install --prefix=$HOME/opt
+
+after_success:
+    if [ -n $enable_coverage ]; then coveralls -r ${TRAVIS_BUILD_DIR} -b ${TRAVIS_BUILD_DIR}/test --gcov-options '\-lp' --include include/boost/unordered/ ; fi

 script:
    - cd ${TRAVIS_BUILD_DIR}/test
-    - bjam ${BJAM_TOOLSET} include=${HOME}/boost include=${TRAVIS_BUILD_DIR}/include
+    - ${HOME}/opt/bin/b2 -j 3 cxxstd=$CXXSTD -q include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include
    - xmllint --noout ${TRAVIS_BUILD_DIR}/doc/ref.xml
@@ -0,0 +1,37 @@
+# Generated by `boostdep --cmake unordered`
+# Copyright 2020 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(boost_unordered VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+
+add_library(boost_unordered INTERFACE)
+add_library(Boost::unordered ALIAS boost_unordered)
+
+target_include_directories(boost_unordered INTERFACE include)
+
+target_link_libraries(boost_unordered
+  INTERFACE
+    Boost::assert
+    Boost::config
+    Boost::container
+    Boost::container_hash
+    Boost::core
+    Boost::detail
+    Boost::move
+    Boost::predef
+    Boost::preprocessor
+    Boost::smart_ptr
+    Boost::throw_exception
+    Boost::tuple
+    Boost::type_traits
+)
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()
+
@@ -3,16 +3,17 @@
 # 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)

-# Using clang format 3.8
-# http://llvm.org/releases/3.8.0/tools/clang/docs/ClangFormatStyleOptions.html
+# Using clang format 4.0
+# http://llvm.org/releases/4.0.0/tools/clang/docs/ClangFormatStyleOptions.html

 # Becuase you have to start somewhere.
 BasedOnStyle: LLVM

 # Basic settings
 ColumnLimit: 80
-ContinuationIndentWidth: 4
-IndentWidth: 4
+NamespaceIndentation: All
+ContinuationIndentWidth: 2
+IndentWidth: 2
 UseTab: Never
 Language: Cpp
 Standard: Cpp03
@@ -34,4 +35,4 @@ BraceWrapping:
 PointerAlignment: Left

 # Boost specific stuff
-ForEachMacros: [ BOOST_FOREACH ]
+ForEachMacros: [ BOOST_FOREACH, UNORDERED_AUTO_TEST ]
@@ -0,0 +1,411 @@
+// Copyright 2021 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
+
+#include <boost/unordered_map.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/core/detail/splitmix64.hpp>
+#include <boost/config.hpp>
+#ifdef HAVE_ABSEIL
+# include "absl/container/node_hash_map.h"
+# include "absl/container/flat_hash_map.h"
+#endif
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <iomanip>
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+static void print_time( std::chrono::steady_clock::time_point & t1, char const* label, std::uint32_t s, std::size_t size )
+{
+    auto t2 = std::chrono::steady_clock::now();
+
+    std::cout << label << ": " << ( t2 - t1 ) / 1ms << " ms (s=" << s << ", size=" << size << ")\n";
+
+    t1 = t2;
+}
+
+constexpr unsigned N = 2'000'000;
+constexpr int K = 10;
+
+static std::vector<std::string> indices1, indices2;
+
+static std::string make_index( unsigned x )
+{
+    char buffer[ 64 ];
+    std::snprintf( buffer, sizeof(buffer), "pfx_%u_sfx", x );
+
+    return buffer;
+}
+
+static std::string make_random_index( unsigned x )
+{
+    char buffer[ 64 ];
+    std::snprintf( buffer, sizeof(buffer), "pfx_%0*d_%u_sfx", x % 8 + 1, 0, x );
+
+    return buffer;
+}
+
+static void init_indices()
+{
+    indices1.reserve( N*2+1 );
+    indices1.push_back( make_index( 0 ) );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices1.push_back( make_index( i ) );
+    }
+
+    indices2.reserve( N*2+1 );
+    indices2.push_back( make_index( 0 ) );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N*2; ++i )
+        {
+            indices2.push_back( make_random_index( static_cast<std::uint32_t>( rng() ) ) );
+        }
+    }
+}
+
+template<class Map> BOOST_NOINLINE void test_insert( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices1[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices2[ i ], i } );
+    }
+
+    print_time( t1, "Random insert",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_lookup( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    std::uint32_t s;
+    
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices1[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices2[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Random lookup",  s, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_iteration( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    auto it = map.begin();
+
+    while( it != map.end() )
+    {
+        if( it->second & 1 )
+        {
+            map.erase( it++ );
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    print_time( t1, "Iterate and erase odd elements",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_erase( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices1[ i ] );
+    }
+
+    print_time( t1, "Consecutive erase",  0, map.size() );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N; ++i )
+        {
+            map.erase( indices2[ i ] );
+        }
+    }
+
+    print_time( t1, "Random erase",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+// counting allocator
+
+static std::size_t s_alloc_bytes = 0;
+static std::size_t s_alloc_count = 0;
+
+template<class T> struct allocator
+{
+    using value_type = T;
+
+    allocator() = default;
+
+    template<class U> allocator( allocator<U> const & ) noexcept
+    {
+    }
+
+    template<class U> bool operator==( allocator<U> const & ) const noexcept
+    {
+        return true;
+    }
+
+    template<class U> bool operator!=( allocator<U> const& ) const noexcept
+    {
+        return false;
+    }
+
+    T* allocate( std::size_t n ) const
+    {
+        s_alloc_bytes += n * sizeof(T);
+        s_alloc_count++;
+
+        return std::allocator<T>().allocate( n );
+    }
+
+    void deallocate( T* p, std::size_t n ) const noexcept
+    {
+        s_alloc_bytes -= n * sizeof(T);
+        s_alloc_count--;
+
+        std::allocator<T>().deallocate( p, n );
+    }
+};
+
+//
+
+struct record
+{
+    std::string label_;
+    long long time_;
+    std::size_t bytes_;
+    std::size_t count_;
+};
+
+static std::vector<record> times;
+
+template<template<class...> class Map> BOOST_NOINLINE void test( char const* label )
+{
+    std::cout << label << ":\n\n";
+
+    s_alloc_bytes = 0;
+    s_alloc_count = 0;
+
+    Map<std::string, std::uint32_t> map;
+
+    auto t0 = std::chrono::steady_clock::now();
+    auto t1 = t0;
+
+    test_insert( map, t1 );
+
+    std::cout << "Memory: " << s_alloc_bytes << " bytes in " << s_alloc_count << " allocations\n\n";
+
+    record rec = { label, 0, s_alloc_bytes, s_alloc_count };
+
+    test_lookup( map, t1 );
+    test_iteration( map, t1 );
+    test_lookup( map, t1 );
+    test_erase( map, t1 );
+
+    auto tN = std::chrono::steady_clock::now();
+    std::cout << "Total: " << ( tN - t0 ) / 1ms << " ms\n\n";
+
+    rec.time_ = ( tN - t0 ) / 1ms;
+    times.push_back( rec );
+}
+
+// multi_index emulation of unordered_map
+
+template<class K, class V> struct pair
+{
+    K first;
+    mutable V second;
+};
+
+using namespace boost::multi_index;
+
+template<class K, class V> using multi_index_map = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first> >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+// aliases using the counting allocator
+
+template<class K, class V> using allocator_for = ::allocator< std::pair<K const, V> >;
+
+template<class K, class V> using std_unordered_map =
+    std::unordered_map<K, V, std::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map =
+    boost::unordered_map<K, V, boost::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map =
+    absl::node_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map =
+    absl::flat_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+// fnv1a_hash
+
+template<int Bits> struct fnv1a_hash_impl;
+
+template<> struct fnv1a_hash_impl<32>
+{
+    std::size_t operator()( std::string const& s ) const
+    {
+        std::size_t h = 0x811C9DC5u;
+
+        char const * first = s.data();
+        char const * last = first + s.size();
+
+        for( ; first != last; ++first )
+        {
+            h ^= static_cast<unsigned char>( *first );
+            h *= 0x01000193ul;
+        }
+
+        return h;
+    }
+};
+
+template<> struct fnv1a_hash_impl<64>
+{
+    std::size_t operator()( std::string const& s ) const
+    {
+        std::size_t h = 0xCBF29CE484222325ull;
+
+        char const * first = s.data();
+        char const * last = first + s.size();
+
+        for( ; first != last; ++first )
+        {
+            h ^= static_cast<unsigned char>( *first );
+            h *= 0x00000100000001B3ull;
+        }
+
+        return h;
+    }
+};
+
+struct fnv1a_hash: fnv1a_hash_impl< std::numeric_limits<std::size_t>::digits > {};
+
+template<class K, class V> using std_unordered_map_fnv1a =
+std::unordered_map<K, V, fnv1a_hash, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map_fnv1a =
+    boost::unordered_map<K, V, fnv1a_hash, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using multi_index_map_fnv1a = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first>, fnv1a_hash >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map_fnv1a =
+    absl::node_hash_map<K, V, fnv1a_hash, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map_fnv1a =
+    absl::flat_hash_map<K, V, fnv1a_hash, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+//
+
+int main()
+{
+    init_indices();
+
+#if 0
+
+    test<std_unordered_map>( "std::unordered_map" );
+    test<boost_unordered_map>( "boost::unordered_map" );
+    test<multi_index_map>( "multi_index_map" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map>( "absl::node_hash_map" );
+    test<absl_flat_hash_map>( "absl::flat_hash_map" );
+
+#endif
+
+#endif
+
+    test<std_unordered_map_fnv1a>( "std::unordered_map, FNV-1a" );
+    test<boost_unordered_map_fnv1a>( "boost::unordered_map, FNV-1a" );
+    test<multi_index_map_fnv1a>( "multi_index_map, FNV-1a" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map_fnv1a>( "absl::node_hash_map, FNV-1a" );
+    test<absl_flat_hash_map_fnv1a>( "absl::flat_hash_map, FNV-1a" );
+
+#endif
+
+    std::cout << "---\n\n";
+
+    for( auto const& x: times )
+    {
+        std::cout << std::setw( 30 ) << ( x.label_ + ": " ) << std::setw( 5 ) << x.time_ << " ms, " << std::setw( 9 ) << x.bytes_ << " bytes in " << x.count_ << " allocations\n";
+    }
+}
+
+#ifdef HAVE_ABSEIL
+# include "absl/container/internal/raw_hash_set.cc"
+# include "absl/hash/internal/hash.cc"
+# include "absl/hash/internal/low_level_hash.cc"
+# include "absl/hash/internal/city.cc"
+#endif
@@ -0,0 +1,412 @@
+// Copyright 2021 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
+
+#include <boost/unordered_map.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/core/detail/splitmix64.hpp>
+#include <boost/config.hpp>
+#ifdef HAVE_ABSEIL
+# include "absl/container/node_hash_map.h"
+# include "absl/container/flat_hash_map.h"
+#endif
+#include <unordered_map>
+#include <string_view>
+#include <vector>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <iomanip>
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+static void print_time( std::chrono::steady_clock::time_point & t1, char const* label, std::uint32_t s, std::size_t size )
+{
+    auto t2 = std::chrono::steady_clock::now();
+
+    std::cout << label << ": " << ( t2 - t1 ) / 1ms << " ms (s=" << s << ", size=" << size << ")\n";
+
+    t1 = t2;
+}
+
+constexpr unsigned N = 2'000'000;
+constexpr int K = 10;
+
+static std::vector<std::string> indices1, indices2;
+
+static std::string make_index( unsigned x )
+{
+    char buffer[ 64 ];
+    std::snprintf( buffer, sizeof(buffer), "pfx_%u_sfx", x );
+
+    return buffer;
+}
+
+static std::string make_random_index( unsigned x )
+{
+    char buffer[ 64 ];
+    std::snprintf( buffer, sizeof(buffer), "pfx_%0*d_%u_sfx", x % 8 + 1, 0, x );
+
+    return buffer;
+}
+
+static void init_indices()
+{
+    indices1.reserve( N*2+1 );
+    indices1.push_back( make_index( 0 ) );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices1.push_back( make_index( i ) );
+    }
+
+    indices2.reserve( N*2+1 );
+    indices2.push_back( make_index( 0 ) );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N*2; ++i )
+        {
+            indices2.push_back( make_random_index( static_cast<std::uint32_t>( rng() ) ) );
+        }
+    }
+}
+
+template<class Map> BOOST_NOINLINE void test_insert( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices1[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices2[ i ], i } );
+    }
+
+    print_time( t1, "Random insert",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_lookup( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    std::uint32_t s;
+    
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices1[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices2[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Random lookup",  s, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_iteration( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    auto it = map.begin();
+
+    while( it != map.end() )
+    {
+        if( it->second & 1 )
+        {
+            map.erase( it++ );
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    print_time( t1, "Iterate and erase odd elements",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_erase( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices1[ i ] );
+    }
+
+    print_time( t1, "Consecutive erase",  0, map.size() );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N; ++i )
+        {
+            map.erase( indices2[ i ] );
+        }
+    }
+
+    print_time( t1, "Random erase",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+// counting allocator
+
+static std::size_t s_alloc_bytes = 0;
+static std::size_t s_alloc_count = 0;
+
+template<class T> struct allocator
+{
+    using value_type = T;
+
+    allocator() = default;
+
+    template<class U> allocator( allocator<U> const & ) noexcept
+    {
+    }
+
+    template<class U> bool operator==( allocator<U> const & ) const noexcept
+    {
+        return true;
+    }
+
+    template<class U> bool operator!=( allocator<U> const& ) const noexcept
+    {
+        return false;
+    }
+
+    T* allocate( std::size_t n ) const
+    {
+        s_alloc_bytes += n * sizeof(T);
+        s_alloc_count++;
+
+        return std::allocator<T>().allocate( n );
+    }
+
+    void deallocate( T* p, std::size_t n ) const noexcept
+    {
+        s_alloc_bytes -= n * sizeof(T);
+        s_alloc_count--;
+
+        std::allocator<T>().deallocate( p, n );
+    }
+};
+
+//
+
+struct record
+{
+    std::string label_;
+    long long time_;
+    std::size_t bytes_;
+    std::size_t count_;
+};
+
+static std::vector<record> times;
+
+template<template<class...> class Map> BOOST_NOINLINE void test( char const* label )
+{
+    std::cout << label << ":\n\n";
+
+    s_alloc_bytes = 0;
+    s_alloc_count = 0;
+
+    Map<std::string_view, std::uint32_t> map;
+
+    auto t0 = std::chrono::steady_clock::now();
+    auto t1 = t0;
+
+    test_insert( map, t1 );
+
+    std::cout << "Memory: " << s_alloc_bytes << " bytes in " << s_alloc_count << " allocations\n\n";
+
+    record rec = { label, 0, s_alloc_bytes, s_alloc_count };
+
+    test_lookup( map, t1 );
+    test_iteration( map, t1 );
+    test_lookup( map, t1 );
+    test_erase( map, t1 );
+
+    auto tN = std::chrono::steady_clock::now();
+    std::cout << "Total: " << ( tN - t0 ) / 1ms << " ms\n\n";
+
+    rec.time_ = ( tN - t0 ) / 1ms;
+    times.push_back( rec );
+}
+
+// multi_index emulation of unordered_map
+
+template<class K, class V> struct pair
+{
+    K first;
+    mutable V second;
+};
+
+using namespace boost::multi_index;
+
+template<class K, class V> using multi_index_map = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first> >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+// aliases using the counting allocator
+
+template<class K, class V> using allocator_for = ::allocator< std::pair<K const, V> >;
+
+template<class K, class V> using std_unordered_map =
+    std::unordered_map<K, V, std::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map =
+    boost::unordered_map<K, V, boost::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map =
+    absl::node_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map =
+    absl::flat_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+// fnv1a_hash
+
+template<int Bits> struct fnv1a_hash_impl;
+
+template<> struct fnv1a_hash_impl<32>
+{
+    std::size_t operator()( std::string_view const& s ) const
+    {
+        std::size_t h = 0x811C9DC5u;
+
+        char const * first = s.data();
+        char const * last = first + s.size();
+
+        for( ; first != last; ++first )
+        {
+            h ^= static_cast<unsigned char>( *first );
+            h *= 0x01000193ul;
+        }
+
+        return h;
+    }
+};
+
+template<> struct fnv1a_hash_impl<64>
+{
+    std::size_t operator()( std::string_view const& s ) const
+    {
+        std::size_t h = 0xCBF29CE484222325ull;
+
+        char const * first = s.data();
+        char const * last = first + s.size();
+
+        for( ; first != last; ++first )
+        {
+            h ^= static_cast<unsigned char>( *first );
+            h *= 0x00000100000001B3ull;
+        }
+
+        return h;
+    }
+};
+
+struct fnv1a_hash: fnv1a_hash_impl< std::numeric_limits<std::size_t>::digits > {};
+
+template<class K, class V> using std_unordered_map_fnv1a =
+std::unordered_map<K, V, fnv1a_hash, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map_fnv1a =
+    boost::unordered_map<K, V, fnv1a_hash, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using multi_index_map_fnv1a = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first>, fnv1a_hash >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map_fnv1a =
+    absl::node_hash_map<K, V, fnv1a_hash, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map_fnv1a =
+    absl::flat_hash_map<K, V, fnv1a_hash, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+//
+
+int main()
+{
+    init_indices();
+
+#if 0
+
+    test<std_unordered_map>( "std::unordered_map" );
+    test<boost_unordered_map>( "boost::unordered_map" );
+    test<multi_index_map>( "multi_index_map" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map>( "absl::node_hash_map" );
+    test<absl_flat_hash_map>( "absl::flat_hash_map" );
+
+#endif
+
+#endif
+
+    test<std_unordered_map_fnv1a>( "std::unordered_map, FNV-1a" );
+    test<boost_unordered_map_fnv1a>( "boost::unordered_map, FNV-1a" );
+    test<multi_index_map_fnv1a>( "multi_index_map, FNV-1a" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map_fnv1a>( "absl::node_hash_map, FNV-1a" );
+    test<absl_flat_hash_map_fnv1a>( "absl::flat_hash_map, FNV-1a" );
+
+#endif
+
+    std::cout << "---\n\n";
+
+    for( auto const& x: times )
+    {
+        std::cout << std::setw( 30 ) << ( x.label_ + ": " ) << std::setw( 5 ) << x.time_ << " ms, " << std::setw( 9 ) << x.bytes_ << " bytes in " << x.count_ << " allocations\n";
+    }
+}
+
+#ifdef HAVE_ABSEIL
+# include "absl/container/internal/raw_hash_set.cc"
+# include "absl/hash/internal/hash.cc"
+# include "absl/hash/internal/low_level_hash.cc"
+# include "absl/hash/internal/city.cc"
+#endif
@@ -0,0 +1,342 @@
+// Copyright 2021 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
+
+#include <boost/unordered_map.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/core/detail/splitmix64.hpp>
+#include <boost/config.hpp>
+#ifdef HAVE_ABSEIL
+# include "absl/container/node_hash_map.h"
+# include "absl/container/flat_hash_map.h"
+#endif
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <iomanip>
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+static void print_time( std::chrono::steady_clock::time_point & t1, char const* label, std::uint32_t s, std::size_t size )
+{
+    auto t2 = std::chrono::steady_clock::now();
+
+    std::cout << label << ": " << ( t2 - t1 ) / 1ms << " ms (s=" << s << ", size=" << size << ")\n";
+
+    t1 = t2;
+}
+
+constexpr unsigned N = 2'000'000;
+constexpr int K = 10;
+
+static std::vector< std::uint32_t > indices1, indices2, indices3;
+
+static void init_indices()
+{
+    indices1.push_back( 0 );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices1.push_back( i );
+    }
+
+    indices2.push_back( 0 );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N*2; ++i )
+        {
+            indices2.push_back( static_cast<std::uint32_t>( rng() ) );
+        }
+    }
+
+    indices3.push_back( 0 );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices3.push_back( (std::uint32_t)i << 11 );
+    }
+}
+
+template<class Map> BOOST_NOINLINE void test_insert( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices1[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices2[ i ], i } );
+    }
+
+    print_time( t1, "Random insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices3[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive shifted insert",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_lookup( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    std::uint32_t s;
+    
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices1[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices2[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Random lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices3[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive shifted lookup",  s, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_iteration( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    auto it = map.begin();
+
+    while( it != map.end() )
+    {
+        if( it->second & 1 )
+        {
+            map.erase( it++ );
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    print_time( t1, "Iterate and erase odd elements",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_erase( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices1[ i ] );
+    }
+
+    print_time( t1, "Consecutive erase",  0, map.size() );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N; ++i )
+        {
+            map.erase( indices2[ i ] );
+        }
+    }
+
+    print_time( t1, "Random erase",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices3[ i ] );
+    }
+
+    print_time( t1, "Consecutive shifted erase",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+// counting allocator
+
+static std::size_t s_alloc_bytes = 0;
+static std::size_t s_alloc_count = 0;
+
+template<class T> struct allocator
+{
+    using value_type = T;
+
+    allocator() = default;
+
+    template<class U> allocator( allocator<U> const & ) noexcept
+    {
+    }
+
+    template<class U> bool operator==( allocator<U> const & ) const noexcept
+    {
+        return true;
+    }
+
+    template<class U> bool operator!=( allocator<U> const& ) const noexcept
+    {
+        return false;
+    }
+
+    T* allocate( std::size_t n ) const
+    {
+        s_alloc_bytes += n * sizeof(T);
+        s_alloc_count++;
+
+        return std::allocator<T>().allocate( n );
+    }
+
+    void deallocate( T* p, std::size_t n ) const noexcept
+    {
+        s_alloc_bytes -= n * sizeof(T);
+        s_alloc_count--;
+
+        std::allocator<T>().deallocate( p, n );
+    }
+};
+
+//
+
+struct record
+{
+    std::string label_;
+    long long time_;
+    std::size_t bytes_;
+    std::size_t count_;
+};
+
+static std::vector<record> times;
+
+template<template<class...> class Map> BOOST_NOINLINE void test( char const* label )
+{
+    std::cout << label << ":\n\n";
+
+    s_alloc_bytes = 0;
+    s_alloc_count = 0;
+
+    Map<std::uint32_t, std::uint32_t> map;
+
+    auto t0 = std::chrono::steady_clock::now();
+    auto t1 = t0;
+
+    test_insert( map, t1 );
+
+    std::cout << "Memory: " << s_alloc_bytes << " bytes in " << s_alloc_count << " allocations\n\n";
+
+    record rec = { label, 0, s_alloc_bytes, s_alloc_count };
+
+    test_lookup( map, t1 );
+    test_iteration( map, t1 );
+    test_lookup( map, t1 );
+    test_erase( map, t1 );
+
+    auto tN = std::chrono::steady_clock::now();
+    std::cout << "Total: " << ( tN - t0 ) / 1ms << " ms\n\n";
+
+    rec.time_ = ( tN - t0 ) / 1ms;
+    times.push_back( rec );
+}
+
+// multi_index emulation of unordered_map
+
+template<class K, class V> struct pair
+{
+    K first;
+    mutable V second;
+};
+
+using namespace boost::multi_index;
+
+template<class K, class V> using multi_index_map = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first> >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+// aliases using the counting allocator
+
+template<class K, class V> using allocator_for = ::allocator< std::pair<K const, V> >;
+
+template<class K, class V> using std_unordered_map =
+    std::unordered_map<K, V, std::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map =
+    boost::unordered_map<K, V, boost::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map =
+    absl::node_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map =
+    absl::flat_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+int main()
+{
+    init_indices();
+
+    test<std_unordered_map>( "std::unordered_map" );
+    test<boost_unordered_map>( "boost::unordered_map" );
+    test<multi_index_map>( "multi_index_map" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map>( "absl::node_hash_map" );
+    test<absl_flat_hash_map>( "absl::flat_hash_map" );
+
+#endif
+
+    std::cout << "---\n\n";
+
+    for( auto const& x: times )
+    {
+        std::cout << std::setw( 25 ) << ( x.label_ + ": " ) << std::setw( 5 ) << x.time_ << " ms, " << std::setw( 9 ) << x.bytes_ << " bytes in " << x.count_ << " allocations\n";
+    }
+}
+
+#ifdef HAVE_ABSEIL
+# include "absl/container/internal/raw_hash_set.cc"
+# include "absl/hash/internal/hash.cc"
+# include "absl/hash/internal/low_level_hash.cc"
+# include "absl/hash/internal/city.cc"
+#endif
@@ -0,0 +1,342 @@
+// Copyright 2021 Peter Dimov.
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
+
+#include <boost/unordered_map.hpp>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/core/detail/splitmix64.hpp>
+#include <boost/config.hpp>
+#ifdef HAVE_ABSEIL
+# include "absl/container/node_hash_map.h"
+# include "absl/container/flat_hash_map.h"
+#endif
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <iomanip>
+#include <chrono>
+
+using namespace std::chrono_literals;
+
+static void print_time( std::chrono::steady_clock::time_point & t1, char const* label, std::uint64_t s, std::size_t size )
+{
+    auto t2 = std::chrono::steady_clock::now();
+
+    std::cout << label << ": " << ( t2 - t1 ) / 1ms << " ms (s=" << s << ", size=" << size << ")\n";
+
+    t1 = t2;
+}
+
+constexpr unsigned N = 2'000'000;
+constexpr int K = 10;
+
+static std::vector< std::uint64_t > indices1, indices2, indices3;
+
+static void init_indices()
+{
+    indices1.push_back( 0 );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices1.push_back( i );
+    }
+
+    indices2.push_back( 0 );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N*2; ++i )
+        {
+            indices2.push_back( rng() );
+        }
+    }
+
+    indices3.push_back( 0 );
+
+    for( unsigned i = 1; i <= N*2; ++i )
+    {
+        indices3.push_back( (std::uint64_t)i << 40 );
+    }
+}
+
+template<class Map> BOOST_NOINLINE void test_insert( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices1[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices2[ i ], i } );
+    }
+
+    print_time( t1, "Random insert",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.insert( { indices3[ i ], i } );
+    }
+
+    print_time( t1, "Consecutive shifted insert",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_lookup( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    std::uint64_t s;
+    
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices1[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices2[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Random lookup",  s, map.size() );
+
+    s = 0;
+
+    for( int j = 0; j < K; ++j )
+    {
+        for( unsigned i = 1; i <= N * 2; ++i )
+        {
+            auto it = map.find( indices3[ i ] );
+            if( it != map.end() ) s += it->second;
+        }
+    }
+
+    print_time( t1, "Consecutive shifted lookup",  s, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_iteration( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    auto it = map.begin();
+
+    while( it != map.end() )
+    {
+        if( it->second & 1 )
+        {
+            map.erase( it++ );
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    print_time( t1, "Iterate and erase odd elements",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+template<class Map> BOOST_NOINLINE void test_erase( Map& map, std::chrono::steady_clock::time_point & t1 )
+{
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices1[ i ] );
+    }
+
+    print_time( t1, "Consecutive erase",  0, map.size() );
+
+    {
+        boost::detail::splitmix64 rng;
+
+        for( unsigned i = 1; i <= N; ++i )
+        {
+            map.erase( indices2[ i ] );
+        }
+    }
+
+    print_time( t1, "Random erase",  0, map.size() );
+
+    for( unsigned i = 1; i <= N; ++i )
+    {
+        map.erase( indices3[ i ] );
+    }
+
+    print_time( t1, "Consecutive shifted erase",  0, map.size() );
+
+    std::cout << std::endl;
+}
+
+// counting allocator
+
+static std::size_t s_alloc_bytes = 0;
+static std::size_t s_alloc_count = 0;
+
+template<class T> struct allocator
+{
+    using value_type = T;
+
+    allocator() = default;
+
+    template<class U> allocator( allocator<U> const & ) noexcept
+    {
+    }
+
+    template<class U> bool operator==( allocator<U> const & ) const noexcept
+    {
+        return true;
+    }
+
+    template<class U> bool operator!=( allocator<U> const& ) const noexcept
+    {
+        return false;
+    }
+
+    T* allocate( std::size_t n ) const
+    {
+        s_alloc_bytes += n * sizeof(T);
+        s_alloc_count++;
+
+        return std::allocator<T>().allocate( n );
+    }
+
+    void deallocate( T* p, std::size_t n ) const noexcept
+    {
+        s_alloc_bytes -= n * sizeof(T);
+        s_alloc_count--;
+
+        std::allocator<T>().deallocate( p, n );
+    }
+};
+
+//
+
+struct record
+{
+    std::string label_;
+    long long time_;
+    std::size_t bytes_;
+    std::size_t count_;
+};
+
+static std::vector<record> times;
+
+template<template<class...> class Map> BOOST_NOINLINE void test( char const* label )
+{
+    std::cout << label << ":\n\n";
+
+    s_alloc_bytes = 0;
+    s_alloc_count = 0;
+
+    Map<std::uint64_t, std::uint64_t> map;
+
+    auto t0 = std::chrono::steady_clock::now();
+    auto t1 = t0;
+
+    test_insert( map, t1 );
+
+    std::cout << "Memory: " << s_alloc_bytes << " bytes in " << s_alloc_count << " allocations\n\n";
+
+    record rec = { label, 0, s_alloc_bytes, s_alloc_count };
+
+    test_lookup( map, t1 );
+    test_iteration( map, t1 );
+    test_lookup( map, t1 );
+    test_erase( map, t1 );
+
+    auto tN = std::chrono::steady_clock::now();
+    std::cout << "Total: " << ( tN - t0 ) / 1ms << " ms\n\n";
+
+    rec.time_ = ( tN - t0 ) / 1ms;
+    times.push_back( rec );
+}
+
+// multi_index emulation of unordered_map
+
+template<class K, class V> struct pair
+{
+    K first;
+    mutable V second;
+};
+
+using namespace boost::multi_index;
+
+template<class K, class V> using multi_index_map = multi_index_container<
+  pair<K, V>,
+  indexed_by<
+    hashed_unique< member<pair<K, V>, K, &pair<K, V>::first> >
+  >,
+  ::allocator< pair<K, V> >
+>;
+
+// aliases using the counting allocator
+
+template<class K, class V> using allocator_for = ::allocator< std::pair<K const, V> >;
+
+template<class K, class V> using std_unordered_map =
+    std::unordered_map<K, V, std::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+template<class K, class V> using boost_unordered_map =
+    boost::unordered_map<K, V, boost::hash<K>, std::equal_to<K>, allocator_for<K, V>>;
+
+#ifdef HAVE_ABSEIL
+
+template<class K, class V> using absl_node_hash_map =
+    absl::node_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+template<class K, class V> using absl_flat_hash_map =
+    absl::flat_hash_map<K, V, absl::container_internal::hash_default_hash<K>, absl::container_internal::hash_default_eq<K>, allocator_for<K, V>>;
+
+#endif
+
+int main()
+{
+    init_indices();
+
+    test<std_unordered_map>( "std::unordered_map" );
+    test<boost_unordered_map>( "boost::unordered_map" );
+    test<multi_index_map>( "multi_index_map" );
+
+#ifdef HAVE_ABSEIL
+
+    test<absl_node_hash_map>( "absl::node_hash_map" );
+    test<absl_flat_hash_map>( "absl::flat_hash_map" );
+
+#endif
+
+    std::cout << "---\n\n";
+
+    for( auto const& x: times )
+    {
+        std::cout << std::setw( 25 ) << ( x.label_ + ": " ) << std::setw( 5 ) << x.time_ << " ms, " << std::setw( 9 ) << x.bytes_ << " bytes in " << x.count_ << " allocations\n";
+    }
+}
+
+#ifdef HAVE_ABSEIL
+# include "absl/container/internal/raw_hash_set.cc"
+# include "absl/hash/internal/hash.cc"
+# include "absl/hash/internal/low_level_hash.cc"
+# include "absl/hash/internal/city.cc"
+#endif
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+
+import urllib, os, os.path, sys, json, tarfile, zipfile, tempfile
+
+def download(snapshot):
+    if snapshot == 'stable':
+        # TODO: Default version/filename if not available?
+        downloads = [
+            "https://sourceforge.net/projects/boost/files/boost/%s/%s.tar.bz2/download" %
+                (os.environ['BOOST_VERSION'], os.environ['BOOST_FILENAME'])]
+    else:
+        json_response = urllib.urlopen('https://api.bintray.com/packages/boostorg/%s/snapshot/files' % (snapshot))
+        x = json.load(json_response)
+
+        extension_priorities = { '.bz2': 2, '.gz': 1, '.zip': 0 }
+        file_list = []
+        version_dates = {}
+        for file in x:
+            file_extension = os.path.splitext(file['path'])[1]
+            if (file_extension in extension_priorities):
+                file['priority'] = extension_priorities[file_extension]
+                file_list.append(file)
+                if not file['version'] in version_dates or file['created'] < version_dates[file['version']]:
+                    version_dates[file['version']] = file['created']
+        file_list.sort(key=lambda x: (version_dates[x['version']], x['priority']), reverse=True)
+        downloads = ['http://dl.bintray.com/boostorg/%s/%s' % (snapshot, file['path']) for file in file_list]
+
+    filename = ''
+    for download_url in downloads:
+        try:
+            print "Downloading: " + download_url
+            (filename, headers) = urllib.urlretrieve(download_url)
+
+            print "Extracting: " + filename
+            dir = tempfile.mkdtemp()
+            extract(filename, dir)
+            os.remove(filename)
+            files = os.listdir(dir)
+            assert(len(files) == 1)
+            os.rename(os.path.join(dir, files[0]), 'boost')
+            return
+        except IOError:
+            print "Error opening URL: " + download_url
+
+def extract(filename, path = '.'):
+    if (filename.endswith(".gz")):
+        tar = tarfile.open(filename, "r:gz")
+        tar.extractall(path)
+        tar.close
+    elif (filename.endswith(".bz2")):
+        tar = tarfile.open(filename, "r:bz2")
+        tar.extractall(path)
+        tar.close
+    elif (filename.endswith(".zip")):
+        zip = zipfile.ZipFile(filename, "r")
+        zip.extractall(path)
+        zip.close
+    else:
+        assert False
+
+if len(sys.argv) == 1:
+    download('stable')
+elif len(sys.argv) == 2:
+    download(sys.argv[1])
+else:
+    print "Usage: %s [stable|branch-name]" % (sys.argv[0])
@@ -1,68 +1,21 @@
-
 # Copyright 2005 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)

-using boostbook ;
-using quickbook ;
+import asciidoctor ;

-path-constant images_location : ../ ;
-path-constant admonishment_location : ../../../../doc/src/images ;
+html unordered.html : unordered.adoc ;

-xml unordered : unordered.qbk ;
-boostbook standalone : unordered :
-    <xsl:param>chunk.first.sections=1
-    <xsl:param>chunk.section.depth=2
-    <xsl:param>generate.section.toc.level=2
-    <xsl:param>toc.section.depth=1
-    <xsl:param>toc.max.depth=1
+install html_ : unordered.html : <location>html ;

-    <xsl:param>boost.compact.typedef=0
-    <xsl:param>boost.compact.function=0
-    <xsl:param>boost.compact.enum=0
+pdf unordered.pdf : unordered.adoc ;
+explicit unordered.pdf ;

-    # HTML Options:
-
-    <format>html:<xsl:param>boost.root=../../../..
-    <format>html:<xsl:param>img.src.path=../../../../doc/html/
-    <format>xhtml:<xsl:param>boost.root=../../../..
-    <format>xhtml:<xsl:param>img.src.path=../../../../doc/html/
-
-    # PDF Options:
-
-    # TOC Generation: this is needed for FOP-0.9 and later:
-    <xsl:param>fop1.extensions=0
-    <format>pdf:<xsl:param>xep.extensions=1
-    # TOC generation: this is needed for FOP 0.2, but must not be set to zero for FOP-0.9!
-    <format>pdf:<xsl:param>fop.extensions=0
-    # No indent on body text:
-    <format>pdf:<xsl:param>body.start.indent=0pt
-    # Margin size:
-    <format>pdf:<xsl:param>page.margin.inner=0.5in
-    # Margin size:
-    <format>pdf:<xsl:param>page.margin.outer=0.5in
-    # Paper type = A4
-    <format>pdf:<xsl:param>paper.type=A4
-    # Yes, we want graphics for admonishments:
-    <xsl:param>admon.graphics=1
-    # Set this one for PDF generation *only*:
-    # default png graphics are awful in PDF form,
-    # better use SVG's instead:
-    <format>pdf:<xsl:param>admon.graphics.extension=".svg"
-    <format>pdf:<xsl:param>use.role.for.mediaobject=1
-    <format>pdf:<xsl:param>preferred.mediaobject.role=print
-    <format>pdf:<xsl:param>img.src.path=$(images_location)/
-    #<format>pdf:<xsl:param>admon.graphics.path=$(admonishment_location)
-    <format>pdf:<xsl:param>draft.mode="no"
-    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/unordered/doc/html
-    ;
+install pdf_ : unordered.pdf : <location>pdf ;
+explicit pdf_ ;

 ###############################################################################
-alias boostdoc
-    : unordered
-    :
-    :
-    : ;
+alias boostdoc ;
 explicit boostdoc ;
-alias boostrelease ;
+alias boostrelease : html_ ;
 explicit boostrelease ;
@@ -1,26 +0,0 @@
-<!--
-Copyright Daniel James 2008-2009
-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)
-->
-<section id="unordered.bibliography">
-<title>Bibliography</title>
-<bibliography>
-  <biblioentry>
-    <biblioset relation="journal">
-      <title>C/C++ Users Journal</title>
-      <date>February, 2006</date>
-    </biblioset>
-    <biblioset relation="article">
-      <authorgroup>
-        <author>
-          <firstname>Pete</firstname>
-          <surname>Becker</surname>
-        </author>
-      </authorgroup>
-      <title><ulink url="http://www.ddj.com/cpp/184402066">STL and TR1: Part III - Unordered containers</ulink></title>
-    </biblioset>
-    <para>An introducation to the standard unordered containers.</para>
-  </biblioentry>
-</bibliography>
-</section>
@@ -1,171 +0,0 @@
-[/ Copyright 2006-2008 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) ]
-
-[section:buckets The Data Structure]
-
-The containers are made up of a number of 'buckets', each of which can contain
-any number of elements. For example, the following diagram shows an [classref
-boost::unordered_set unordered_set] with 7 buckets containing 5 elements, `A`,
-`B`, `C`, `D` and `E` (this is just for illustration, containers will typically
-have more buckets).
-
-[diagram buckets]
-
-In order to decide which bucket to place an element in, the container applies
-the hash function, `Hash`, to the element's key (for `unordered_set` and
-`unordered_multiset` the key is the whole element, but is referred to as the key
-so that the same terminology can be used for sets and maps). This returns a
-value of type `std::size_t`.  `std::size_t` has a much greater range of values
-then the number of buckets, so that container applies another transformation to
-that value to choose a bucket to place the element in.
-
-Retrieving the elements for a given key is simple. The same process is applied
-to the key to find the correct bucket. Then the key is compared with the
-elements in the bucket to find any elements that match (using the equality
-predicate `Pred`).  If the hash function has worked well the elements will be
-evenly distributed amongst the buckets so only a small number of elements will
-need to be examined.
-
-There is [link unordered.hash_equality more information on hash functions and
-equality predicates in the next section].
-
-You can see in the diagram that `A` & `D` have been placed in the same bucket.
-When looking for elements in this bucket up to 2 comparisons are made, making
-the search slower. This is known as a collision. To keep things fast we try to
-keep collisions to a minimum.
-
-'''
-<table frame="all"><title>Methods for Accessing Buckets</title>
-  <tgroup cols="2">
-    <thead><row>
-      <entry><para>Method</para></entry>
-      <entry><para>Description</para></entry>
-    </row></thead>
-    <tbody>
-      <row>
-       <entry>'''`size_type bucket_count() const`'''</entry>
-       <entry>'''The number of buckets.'''</entry>
-      </row>
-      <row>
-        <entry>'''`size_type max_bucket_count() const`'''</entry>
-        <entry>'''An upper bound on the number of buckets.'''</entry>
-      </row>
-      <row>
-        <entry>'''`size_type bucket_size(size_type n) const`'''</entry>
-        <entry>'''The number of elements in bucket `n`.'''</entry>
-      </row>
-      <row>
-        <entry>'''`size_type bucket(key_type const& k) const`'''</entry>
-        <entry>'''Returns the index of the bucket which would contain k'''</entry>
-      </row>
-      <row>
-        <entry>'''`local_iterator begin(size_type n);`'''</entry>
-        <entry morerows='5'>'''Return begin and end iterators for bucket `n`.'''</entry>
-      </row>
-      <row>
-        <entry>'''`local_iterator end(size_type n);`'''</entry>
-      </row>
-      <row>
-        <entry>'''`const_local_iterator begin(size_type n) const;`'''</entry>
-      </row>
-      <row>
-        <entry>'''`const_local_iterator end(size_type n) const;`'''</entry>
-      </row>
-      <row>
-        <entry>'''`const_local_iterator cbegin(size_type n) const;`'''</entry>
-      </row>
-      <row>
-        <entry>'''`const_local_iterator cend(size_type n) const;`'''</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-'''
-
-[h2 Controlling the number of buckets]
-
-As more elements are added to an unordered associative container, the number
-of elements in the buckets will increase causing performance to degrade.
-To combat this the containers increase the bucket count as elements are inserted.
-You can also tell the container to change the bucket count (if required) by
-calling `rehash`.
-
-The standard leaves a lot of freedom to the implementer to decide how the
-number of buckets are chosen, but it does make some requirements based on the
-container's 'load factor', the average number of elements per bucket.
-Containers also have a 'maximum load factor' which they should try to keep the
-load factor below.
-
-You can't control the bucket count directly but there are two ways to
-influence it:
-
-* Specify the minimum number of buckets when constructing a container or
-  when calling `rehash`.
-* Suggest a maximum load factor by calling `max_load_factor`.
-
-`max_load_factor` doesn't let you set the maximum load factor yourself, it just
-lets you give a /hint/.  And even then, the draft standard doesn't actually
-require the container to pay much attention to this value. The only time the
-load factor is /required/ to be less than the maximum is following a call to
-`rehash`. But most implementations will try to keep the number of elements
-below the max load factor, and set the maximum load factor to be the same as
-or close to the hint - unless your hint is unreasonably small or large.
-
-[table:bucket_size Methods for Controlling Bucket Size
-    [[Method] [Description]]
-
-    [
-        [`X(size_type n)`]
-        [Construct an empty container with at least `n` buckets (`X` is the container type).]
-    ]
-    [
-        [`X(InputIterator i, InputIterator j, size_type n)`]
-        [Construct an empty container with at least `n` buckets and insert elements
-         from the range \[`i`, `j`) (`X` is the container type).]
-    ]
-    [
-        [`float load_factor() const`]
-        [The average number of elements per bucket.]
-    ]
-    [
-        [`float max_load_factor() const`]
-        [Returns the current maximum load factor.]
-    ]
-    [
-        [`float max_load_factor(float z)`]
-        [Changes the container's maximum load factor, using `z` as a hint.]
-    ]
-    [
-        [`void rehash(size_type n)`]
-        [Changes the number of buckets so that there at least n buckets, and
-        so that the load factor is less than the maximum load factor.]
-    ]
-
-]
-
-[h2 Iterator Invalidation]
-
-It is not specified how member functions other than `rehash` affect
-the bucket count, although `insert` is only allowed to invalidate iterators
-when the insertion causes the load factor to be greater than or equal to the
-maximum load factor. For most implementations this means that insert will only
-change the number of buckets when this happens. While iterators can be
-invalidated by calls to `insert` and `rehash`, pointers and references to the
-container's elements are never invalidated.
-
-In a similar manner to using `reserve` for `vector`s, it can be a good idea
-to call `rehash` before inserting a large number of elements. This will get
-the expensive rehashing out of the way and let you store iterators, safe in
-the knowledge that they won't be invalidated. If you are inserting `n`
-elements into container `x`, you could first call:
-
-    x.rehash((x.size() + n) / x.max_load_factor() + 1);
-
-[blurb Note: `rehash`'s argument is the minimum number of buckets, not the
-number of elements, which is why the new size is divided by the maximum load factor.  The
-`+ 1` guarantees there is no invalidation; without it, reallocation could occur
-if the number of bucket exactly divides the target size, since the container is
-allowed to rehash when the load factor is equal to the maximum load factor.]
-
-[endsect]
@@ -1,161 +0,0 @@
-[/ Copyright 2006-2011 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) ]
-
-[section:comparison Comparison with Associative Containers]
-
-[table:interface_differences Interface differences.
-    [[Associative Containers] [Unordered Associative Containers]]
-
-    [
-        [Parameterized by an ordering relation `Compare`]
-        [Parameterized by a function object `Hash` and an equivalence relation
-            `Pred`]
-    ]
-    [
-        [Keys can be compared using `key_compare` which is accessed by member function `key_comp()`,
-         values can be compared using `value_compare` which is accessed by member function `value_comp()`.]
-        [Keys can be hashed using `hasher` which is accessed by member function `hash_function()`,
-         and checked for equality using `key_equal` which is accessed by member function `key_eq()`.
-         There is no function object for compared or hashing values.]
-    ]
-    [
-        [Constructors have optional extra parameters for the comparison object.]
-        [Constructors have optional extra parameters for the initial minimum
-            number of buckets, a hash function and an equality object.]
-    ]
-
-    [
-        [Keys `k1`, `k2` are considered equivalent if
-            `!Compare(k1, k2) && !Compare(k2, k1)`]
-        [Keys `k1`, `k2` are considered equivalent if `Pred(k1, k2)`]
-    ]
-    [
-        [Member function `lower_bound(k)` and `upper_bound(k)`]
-        [No equivalent. Since the elements aren't ordered `lower_bound` and
-        `upper_bound` would be meaningless.]
-    ]
-    [
-        [`equal_range(k)` returns an empty range at the position that k
-            would be inserted if k isn't present in the container.]
-        [`equal_range(k)` returns a range at the end of the container if
-            k isn't present in the container. It can't return a positioned
-            range as k could be inserted into multiple place. To find out the
-            bucket that k would be inserted into use `bucket(k)`. But remember
-            that an insert can cause the container to rehash - meaning that the
-            element can be inserted into a different bucket.]
-    ]
-    [
-        [`iterator`, `const_iterator` are of the bidirectional category.]
-        [`iterator`, `const_iterator` are of at least the forward category.]
-    ]
-    [
-        [Iterators, pointers and references to the container's elements are
-            never invalidated.]
-        [[link unordered.buckets.iterator_invalidation Iterators can
-            be invalidated by calls to insert or rehash]. Pointers and
-            references to the container's elements are never invalidated.]
-    ]
-    [
-        [Iterators iterate through the container in the order defined by
-            the comparison object.]
-        [Iterators iterate through the container in an arbitrary order, that
-            can change as elements are inserted. Although, equivalent elements
-            are always adjacent.]
-    ]
-    [
-        [No equivalent]
-        [Local iterators can be used to iterate through individual buckets.
-            (The order of local iterators and iterators aren't
-            required to have any correspondence.)]
-    ]
-    [
-        [Can be compared using the `==`, `!=`, `<`, `<=`, `>`, `>=` operators.]
-        [Can be compared using the `==` and `!=` operators.]
-    ]
-    [
-        []
-        [When inserting with a hint, implementations are permitted to ignore
-            the hint.]
-    ]
-    [
-        [`erase` never throws an exception]
-        [The containers' hash or predicate function can throw exceptions
-            from `erase`]
-    ]
-]
-
-[table:complexity_guarantees Complexity Guarantees
-    [[Operation] [Associative Containers] [Unordered Associative Containers]]
-    [
-        [Construction of empty container]
-        [constant]
-        [O(/n/) where /n/ is the minimum number of buckets.]
-    ]
-    [
-        [Construction of container from a range of /N/ elements]
-        [O(/N/ log /N/), O(/N/) if the range is sorted with `value_comp()`]
-        [Average case O(/N/), worst case
-            O(/N/'''<superscript>2</superscript>''')]
-    ]
-    [
-        [Insert a single element]
-        [logarithmic]
-        [Average case constant, worst case linear]
-    ]
-    [
-        [Insert a single element with a hint]
-        [Amortized constant if t elements inserted right after hint,
-            logarithmic otherwise]
-        [Average case constant, worst case linear (ie. the same as
-            a normal insert).]
-    ]
-    [
-        [Inserting a range of /N/ elements]
-        [ /N/ log(`size()`+/N/) ]
-        [Average case O(/N/), worst case O(/N/ * `size()`)]
-    ]
-    [
-        [Erase by key, `k`]
-        [O(log(`size()`) + `count(k)`)]
-        [Average case: O(`count(k)`), Worst case: O(`size()`)]
-    ]
-    [
-        [Erase a single element by iterator]
-        [Amortized constant]
-        [Average case: O(1), Worst case: O(`size()`)]
-    ]
-    [
-        [Erase a range of /N/ elements]
-        [O(log(`size()`) + /N/)]
-        [Average case: O(/N/), Worst case: O(`size()`)]
-    ]
-    [
-        [Clearing the container]
-        [O(`size()`)]
-        [O(`size()`)]
-    ]
-    [
-        [Find]
-        [logarithmic]
-        [Average case: O(1), Worst case: O(`size()`)]
-    ]
-    [/ TODO: Average case is probably wrong. ]
-    [
-        [Count]
-        [O(log(`size()`) + `count(k)`)]
-        [Average case: O(1), Worst case: O(`size()`)]
-    ]
-    [
-        [`equal_range(k)`]
-        [logarithmic]
-        [Average case: O(`count(k)`), Worst case: O(`size()`)]
-    ]
-    [
-        [`lower_bound`,`upper_bound`]
-        [logarithmic]
-        [n/a]
-    ]
-]
-
-[endsect]
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="507.85925"
-   height="400.45422"
-   viewBox="1.33 0.95 6.01 4.09"
-   id="svg2">
-  <defs
-     id="defs95" />
-  <rect
-     width="6.0023117"
-     height="4.0815721"
-     x="1.3310578"
-     y="0.95080346"
-     id="rect4"
-     style="fill:#e5e5e5;stroke:none;stroke-width:0" />
-  <rect
-     width="6.0023117"
-     height="4.0815721"
-     x="1.3310578"
-     y="0.95080346"
-     id="rect6"
-     style="opacity:1;fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="1.5711501"
-     y="1.1908962"
-     id="rect8"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="1.5711501"
-     y="1.1908962"
-     id="rect10"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="1.7289008"
-     y="1.4950322"
-     id="text12"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 1</text>
-  <line
-     x1="1.5711501"
-     y1="1.6710808"
-     x2="2.7716124"
-     y2="1.6710808"
-     id="line14"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="3.0117054"
-     y="1.1908962"
-     id="rect16"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="3.0117054"
-     y="1.1908962"
-     id="rect18"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="3.1603069"
-     y="1.4950322"
-     id="text20"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 2</text>
-  <line
-     x1="3.0117054"
-     y1="1.6710808"
-     x2="4.2121677"
-     y2="1.6710808"
-     id="line22"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="4.4522605"
-     y="1.1908962"
-     id="rect24"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="4.4522605"
-     y="1.1908962"
-     id="rect26"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="4.5917125"
-     y="1.4950322"
-     id="text28"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 3</text>
-  <line
-     x1="4.4522605"
-     y1="1.6710808"
-     x2="5.6527228"
-     y2="1.6710808"
-     id="line30"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="5.8928151"
-     y="1.1908962"
-     id="rect32"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="5.8928151"
-     y="1.1908962"
-     id="rect34"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="6.0688629"
-     y="1.4858831"
-     id="text36"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 4</text>
-  <line
-     x1="5.8928151"
-     y1="1.6710808"
-     x2="7.093277"
-     y2="1.6710808"
-     id="line38"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="2.2941716"
-     y="3.1054616"
-     id="rect40"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="2.2941716"
-     y="3.1054616"
-     id="rect42"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="2.4427731"
-     y="3.4187472"
-     id="text44"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 5</text>
-  <line
-     x1="2.2941716"
-     y1="3.5856469"
-     x2="3.4946339"
-     y2="3.5856469"
-     id="line46"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="3.7347264"
-     y="3.1054616"
-     id="rect48"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="3.7347264"
-     y="3.1054616"
-     id="rect50"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="3.8833277"
-     y="3.4187472"
-     id="text52"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 6</text>
-  <line
-     x1="3.7347264"
-     y1="3.5856469"
-     x2="4.9351892"
-     y2="3.5856469"
-     id="line54"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="5.175281"
-     y="3.1054616"
-     id="rect56"
-     style="fill:#ffffff;stroke:none;stroke-width:0" />
-  <rect
-     width="1.2004625"
-     height="1.6806473"
-     x="5.175281"
-     y="3.1054616"
-     id="rect58"
-     style="fill:none;stroke:#000000;stroke-width:0.02400924" />
-  <text
-     x="5.3330317"
-     y="3.4187472"
-     id="text60"
-     style="font-size:0.19207397px;font-style:normal;font-weight:400;text-anchor:start;fill:#000000;font-family:sans">Bucket 7</text>
-  <line
-     x1="5.175281"
-     y1="3.5856469"
-     x2="6.3757439"
-     y2="3.5856469"
-     id="line62"
-     style="stroke:#000000;stroke-width:0.02400924" />
-  <ellipse
-     cx="7.1999998"
-     cy="4.0110002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse64"
-     style="fill:#ffffff;stroke:none" />
-  <ellipse
-     cx="7.1999998"
-     cy="4.0110002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse66"
-     style="fill:none;stroke:#000000;stroke-width:0.035" />
-  <text
-     x="6.1443377"
-     y="2.1364057"
-     id="text68"
-     style="font-size:0.34038281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;font-family:Sans;-inkscape-font-specification:Sans">A</text>
-  <ellipse
-     cx="3.007"
-     cy="4.0300002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse70"
-     style="fill:#ffffff;stroke:none" />
-  <ellipse
-     cx="3.007"
-     cy="4.0300002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse72"
-     style="fill:none;stroke:#000000;stroke-width:0.035" />
-  <text
-     x="3.2742035"
-     y="2.1540098"
-     id="text74"
-     style="font-size:0.34038281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;font-family:Sans;-inkscape-font-specification:Sans">B</text>
-  <ellipse
-     cx="4.0599999"
-     cy="6.7820001"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse76"
-     style="fill:#ffffff;stroke:none" />
-  <ellipse
-     cx="4.0599999"
-     cy="6.7820001"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse78"
-     style="fill:none;stroke:#000000;stroke-width:0.035" />
-  <text
-     x="3.976877"
-     y="4.0473108"
-     id="text80"
-     style="font-size:0.34038281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;font-family:Sans;-inkscape-font-specification:Sans">C</text>
-  <ellipse
-     cx="7.8449998"
-     cy="4.6550002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse82"
-     style="fill:#ffffff;stroke:none" />
-  <ellipse
-     cx="7.8449998"
-     cy="4.6550002"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse84"
-     style="fill:none;stroke:#000000;stroke-width:0.035" />
-  <text
-     x="6.5808516"
-     y="2.5937216"
-     id="text86"
-     style="font-size:0.34038281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;font-family:Sans;-inkscape-font-specification:Sans">D</text>
-  <ellipse
-     cx="0.87"
-     cy="4.0079999"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse88"
-     style="fill:#ffffff;stroke:none" />
-  <ellipse
-     cx="0.87"
-     cy="4.0079999"
-     rx="0.308"
-     ry="0.308"
-     transform="matrix(0.6859785,0,0,0.6859785,1.3310577,-0.7298436)"
-     id="ellipse90"
-     style="fill:none;stroke:#000000;stroke-width:0.035" />
-  <text
-     x="1.7991183"
-     y="2.1403852"
-     id="text92"
-     style="font-size:0.34038281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;font-family:Sans;-inkscape-font-specification:Sans">E</text>
-</svg>
@@ -1,86 +0,0 @@
-[/ Copyright 2006-2008 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) ]
-
-[section:hash_equality Equality Predicates and Hash Functions]
-
-While the associative containers use an ordering relation to specify how the
-elements are stored, the unordered associative containers use an equality
-predicate and a hash function. For example, [classref boost::unordered_map]
-is declared as:
-
-        template <
-            class Key, class Mapped,
-            class Hash = ``[classref boost::hash]``<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<std::pair<Key const, Mapped> > >
-        class ``[classref boost::unordered_map unordered_map]``;
-
-The hash function comes first as you might want to change the hash function
-but not the equality predicate. For example, if you wanted to use the
-[@http://www.isthe.com/chongo/tech/comp/fnv/ FNV-1 hash] you could write:
-
-[import src_code/dictionary.cpp]
-[case_sensitive_dictionary_fnv]
-
-There is an [@boost:/libs/unordered/examples/fnv1.hpp implementation
-of FNV-1] in the examples directory.
-
-If you wish to use a different equality function,
-you will also need to use a matching hash function. For
-example, to implement a case insensitive dictionary you need to define a
-case insensitive equality predicate and hash function:
-
-[case_insensitive_functions]
-
-Which you can then use in a case insensitive dictionary:
-
-[case_insensitive_dictionary]
-
-This is a simplified version of the example at
-[@boost:/libs/unordered/examples/case_insensitive.hpp /libs/unordered/examples/case_insensitive.hpp]
-which supports other locales and string types.
-
-[caution
-Be careful when using the equality (`==`) operator with custom equality
-predicates, especially if you're using a function pointer. If you compare two
-containers with different equality predicates then the result is undefined.
-For most stateless function objects this is impossible - since you can only
-compare objects with the same equality predicate you know the equality
-predicates must be equal. But if you're using function pointers or a stateful
-equality predicate (e.g. boost::function) then you can get into trouble.
-]
-
-[h2 Custom Types]
-
-Similarly, a custom hash function can be used for custom types:
-
-[import src_code/point1.cpp]
-[point_example1]
-
-Since the default hash function is [link hash Boost.Hash],
-we can [link hash.custom extend it to support the type]
-so that the hash function doesn't need to be explicitly given:
-
-[import src_code/point2.cpp]
-[point_example2]
-
-See the [link hash.custom Boost.Hash documentation] for more detail on how to
-do this.  Remember that it relies on extensions to the draft standard - so it
-won't work for other implementations of the unordered associative containers,
-you'll need to explicitly use Boost.Hash.
-
-[table:access_methods Methods for accessing the hash and equality functions.
-    [[Method] [Description]]
-
-    [
-        [`hasher hash_function() const`]
-        [Returns the container's hash function.]
-    ]
-    [
-        [`key_equal key_eq() const`]
-        [Returns the container's key equality function.]
-    ]
-]
-
-[endsect]
@@ -1,101 +0,0 @@
-[/ Copyright 2006-2008 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) ]
-
-[def __hash-table__ [@http://en.wikipedia.org/wiki/Hash_table
-    hash table]]
-[def __hash-function__ [@http://en.wikipedia.org/wiki/Hash_function
-    hash function]]
-
-[section:intro Introduction]
-
-For accessing data based on key lookup, the C++ standard library offers `std::set`,
-`std::map`, `std::multiset` and `std::multimap`. These are generally
-implemented using balanced binary trees so that lookup time has
-logarithmic complexity. That is generally okay, but in many cases a
-__hash-table__ can perform better, as accessing data has constant complexity,
-on average. The worst case complexity is linear, but that occurs rarely and
-with some care, can be avoided.
-
-Also, the existing containers require a 'less than' comparison object
-to order their elements. For some data types this is impossible to implement
-or isn't practical. In contrast, a hash table only needs an equality function
-and a hash function for the key.
-
-With this in mind, unordered associative containers were added to the C++
-standard. This is an implementation of the containers described in C++11,
-with some [link unordered.compliance deviations from the standard] in
-order to work with non-C++11 compilers and libraries.
-
-`unordered_set` and `unordered_multiset` are defined in the header
-<[headerref boost/unordered_set.hpp]>
-
-    namespace boost {
-        template <
-            class Key,
-            class Hash = ``[classref boost::hash]``<Key>, 
-            class Pred = std::equal_to<Key>, 
-            class Alloc = std::allocator<Key> > 
-        class ``[classref boost::unordered_set unordered_set]``;
-
-        template<
-            class Key,
-            class Hash = ``[classref boost::hash]``<Key>, 
-            class Pred = std::equal_to<Key>, 
-            class Alloc = std::allocator<Key> > 
-        class ``[classref boost::unordered_multiset unordered_multiset]``;
-    }
-
-`unordered_map` and `unordered_multimap` are defined in the header
-<[headerref boost/unordered_map.hpp]>
-
-    namespace boost {
-        template <
-            class Key, class Mapped,
-            class Hash = ``[classref boost::hash]``<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<std::pair<Key const, Mapped> > >
-        class ``[classref boost::unordered_map unordered_map]``;
-
-        template<
-            class Key, class Mapped,
-            class Hash = ``[classref boost::hash]``<Key>,
-            class Pred = std::equal_to<Key>,
-            class Alloc = std::allocator<std::pair<Key const, Mapped> > >
-        class ``[classref boost::unordered_multimap unordered_multimap]``;
-    }
-
-When using Boost.TR1, these classes are included from `<unordered_set>` and
-`<unordered_map>`, with the classes added to the `std::tr1` namespace.
-
-The containers are used in a similar manner to the normal associative
-containers:
-
-[import src_code/intro.cpp]
-[intro_example1_2]
-
-But since the elements aren't ordered, the output of:
-
-[intro_example1_3]
-
-can be in any order. For example, it might be:
-
-    two,2
-    one,1
-    three,3
-
-To store an object in an unordered associative container requires both an
-key equality function and a hash function. The default function objects in
-the standard containers support a few basic types including integer types,
-floating point types, pointer types, and the standard strings. Since
-Boost.Unordered uses [classref boost::hash] it also supports some other types,
-including standard containers. To use any types not supported by these methods
-you have to [link hash.custom extend Boost.Hash to support the type] or use
-your own custom equality predicates and hash functions. See the
-[link unordered.hash_equality Equality Predicates and Hash Functions] section
-for more details.
-
-There are other differences, which are listed in the
-[link unordered.comparison Comparison with Associative Containers] section.
-
-[endsect]
@@ -1,111 +0,0 @@
-[/ Copyright 2006-2008 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) ]
-
-[def __wang__
-    [@http://web.archive.org/web/20121102023700/http://www.concentric.net/~Ttwang/tech/inthash.htm
-    Thomas Wang's article on integer hash functions]]
-
-[section:rationale Implementation Rationale]
-
-The intent of this library is to implement the unordered
-containers in the draft standard, so the interface was fixed. But there are
-still some implementation decisions to make. The priorities are
-conformance to the standard and portability.
-
-The [@http://en.wikipedia.org/wiki/Hash_table wikipedia article on hash tables]
-has a good summary of the implementation issues for hash tables in general.
-
-[h2 Data Structure]
-
-By specifying an interface for accessing the buckets of the container the
-standard pretty much requires that the hash table uses chained addressing.
-
-It would be conceivable to write a hash table that uses another method.  For
-example, it could use open addressing, and use the lookup chain to act as a
-bucket but there are a some serious problems with this: 
-
-* The draft standard requires that pointers to elements aren't invalidated, so
-  the elements can't be stored in one array, but will need a layer of
-  indirection instead - losing the efficiency and most of the memory gain,
-  the main advantages of open addressing.
-
-* Local iterators would be very inefficient and may not be able to
-  meet the complexity requirements.
-  
-* There are also the restrictions on when iterators can be invalidated. Since
-  open addressing degrades badly when there are a high number of collisions the
-  restrictions could prevent a rehash when it's really needed. The maximum load
-  factor could be set to a fairly low value to work around this - but the
-  standard requires that it is initially set to 1.0.
-
-* And since the standard is written with a eye towards chained
-  addressing, users will be surprised if the performance doesn't reflect that.
-
-So chained addressing is used.
-
-[/ (Removing for now as this is out of date)
-
-For containers with unique keys I store the buckets in a single-linked list.
-There are other possible data structures (such as a double-linked list)
-that allow for some operations to be faster (such as erasing and iteration)
-but the possible gain seems small compared to the extra memory needed.
-The most commonly used operations (insertion and lookup) would not be improved
-at all.
-
-But for containers with equivalent keys a single-linked list can degrade badly
-when a large number of elements with equivalent keys are inserted. I think it's
-reasonable to assume that users who choose to use `unordered_multiset` or
-`unordered_multimap` do so because they are likely to insert elements with
-equivalent keys. So I have used an alternative data structure that doesn't
-degrade, at the expense of an extra pointer per node.
-
-This works by adding storing a circular linked list for each group of equivalent
-nodes in reverse order. This allows quick navigation to the end of a group (since
-the first element points to the last) and can be quickly updated when elements
-are inserted or erased. The main disadvantage of this approach is some hairy code
-for erasing elements.
-]
-
-[/ (Starting to write up new structure, might not be ready in time)
-The node used to be stored in a linked list for each bucket but that
-didn't meet the complexity requirements for C++11, so now the nodes
-are stored in one long single linked list. But there needs a way to get
-the bucket from the node, to do that a copy of the key's hash value is
-stored in the node. Another possibility would be to store a pointer to
-the bucket, or the bucket's index, but storing the hash value allows
-some operations to be faster.
-]
-
-[h2 Number of Buckets]
-
-There are two popular methods for choosing the number of buckets in a hash
-table. One is to have a prime number of buckets, another is to use a power
-of 2.
-
-Using a prime number of buckets, and choosing a bucket by using the modulus
-of the hash function's result will usually give a good result. The downside
-is that the required modulus operation is fairly expensive. This is what the
-containers do in most cases.
-
-Using a power of 2 allows for much quicker selection of the bucket
-to use, but at the expense of loosing the upper bits of the hash value.
-For some specially designed hash functions it is possible to do this and
-still get a good result but as the containers can take arbitrary hash
-functions this can't be relied on.
-
-To avoid this a transformation could be applied to the hash function, for an
-example see __wang__.  Unfortunately, a transformation like Wang's requires
-knowledge of the number of bits in the hash value, so it isn't portable enough
-to use as a default. It can applicable in certain cases so the containers
-have a policy based implementation that can use this alternative technique.
-
-Currently this is only done on 64 bit architecures, where prime number
-modulus can be expensive. Although this varies depending on the architecture,
-so I probably should revisit it.
-
-I'm also thinking of introducing a mechanism whereby a hash function can
-indicate that it's safe to be used directly with power of 2 buckets, in
-which case a faster plain power of 2 implementation can be used.
-
-[endsect]
@@ -1,101 +0,0 @@
-
-// Copyright 2006-2007 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)
-
-#include <boost/unordered_map.hpp>
-#include <boost/detail/lightweight_test.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include "../../examples/fnv1.hpp"
-
-//[case_insensitive_functions
-    struct iequal_to
-    {
-        bool operator()(std::string const& x,
-            std::string const& y) const
-        {
-            return boost::algorithm::iequals(x, y, std::locale());
-        }
-    };
-
-    struct ihash
-    {
-        std::size_t operator()(std::string const& x) const
-        {
-            std::size_t seed = 0;
-            std::locale locale;
-
-            for(std::string::const_iterator it = x.begin();
-                it != x.end(); ++it)
-            {
-                boost::hash_combine(seed, std::toupper(*it, locale));
-            }
-
-            return seed;
-        }
-    };
-//]
-
-int main() {
-//[case_sensitive_dictionary_fnv
-    boost::unordered_map<std::string, int, hash::fnv_1>
-        dictionary;
-//]
-
-    BOOST_TEST(dictionary.empty());
-
-    dictionary["one"] = 1;
-    BOOST_TEST(dictionary.size() == 1);
-    BOOST_TEST(dictionary.find("ONE") == dictionary.end());
-
-    dictionary.insert(std::make_pair("ONE", 2));
-    BOOST_TEST(dictionary.size() == 2);
-    BOOST_TEST(dictionary.find("ONE") != dictionary.end() &&
-            dictionary.find("ONE")->first == "ONE" &&
-            dictionary.find("ONE")->second == 2);
-
-    dictionary["One"] = 3;
-    BOOST_TEST(dictionary.size() == 3);
-    BOOST_TEST(dictionary.find("One") != dictionary.end() &&
-            dictionary.find("One")->first == "One" &&
-            dictionary.find("One")->second == 3);
-
-    dictionary["two"] = 4;
-    BOOST_TEST(dictionary.size() == 4);
-    BOOST_TEST(dictionary.find("Two") == dictionary.end() &&
-            dictionary.find("two") != dictionary.end() &&
-            dictionary.find("two")->second == 4);
-
-
-//[case_insensitive_dictionary
-    boost::unordered_map<std::string, int, ihash, iequal_to>
-        idictionary;
-//]
-
-    BOOST_TEST(idictionary.empty());
-
-    idictionary["one"] = 1;
-    BOOST_TEST(idictionary.size() == 1);
-    BOOST_TEST(idictionary.find("ONE") != idictionary.end() &&
-        idictionary.find("ONE") == idictionary.find("one"));
-
-    idictionary.insert(std::make_pair("ONE", 2));
-    BOOST_TEST(idictionary.size() == 1);
-    BOOST_TEST(idictionary.find("ONE") != idictionary.end() &&
-            idictionary.find("ONE")->first == "one" &&
-            idictionary.find("ONE")->second == 1);
-
-    idictionary["One"] = 3;
-    BOOST_TEST(idictionary.size() == 1);
-    BOOST_TEST(idictionary.find("ONE") != idictionary.end() &&
-            idictionary.find("ONE")->first == "one" &&
-            idictionary.find("ONE")->second == 3);
-
-    idictionary["two"] = 4;
-    BOOST_TEST(idictionary.size() == 2);
-    BOOST_TEST(idictionary.find("two") != idictionary.end() &&
-            idictionary.find("TWO")->first == "two" &&
-            idictionary.find("Two")->second == 4);
-
-    return boost::report_errors();
-}
@@ -1,30 +0,0 @@
-
-// Copyright 2006-2009 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)
-
-//[intro_example1_1
-#include <boost/unordered_map.hpp>
-#include <boost/foreach.hpp>
-#include <cassert>
-#include <iostream>
-//]
-
-int main() {
-//[intro_example1_2
-    typedef boost::unordered_map<std::string, int> map;
-    map x;
-    x["one"] = 1;
-    x["two"] = 2;
-    x["three"] = 3;
-
-    assert(x.at("one") == 1);
-    assert(x.find("missing") == x.end());
-//]
-
-//[intro_example1_3
-    BOOST_FOREACH(map::value_type i, x) {
-        std::cout<<i.first<<","<<i.second<<"\n";
-    }
-//]
-}
@@ -1,44 +0,0 @@
-
-// Copyright 2006-2009 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)
-
-#include <boost/unordered_set.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-//[point_example1
-    struct point {
-        int x;
-        int y;
-    };
-
-    bool operator==(point const& p1, point const& p2)
-    {
-        return p1.x == p2.x && p1.y == p2.y;
-    }
-
-    struct point_hash
-    {
-        std::size_t operator()(point const& p) const
-        {
-            std::size_t seed = 0;
-            boost::hash_combine(seed, p.x);
-            boost::hash_combine(seed, p.y);
-            return seed;
-        }
-    };
-
-    boost::unordered_multiset<point, point_hash> points;
-//]
-
-int main() {
-    point x[] = {{1,2}, {3,4}, {1,5}, {1,2}};
-    for(int i = 0; i < sizeof(x) / sizeof(point); ++i)
-        points.insert(x[i]);
-    BOOST_TEST(points.count(x[0]) == 2);
-    BOOST_TEST(points.count(x[1]) == 1);
-    point y = {10, 2};
-    BOOST_TEST(points.count(y) == 0);
-
-    return boost::report_errors();
-}
@@ -1,43 +0,0 @@
-
-// Copyright 2006-2009 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)
-
-#include <boost/unordered_set.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-//[point_example2
-    struct point {
-        int x;
-        int y;
-    };
-
-    bool operator==(point const& p1, point const& p2)
-    {
-        return p1.x == p2.x && p1.y == p2.y;
-    }
-
-    std::size_t hash_value(point const& p) {
-        std::size_t seed = 0;
-        boost::hash_combine(seed, p.x);
-        boost::hash_combine(seed, p.y);
-        return seed;
-    }
-
-    // Now the default function objects work.
-    boost::unordered_multiset<point> points;
-//]
-
-int main() {
-    point x[] = {{1,2}, {3,4}, {1,5}, {1,2}};
-    for(int i = 0; i < sizeof(x) / sizeof(point); ++i)
-        points.insert(x[i]);
-    BOOST_TEST(points.count(x[0]) == 2);
-    BOOST_TEST(points.count(x[1]) == 1);
-    point y = {10, 2};
-    BOOST_TEST(points.count(y) == 0);
-
-    return boost::report_errors();
-}
-
@@ -0,0 +1,22 @@
+= Boost.Unordered
+:toc: left
+:toclevels: 3
+:idprefix:
+:docinfo: private-footer
+:source-highlighter: rouge
+:source-language: c++
+:nofooter:
+:sectlinks:
+
+:leveloffset: +1
+
+include::unordered/intro.adoc[]
+include::unordered/buckets.adoc[]
+include::unordered/hash_equality.adoc[]
+include::unordered/comparison.adoc[]
+include::unordered/compliance.adoc[]
+include::unordered/rationale.adoc[]
+include::unordered/ref.adoc[]
+include::unordered/changes.adoc[]
+include::unordered/bibliography.adoc[]
+include::unordered/copyright.adoc[]
@@ -1,38 +0,0 @@
-[/ Copyright 2006-2008 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) ]
-
-[library Boost.Unordered
-    [quickbook 1.5]
-    [authors [James, Daniel]]
-    [copyright 2003 2004 Jeremy B. Maitin-Shepard]
-    [copyright 2005 2006 2007 2008 Daniel James]
-    [purpose std::tr1 compliant hash containers]
-    [id unordered]
-    [dirname unordered]
-    [license
-        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])
-    ]
-]
-
-[template diagram[name]  '''<inlinemediaobject>
-<imageobject role="html">
-<imagedata align = "center" fileref="../../libs/unordered/doc/diagrams/'''[name]'''.png"></imagedata>
-</imageobject>
-<imageobject role="print">
-<imagedata align = "center" fileref="../../libs/unordered/doc/diagrams/'''[name]'''.svg"></imagedata>
-</imageobject>
-</inlinemediaobject>''']
-
-
-[include:unordered intro.qbk]
-[include:unordered buckets.qbk]
-[include:unordered hash_equality.qbk]
-[include:unordered comparison.qbk]
-[include:unordered compliance.qbk]
-[include:unordered rationale.qbk]
-[include:unordered changes.qbk]
-[xinclude ref.xml]
-[xinclude bibliography.xml]
@@ -0,0 +1,10 @@
+[#bibliography]
+
+:idprefix: bibliography_
+
+= Bibliography
+
+* _C/C++ Users Journal_. February, 2006. Pete Becker. http://www.ddj.com/cpp/184402066[STL and TR1: Part III - Unordered containers^]. +
+An introducation to the standard unordered containers.
+
+
@@ -0,0 +1,152 @@
+[#buckets]
+:idprefix: buckets_
+
+= The Data Structure
+
+The containers are made up of a number of 'buckets', each of which can contain
+any number of elements. For example, the following diagram shows an <<unordered_set,unordered_set>> with 7 buckets containing 5 elements, `A`,
+`B`, `C`, `D` and `E` (this is just for illustration, containers will typically
+have more buckets).
+
+image::../diagrams/buckets.png[]
+
+In order to decide which bucket to place an element in, the container applies
+the hash function, `Hash`, to the element's key (for `unordered_set` and
+`unordered_multiset` the key is the whole element, but is referred to as the key
+so that the same terminology can be used for sets and maps). This returns a
+value of type `std::size_t`. `std::size_t` has a much greater range of values
+then the number of buckets, so the container applies another transformation to
+that value to choose a bucket to place the element in.
+
+Retrieving the elements for a given key is simple. The same process is applied
+to the key to find the correct bucket. Then the key is compared with the
+elements in the bucket to find any elements that match (using the equality
+predicate `Pred`). If the hash function has worked well the elements will be
+evenly distributed amongst the buckets so only a small number of elements will
+need to be examined.
+
+There is <<hash_equality, more information on hash functions and
+equality predicates in the next section>>.
+
+You can see in the diagram that `A` & `D` have been placed in the same bucket.
+When looking for elements in this bucket up to 2 comparisons are made, making
+the search slower. This is known as a collision. To keep things fast we try to
+keep collisions to a minimum.
+
+[caption=, title='Table {counter:table-counter}. Methods for Accessing Buckets']
+[cols="1,.^1", frame=all, grid=rows]
+|===
+|Method |Description
+
+|`size_type bucket_count() const` 
+|The number of buckets.
+
+|`size_type max_bucket_count() const` 
+|An upper bound on the number of buckets.
+
+|`size_type bucket_size(size_type n) const` 
+|The number of elements in bucket `n`.
+
+|`size_type bucket(key_type const& k) const`
+|Returns the index of the bucket which would contain `k`.
+
+|`local_iterator begin(size_type n)`
+1.6+|Return begin and end iterators for bucket `n`.
+
+|`local_iterator end(size_type n)`
+
+|`const_local_iterator begin(size_type n) const`
+
+|`const_local_iterator end(size_type n) const`
+
+|`const_local_iterator cbegin(size_type n) const`
+
+|`const_local_iterator cend(size_type n) const`
+
+|===
+
+== Controlling the number of buckets
+
+As more elements are added to an unordered associative container, the number
+of elements in the buckets will increase causing performance to degrade.
+To combat this the containers increase the bucket count as elements are inserted.
+You can also tell the container to change the bucket count (if required) by
+calling `rehash`.
+
+The standard leaves a lot of freedom to the implementer to decide how the
+number of buckets is chosen, but it does make some requirements based on the
+container's 'load factor', the average number of elements per bucket.
+Containers also have a 'maximum load factor' which they should try to keep the
+load factor below.
+
+You can't control the bucket count directly but there are two ways to
+influence it:
+
+* Specify the minimum number of buckets when constructing a container or when calling `rehash`.
+* Suggest a maximum load factor by calling `max_load_factor`.
+
+`max_load_factor` doesn't let you set the maximum load factor yourself, it just
+lets you give a _hint_. And even then, the standard doesn't actually
+require the container to pay much attention to this value. The only time the
+load factor is _required_ to be less than the maximum is following a call to
+`rehash`. But most implementations will try to keep the number of elements
+below the max load factor, and set the maximum load factor to be the same as
+or close to the hint - unless your hint is unreasonably small or large.
+
+[caption=, title='Table {counter:table-counter}. Methods for Controlling Bucket Size']
+[cols="1,.^1", frame=all, grid=rows]
+|===
+|Method |Description
+
+|`X(size_type n)` 
+|Construct an empty container with at least `n` buckets (`X` is the container type).
+
+|`X(InputIterator i, InputIterator j, size_type n)` 
+|Construct an empty container with at least `n` buckets and insert elements from the range `[i, j)` (`X` is the container type).
+
+|`float load_factor() const` 
+|The average number of elements per bucket.
+
+|`float max_load_factor() const`
+|Returns the current maximum load factor.
+
+|`float max_load_factor(float z)`
+|Changes the container's maximum load factor, using `z` as a hint.
+
+|`void rehash(size_type n)`
+|Changes the number of buckets so that there at least `n` buckets, and so that the load factor is less than the maximum load factor.
+
+|===
+
+== Iterator Invalidation
+
+It is not specified how member functions other than `rehash` and `reserve` affect
+the bucket count, although `insert` is only allowed to invalidate iterators
+when the insertion causes the load factor to be greater than or equal to the
+maximum load factor. For most implementations this means that `insert` will only
+change the number of buckets when this happens. While iterators can be
+invalidated by calls to `insert`, `rehash` and `reserve`, pointers and references to the
+container's elements are never invalidated.
+
+In a similar manner to using `reserve` for ``vector``s, it can be a good idea
+to call `reserve` before inserting a large number of elements. This will get
+the expensive rehashing out of the way and let you store iterators, safe in
+the knowledge that they won't be invalidated. If you are inserting `n`
+elements into container `x`, you could first call:
+
+```
+x.reserve(n);
+```
+
+Note:: `reserve(n)` reserves space for at least `n` elements, allocating enough buckets
+so as to not exceed the maximum load factor.
+
+Because the maximum load factor is defined as the number of elements divided by the total
+number of available buckets, this function is logically equivalent to:
+
+```
+x.rehash(std::ceil(n / x.max_load_factor()))
+```
+
+See the <<unordered_map_rehash,reference for more details>> on the `rehash` function.
+
@@ -1,156 +1,225 @@
+[#changes]
+= Change Log

-[/ Copyright 2008 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) ]
+:idprefix: changes_
+:svn-ticket-url: https://svn.boost.org/trac/boost/ticket
+:github-pr-url: https://github.com/boostorg/unordered/pull
+:cpp: C++

-[template ticket[number]'''<ulink
-    url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>''']
+== Release 1.79.0

-[section:changes Change Log]
+* Improved {cpp}20 support:
+  ** All containers have been updated to support 
+    heterogeneous `count`, `equal_range` and `find`.
+  ** All containers now implement the member function `contains`.
+  ** `erase_if` has been implemented for all containers.
+* Improved {cpp}23 support:
+  ** All containers have been updated to support
+    heterogeneous `erase` and `extract`.
+* Changed behavior of `reserve` to eagerly 
+  allocate ({github-pr-url}/59[PR#59^]).
+* Various warning fixes in the test suite.
+* Update code to internally use `boost::allocator_traits`.
+* Switch to Fibonacci hashing.
+* Update documentation to be written in AsciiDoc instead of QuickBook.

-[h2 Review Version]
+== Release 1.67.0

-Initial review version, for the review conducted from 7th December 2007 to
-16th December 2007.
+* Improved {cpp}17 support:
+  ** Add template deduction guides from the standard.
+  ** Use a simple implementation of `optional` in node handles, so
+    that they're closer to the standard.
+  ** Add missing `noexcept` specifications to `swap`, `operator=`
+    and node handles, and change the implementation to match.
+    Using `std::allocator_traits::is_always_equal`, or our own
+    implementation when not available, and
+    `boost::is_nothrow_swappable` in the implementation.
+* Improved {cpp}20 support:
+  ** Use `boost::to_address`, which has the proposed {cpp}20 semantics,
+    rather than the old custom implementation.
+* Add `element_type` to iterators, so that `std::pointer_traits`
+  will work.
+* Use `std::piecewise_construct` on recent versions of Visual {cpp},
+  and other uses of the Dinkumware standard library,
+  now using Boost.Predef to check compiler and library versions.
+* Use `std::iterator_traits` rather than the boost iterator traits
+  in order to remove dependency on Boost.Iterator.
+* Remove iterators' inheritance from `std::iterator`, which is
+  deprecated in {cpp}17, thanks to Daniela Engert
+  ({github-pr-url}/7[PR#7^]).
+* Stop using `BOOST_DEDUCED_TYPENAME`.
+* Update some Boost include paths.
+* Rename some internal methods, and variables.
+* Various testing improvements.
+* Miscellaneous internal changes.

-[h2 1.35.0 Add-on - 31st March 2008]
+== Release 1.66.0

-Unofficial release uploaded to vault, to be used with Boost 1.35.0. Incorporated
-many of the suggestions from the review.
+* Simpler move construction implementation.
+* Documentation fixes ({github-pr-url}/6[GitHub #6^]).

-* Improved portability thanks to Boost regression testing.
-* Fix lots of typos, and clearer text in the documentation.
-* Fix floating point to `std::size_t` conversion when calculating sizes from
-  the max load factor, and use `double` in the calculation for greater accuracy.
-* Fix some errors in the examples.
+== Release 1.65.0

-[h2 Boost 1.36.0]
+* Add deprecated attributes to `quick_erase` and `erase_return_void`.
+  I really will remove them in a future version this time.
+* Small standards compliance fixes:
+  ** `noexpect` specs for `swap` free functions.
+  ** Add missing `insert(P&&)` methods.

-First official release.
+== Release 1.64.0

-* Rearrange the internals.
-* Move semantics - full support when rvalue references are available, emulated
-  using a cut down version of the Adobe move library when they are not.
-* Emplace support when rvalue references and variadic template are available.
-* More efficient node allocation when rvalue references and variadic template
-  are available.
-* Added equality operators.
+* Initial support for new {cpp}17 member functions:
+  `insert_or_assign` and `try_emplace` in `unordered_map`,
+* Initial support for `merge` and `extract`.
+  Does not include transferring nodes between
+  `unordered_map` and `unordered_multimap` or between `unordered_set` and
+  `unordered_multiset` yet. That will hopefully be in the next version of
+  Boost.

-[h2 Boost 1.37.0]
+== Release 1.63.0

-* Rename overload of `emplace` with hint, to `emplace_hint` as specified in
-  [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2691.pdf n2691].
-* Provide forwarding headers at `<boost/unordered/unordered_map_fwd.hpp>` and
-  `<boost/unordered/unordered_set_fwd.hpp>`.
-* Move all the implementation inside `boost/unordered`, to assist
-  modularization and hopefully make it easier to track changes in subversion.
+* Check hint iterator in `insert`/`emplace_hint`.
+* Fix some warnings, mostly in the tests.
+* Manually write out `emplace_args` for small numbers of arguments -
+  should make template error messages a little more bearable.
+* Remove superfluous use of `boost::forward` in emplace arguments,
+  which fixes emplacing string literals in old versions of Visual {cpp}.
+* Fix an exception safety issue in assignment. If bucket allocation
+  throws an exception, it can overwrite the hash and equality functions while
+  leaving the existing elements in place. This would mean that the function
+  objects wouldn't match the container elements, so elements might be in the
+  wrong bucket and equivalent elements would be incorrectly handled.
+* Various reference documentation improvements.
+* Better allocator support ({svn-ticket-url}/12459[#12459^]).
+* Make the no argument constructors implicit.
+* Implement missing allocator aware constructors.
+* Fix assigning the hash/key equality functions for empty containers.
+* Remove unary/binary_function from the examples in the documentation.
+  They are removed in {cpp}17.
+* Support 10 constructor arguments in emplace. It was meant to support up to 10
+  arguments, but an off by one error in the preprocessor code meant it only
+  supported up to 9.

-[h2 Boost 1.38.0]
+== Release 1.62.0

-* Use [@boost:/libs/core/swap.html `boost::swap`].
-* [@https://svn.boost.org/trac/boost/ticket/2237 Ticket 2237]:
-  Document that the equality and inequality operators are undefined for two
-  objects if their equality predicates aren't equivalent. Thanks to Daniel
-  Krügler.
-* [@https://svn.boost.org/trac/boost/ticket/1710 Ticket 1710]: 
-  Use a larger prime number list. Thanks to Thorsten Ottosen and Hervé
-  Brönnimann.
-* Use
-  [@boost:/libs/type_traits/doc/html/boost_typetraits/category/alignment.html
-  aligned storage] to store the types. This changes the way the allocator is
-  used to construct nodes. It used to construct the node with two calls to
-  the allocator's `construct` method - once for the pointers and once for the
-  value. It now constructs the node with a single call to construct and
-  then constructs the value using in place construction.
-* Add support for C++0x initializer lists where they're available (currently
-  only g++ 4.4 in C++0x mode).
+* Remove use of deprecated `boost::iterator`.
+* Remove `BOOST_NO_STD_DISTANCE` workaround.
+* Remove `BOOST_UNORDERED_DEPRECATED_EQUALITY` warning.
+* Simpler implementation of assignment, fixes an exception safety issue
+  for `unordered_multiset` and `unordered_multimap`. Might be a little slower.
+* Stop using return value SFINAE which some older compilers have issues
+  with.

-[h2 Boost 1.39.0]
+== Release 1.58.0

-* [@https://svn.boost.org/trac/boost/ticket/2756 Ticket 2756]: Avoid a warning
-  on Visual C++ 2009.
-* Some other minor internal changes to the implementation, tests and
-  documentation.
-* Avoid an unnecessary copy in `operator[]`.
-* [@https://svn.boost.org/trac/boost/ticket/2975 Ticket 2975]: Fix length of
-  prime number list.
+* Remove unnecessary template parameter from const iterators.
+* Rename private `iterator` typedef in some iterator classes, as it
+  confuses some traits classes.
+* Fix move assignment with stateful, propagate_on_container_move_assign
+  allocators ({svn-ticket-url}/10777[#10777^]).
+* Fix rare exception safety issue in move assignment.
+* Fix potential overflow when calculating number of buckets to allocate
+  ({github-pr-url}/4[GitHub #4^]).

-[h2 Boost 1.40.0]
+== Release 1.57.0

-* [@https://svn.boost.org/trac/boost/ticket/2975 Ticket 2975]:
-  Store the prime list as a preprocessor sequence - so that it will always get
-  the length right if it changes again in the future.
-* [@https://svn.boost.org/trac/boost/ticket/1978 Ticket 1978]:
-  Implement `emplace` for all compilers.
-* [@https://svn.boost.org/trac/boost/ticket/2908 Ticket 2908],
-  [@https://svn.boost.org/trac/boost/ticket/3096 Ticket 3096]:
-  Some workarounds for old versions of borland, including adding explicit
-  destructors to all containers.
-* [@https://svn.boost.org/trac/boost/ticket/3082 Ticket 3082]:
-  Disable incorrect Visual C++ warnings.
-* Better configuration for C++0x features when the headers aren't available.
-* Create less buckets by default.
+* Fix the `pointer` typedef in iterators ({svn-ticket-url}/10672[#10672^]).
+* Fix Coverity warning
+  ({github-pr-url}/2[GitHub #2^]).

-[h2 Boost 1.41.0 - Major update]
+== Release 1.56.0

-* The original version made heavy use of macros to sidestep some of the older
-  compilers' poor template support. But since I no longer support those
-  compilers and the macro use was starting to become a maintenance burden it
-  has been rewritten to use templates instead of macros for the implementation
-  classes.
+* Fix some shadowed variable warnings ({svn-ticket-url}/9377[#9377^]).
+* Fix allocator use in documentation ({svn-ticket-url}/9719[#9719^]).
+* Always use prime number of buckets for integers. Fixes performance
+  regression when inserting consecutive integers, although makes other
+  uses slower ({svn-ticket-url}/9282[#9282^]).
+* Only construct elements using allocators, as specified in {cpp}11 standard.

-* The container objcet is now smaller thanks to using `boost::compressed_pair`
-  for EBO and a slightly different function buffer - now using a bool instead
-  of a member pointer.
+== Release 1.55.0

-* Buckets are allocated lazily which means that constructing an empty container
-  will not allocate any memory.
-  
-[h2 Boost 1.42.0]
+* Avoid some warnings ({svn-ticket-url}/8851[#8851^], {svn-ticket-url}/8874[#8874^]).
+* Avoid exposing some detail functions via. ADL on the iterators.
+* Follow the standard by only using the allocators' construct and destroy
+  methods to construct and destroy stored elements. Don't use them for internal
+  data like pointers.

-* Support instantiating the containers with incomplete value types.
-* Reduced the number of warnings (mostly in tests).
-* Improved codegear compatibility.
-* [@http://svn.boost.org/trac/boost/ticket/3693 Ticket 3693]:
-  Add `erase_return_void` as a temporary workaround for the current
-  `erase` which can be inefficient because it has to find the next
-  element to return an iterator.
-* Add templated find overload for compatible keys.
-* [@http://svn.boost.org/trac/boost/ticket/3773 Ticket 3773]:
-  Add missing `std` qualifier to `ptrdiff_t`.
-* Some code formatting changes to fit almost all lines into 80 characters.
+== Release 1.54.0

-[h2 Boost 1.43.0]
+* Mark methods specified in standard as `noexpect`. More to come in the next
+  release.
+* If the hash function and equality predicate are known to both have nothrow
+  move assignment or construction then use them.

-* [@http://svn.boost.org/trac/boost/ticket/3966 Ticket 3966]:
-  `erase_return_void` is now `quick_erase`, which is the
-  [@http://home.roadrunner.com/~hinnant/issue_review/lwg-active.html#579
-  current forerunner for resolving the slow erase by iterator], although
-  there's a strong possibility that this may change in the future. The old
-  method name remains for backwards compatibility but is considered deprecated
-  and will be removed in a future release.
-* Use Boost.Exception.
-* Stop using deprecated `BOOST_HAS_*` macros.
+== Release 1.53.0

-[h2 Boost 1.45.0]
+* Remove support for the old pre-standard variadic pair constructors, and
+  equality implementation. Both have been deprecated since Boost 1.48.
+* Remove use of deprecated config macros.
+* More internal implementation changes, including a much simpler
+  implementation of `erase`.

-* Fix a bug when inserting into an `unordered_map` or `unordered_set` using
-  iterators which returns `value_type` by copy.
+== Release 1.52.0

-[h2 Boost 1.48.0 - Major update]
+* Faster assign, which assigns to existing nodes where possible, rather than
+  creating entirely new nodes and copy constructing.
+* Fixed bug in `erase_range` ({svn-ticket-url}/7471[#7471^]).
+* Reverted some of the internal changes to how nodes are created, especially
+  for {cpp}11 compilers. 'construct' and 'destroy' should work a little better
+  for {cpp}11 allocators.
+* Simplified the implementation a bit. Hopefully more robust.
+
+== Release 1.51.0
+
+* Fix construction/destruction issue when using a {cpp}11 compiler with a
+  {cpp}03 allocator ({svn-ticket-url}/7100[#7100^]).
+* Remove a `try..catch` to support compiling without exceptions.
+* Adjust SFINAE use to try to support g++ 3.4 ({svn-ticket-url}/7175[#7175^]).
+* Updated to use the new config macros.
+
+== Release 1.50.0
+
+* Fix equality for `unordered_multiset` and `unordered_multimap`.
+* {svn-ticket-url}/6857[Ticket 6857^]:
+  Implement `reserve`.
+* {svn-ticket-url}/6771[Ticket 6771^]:
+  Avoid gcc's `-Wfloat-equal` warning.
+* {svn-ticket-url}/6784[Ticket 6784^]:
+  Fix some Sun specific code.
+* {svn-ticket-url}/6190[Ticket 6190^]:
+  Avoid gcc's `-Wshadow` warning.
+* {svn-ticket-url}/6905[Ticket 6905^]:
+  Make namespaces in macros compatible with `bcp` custom namespaces.
+  Fixed by Luke Elliott.
+* Remove some of the smaller prime number of buckets, as they may make
+  collisions quite probable (e.g. multiples of 5 are very common because
+  we used base 10).
+* On old versions of Visual {cpp}, use the container library's implementation
+  of `allocator_traits`, as it's more likely to work.
+* On machines with 64 bit std::size_t, use power of 2 buckets, with Thomas
+  Wang's hash function to pick which one to use. As modulus is very slow
+  for 64 bit values.
+* Some internal changes.
+
+== Release 1.49.0
+
+* Fix warning due to accidental odd assignment.
+* Slightly better error messages.
+
+== Release 1.48.0 - Major update

 This is major change which has been converted to use Boost.Move's move
-emulation, and be more compliant with the C++11 standard. See the
-[link unordered.compliance compliance section] for details.
+emulation, and be more compliant with the {cpp}11 standard. See the
+xref:unordered.adoc#compliance[compliance section] for details.

-The container now meets C++11's complexity requirements, but to do so
+The container now meets {cpp}11's complexity requirements, but to do so
 uses a little more memory. This means that `quick_erase` and
 `erase_return_void` are no longer required, they'll be removed in a
 future version.

-C++11 support has resulted in some breaking changes:
+{cpp}11 support has resulted in some breaking changes:

-* Equality comparison has been changed to the C++11 specification.
+* Equality comparison has been changed to the {cpp}11 specification.
  In a container with equivalent keys, elements in a group with equal
  keys used to have to be in the same order to be considered equal,
  now they can be a permutation of each other. To use the old
@@ -166,150 +235,140 @@ C++11 support has resulted in some breaking changes:
  pointers, rather than the allocator's `pointer` type.

 * `emplace` used to emulate the variadic pair constructors that
-  appeared in early C++0x drafts. Since they were removed it no
+  appeared in early {cpp}0x drafts. Since they were removed it no
  longer does so. It does emulate the new `piecewise_construct`
  pair constructors - only you need to use
  `boost::piecewise_construct`. To use the old emulation of
-  the variadic consturctors define
+  the variadic constructors define
  `BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT`.

-[h2 Boost 1.49.0]
+== Release 1.45.0

-* Fix warning due to accidental odd assignment.
-* Slightly better error messages.
+* Fix a bug when inserting into an `unordered_map` or `unordered_set` using
+  iterators which returns `value_type` by copy.

-[h2 Boost 1.50.0]
+== Release 1.43.0

-* Fix equality for `unordered_multiset` and `unordered_multimap`.
-* [@https://svn.boost.org/trac/boost/ticket/6857 Ticket 6857]:
-  Implement `reserve`.
-* [@https://svn.boost.org/trac/boost/ticket/6771 Ticket 6771]:
-  Avoid gcc's `-Wfloat-equal` warning.
-* [@https://svn.boost.org/trac/boost/ticket/6784 Ticket 6784]:
-  Fix some Sun specific code.
-* [@https://svn.boost.org/trac/boost/ticket/6190 Ticket 6190]:
-  Avoid gcc's `-Wshadow` warning.
-* [@https://svn.boost.org/trac/boost/ticket/6905 Ticket 6905]:
-  Make namespaces in macros compatible with `bcp` custom namespaces.
-  Fixed by Luke Elliott.
-* Remove some of the smaller prime number of buckets, as they may make
-  collisions quite probable (e.g. multiples of 5 are very common because
-  we used base 10).
-* On old versions of Visual C++, use the container library's implementation
-  of `allocator_traits`, as it's more likely to work.
-* On machines with 64 bit std::size_t, use power of 2 buckets, with Thomas
-  Wang's hash function to pick which one to use. As modulus is very slow
-  for 64 bit values.
-* Some internal changes.
+* {svn-ticket-url}/3966[Ticket 3966^]:
+  `erase_return_void` is now `quick_erase`, which is the
+  http://home.roadrunner.com/~hinnant/issue_review/lwg-active.html#579[
+  current forerunner for resolving the slow erase by iterator^], although
+  there's a strong possibility that this may change in the future. The old
+  method name remains for backwards compatibility but is considered deprecated
+  and will be removed in a future release.
+* Use Boost.Exception.
+* Stop using deprecated `BOOST_HAS_*` macros.

-[h2 Boost 1.51.0]
+== Release 1.42.0

-* Fix construction/destruction issue when using a C++11 compiler with a
-  C++03 allocator ([ticket 7100]).
-* Remove a `try..catch` to support compiling without exceptions.
-* Adjust SFINAE use to try to supprt g++ 3.4 ([ticket 7175]).
-* Updated to use the new config macros.
+* Support instantiating the containers with incomplete value types.
+* Reduced the number of warnings (mostly in tests).
+* Improved codegear compatibility.
+* {svn-ticket-url}/3693[Ticket 3693^]:
+  Add `erase_return_void` as a temporary workaround for the current
+  `erase` which can be inefficient because it has to find the next
+  element to return an iterator.
+* Add templated find overload for compatible keys.
+* {svn-ticket-url}/3773[Ticket 3773^]:
+  Add missing `std` qualifier to `ptrdiff_t`.
+* Some code formatting changes to fit almost all lines into 80 characters.

-[h2 Boost 1.52.0]
+== Release 1.41.0 - Major update

-* Faster assign, which assigns to existing nodes where possible, rather than
-  creating entirely new nodes and copy constructing.
-* Fixed bug in `erase_range` ([ticket 7471]).
-* Reverted some of the internal changes to how nodes are created, especially
-  for C++11 compilers. 'construct' and 'destroy' should work a little better
-  for C++11 allocators.
-* Simplified the implementation a bit. Hopefully more robust.
+* The original version made heavy use of macros to sidestep some of the older
+  compilers' poor template support. But since I no longer support those
+  compilers and the macro use was starting to become a maintenance burden it
+  has been rewritten to use templates instead of macros for the implementation
+  classes.

-[h2 Boost 1.53.0]
+* The container object is now smaller thanks to using `boost::compressed_pair`
+  for EBO and a slightly different function buffer - now using a bool instead
+  of a member pointer.

-* Remove support for the old pre-standard variadic pair constructors, and
-  equality implementation. Both have been deprecated since Boost 1.48.
-* Remove use of deprecated config macros.
-* More internal implementation changes, including a much simpler
-  implementation of `erase`.
+* Buckets are allocated lazily which means that constructing an empty container
+  will not allocate any memory.

-[h2 Boost 1.54.0]
+== Release 1.40.0

-* Mark methods specified in standard as `noexpect`. More to come in the next
-  release.
-* If the hash function and equality predicate are known to both have nothrow
-  move assignment or construction then use them.
+* {svn-ticket-url}/2975[Ticket 2975^]:
+  Store the prime list as a preprocessor sequence - so that it will always get
+  the length right if it changes again in the future.
+* {svn-ticket-url}/1978[Ticket 1978^]:
+  Implement `emplace` for all compilers.
+* {svn-ticket-url}/2908[Ticket 2908^],
+  {svn-ticket-url}/3096[Ticket 3096^]:
+  Some workarounds for old versions of borland, including adding explicit
+  destructors to all containers.
+* {svn-ticket-url}/3082[Ticket 3082^]:
+  Disable incorrect Visual {cpp} warnings.
+* Better configuration for {cpp}0x features when the headers aren't available.
+* Create less buckets by default.

-[h2 Boost 1.55.0]
+== Release 1.39.0

-* Avoid some warnings ([ticket 8851], [ticket 8874]).
-* Avoid exposing some detail functions via. ADL on the iterators.
-* Follow the standard by only using the allocators' construct and destroy
-  methods to construct and destroy stored elements. Don't use them for internal
-  data like pointers.
+* {svn-ticket-url}/2756[Ticket 2756^]: Avoid a warning
+  on Visual {cpp} 2009.
+* Some other minor internal changes to the implementation, tests and
+  documentation.
+* Avoid an unnecessary copy in `operator[]`.
+* {svn-ticket-url}/2975[Ticket 2975^]: Fix length of
+  prime number list.

-[h2 Boost 1.56.0]
+== Release 1.38.0

-* Fix some shadowed variable warnings ([ticket 9377]).
-* Fix allocator use in documentation ([ticket 9719]).
-* Always use prime number of buckets for integers. Fixes performance
-  regression when inserting consecutive integers, although makes other
-  uses slower ([ticket 9282]).
-* Only construct elements using allocators, as specified in C++11 standard.
+* Use link:../../../core/swap.html[`boost::swap`^].
+* {svn-ticket-url}/2237[Ticket 2237^]:
+  Document that the equality and inequality operators are undefined for two
+  objects if their equality predicates aren't equivalent. Thanks to Daniel
+  Krügler.
+* {svn-ticket-url}/1710[Ticket 1710^]:
+  Use a larger prime number list. Thanks to Thorsten Ottosen and Hervé
+  Brönnimann.
+* Use
+  link:../../../type_traits/index.html[aligned storage^] to store the types.
+  This changes the way the allocator is used to construct nodes. It used to
+  construct the node with two calls to the allocator's `construct`
+  method - once for the pointers and once for the value. It now constructs
+  the node with a single call to construct and then constructs the value using
+  in place construction.
+* Add support for {cpp}0x initializer lists where they're available (currently
+  only g++ 4.4 in {cpp}0x mode).

-[h2 Boost 1.57.0]
+== Release 1.37.0

-* Fix the `pointer` typedef in iterators ([ticket 10672]).
-* Fix Coverity warning
-  ([@https://github.com/boostorg/unordered/pull/2 GitHub #2]).
+* Rename overload of `emplace` with hint, to `emplace_hint` as specified in
+  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2691.pdf[n2691^].
+* Provide forwarding headers at `<boost/unordered/unordered_map_fwd.hpp>` and
+  `<boost/unordered/unordered_set_fwd.hpp>`.
+* Move all the implementation inside `boost/unordered`, to assist
+  modularization and hopefully make it easier to track Release subversion.

-[h2 Boost 1.58.0]
+== Release 1.36.0

-* Remove unnecessary template parameter from const iterators.
-* Rename private `iterator` typedef in some iterator classes, as it
-  confuses some traits classes.
-* Fix move assignment with stateful, propagate_on_container_move_assign
-  allocators ([ticket 10777]).
-* Fix rare exception safety issue in move assignment.
-* Fix potential overflow when calculating number of buckets to allocate
-  ([@https://github.com/boostorg/unordered/pull/4 GitHub #4]).
+First official release.

-[h2 Boost 1.62.0]
+* Rearrange the internals.
+* Move semantics - full support when rvalue references are available, emulated
+  using a cut down version of the Adobe move library when they are not.
+* Emplace support when rvalue references and variadic template are available.
+* More efficient node allocation when rvalue references and variadic template
+  are available.
+* Added equality operators.

-* Remove use of deprecated `boost::iterator`.
-* Remove `BOOST_NO_STD_DISTANCE` workaround.
-* Remove `BOOST_UNORDERED_DEPRECATED_EQUALITY` warning.
-* Simpler implementation of assignment, fixes an exception safety issue
-  for `unordered_multiset` and `unordered_multimap`. Might be a little slower.
-* Stop using return value SFINAE which some older compilers have issues
-  with.
+== Boost 1.35.0 Add-on - 31st March 2008

-[h2 Boost 1.63.0]
+Unofficial release uploaded to vault, to be used with Boost 1.35.0. Incorporated
+many of the suggestions from the review.

-* Check hint iterator in `insert`/`emplace_hint`.
-* Fix some warnings, mostly in the tests.
-* Manually write out `emplace_args` for small numbers of arguments -
-  should make template error messages a little more bearable.
-* Remove superfluous use of `boost::forward` in emplace arguments,
-  which fixes emplacing string literals in old versions of Visual C++.
-* Fix an exception safety issue in assignment. If bucket allocation
-  throws an exception, it can overwrite the hash and equality functions while
-  leaving the existing elements in place. This would mean that the function
-  objects wouldn't match the container elements, so elements might be in the
-  wrong bucket and equivalent elements would be incorrectly handled.
-* Various reference documentation improvements.
-* Better allocator support ([ticket 12459]).
-* Make the no argument constructors implicit.
-* Implement missing allocator aware constructors.
-* Fix assigning the hash/key equality functions for empty containers.
-* Remove unary/binary_function from the examples in the documentation.
-  They are removed in C++17.
-* Support 10 constructor arguments in emplace. It was meant to support up to 10
-  arguments, but an off by one error in the preprocessor code meant it only
-  supported up to 9.
+* Improved portability thanks to Boost regression testing.
+* Fix lots of typos, and clearer text in the documentation.
+* Fix floating point to `std::size_t` conversion when calculating sizes from
+  the max load factor, and use `double` in the calculation for greater accuracy.
+* Fix some errors in the examples.
+
+== Review Version
+
+Initial review version, for the review conducted from 7th December 2007 to
+16th December 2007.

-[h2 Boost 1.64.0]
-* Initial support for new C++17 member functions:
-  `insert_or_assign` and `try_emplace` in `unordered_map`,
-* Initial support for `merge` and `extract`.
-  Does not include transfering nodes between
-  `unordered_map` and `unordered_multimap` or between `unordered_set` and
-  `unordered_multiset` yet. That will hopefully be in the next version of
-  Boost.

-[endsect]
@@ -0,0 +1,112 @@
+[#comparison]
+
+:idprefix: comparison_
+
+= Comparison with Associative Containers
+
+[caption=, title='Table {counter:table-counter} Interface differences']
+[cols="1,1", frame=all, grid=rows]
+|===
+|Associative Containers |Unordered Associative Containers
+
+|Parameterized by an ordering relation `Compare`
+|Parameterized by a function object `Hash` and an equivalence relation `Pred`
+
+|Keys can be compared using `key_compare` which is accessed by member function `key_comp()`, values can be compared using `value_compare` which is accessed by member function `value_comp()`.
+|Keys can be hashed using `hasher` which is accessed by member function `hash_function()`, and checked for equality using `key_equal` which is accessed by member function `key_eq()`. There is no function object for compared or hashing values.
+
+|Constructors have optional extra parameters for the comparison object. 
+|Constructors have optional extra parameters for the initial minimum number of buckets, a hash function and an equality object.
+
+|Keys `k1`, `k2` are considered equivalent if `!Compare(k1, k2) && !Compare(k2, k1)`. 
+|Keys `k1`, `k2` are considered equivalent if `Pred(k1, k2)`
+
+|Member function `lower_bound(k)` and `upper_bound(k)`
+|No equivalent. Since the elements aren't ordered `lower_bound` and `upper_bound` would be meaningless.
+
+|`equal_range(k)` returns an empty range at the position that `k` would be inserted if `k` isn't present in the container.
+|`equal_range(k)` returns a range at the end of the container if `k` isn't present in the container. It can't return a positioned range as `k` could be inserted into multiple place. To find out the bucket that `k` would be inserted into use `bucket(k)`. But remember that an insert can cause the container to rehash - meaning that the element can be inserted into a different bucket.
+
+|`iterator`, `const_iterator` are of the bidirectional category.
+|`iterator`, `const_iterator` are of at least the forward category.
+
+|Iterators, pointers and references to the container's elements are never invalidated.
+|<<buckets_iterator_invalidation,Iterators can be invalidated by calls to insert or rehash>>. Pointers and references to the container's elements are never invalidated.
+
+|Iterators iterate through the container in the order defined by the comparison object.
+|Iterators iterate through the container in an arbitrary order, that can change as elements are inserted, although equivalent elements are always adjacent.
+
+|No equivalent
+|Local iterators can be used to iterate through individual buckets. (The order of local iterators and iterators aren't required to have any correspondence.)
+
+|Can be compared using the `==`, `!=`, `<`, `\<=`, `>`, `>=` operators.
+|Can be compared using the `==` and `!=` operators.
+
+|
+|When inserting with a hint, implementations are permitted to ignore the hint.
+
+|`erase` never throws an exception
+|The containers' hash or predicate function can throw exceptions from `erase`.
+
+|===
+
+---
+
+[caption=, title='Table {counter:table-counter} Complexity Guarantees']
+[cols="1,1,1", frame=all, grid=rows]
+|===
+|Operation |Associative Containers |Unordered Associative Containers
+
+|Construction of empty container
+|constant
+|O(_n_) where _n_ is the minimum number of buckets.
+
+|Construction of container from a range of _N_ elements
+|O(_N log N_), O(_N_) if the range is sorted with `value_comp()`
+|Average case O(_N_), worst case O(_N^2^_)
+
+|Insert a single element
+|logarithmic
+|Average case constant, worst case linear
+
+|Insert a single element with a hint
+|Amortized constant if `t` elements inserted right after hint, logarithmic otherwise
+|Average case constant, worst case linear (ie. the same as a normal insert).
+
+|Inserting a range of _N_ elements
+|_N_ log(`size()` + _N_)
+|Average case O(_N_), worst case O(_N_ * `size()`)
+
+|Erase by key, `k`
+|O(log(`size()`) + `count(k)`)
+|Average case: O(`count(k)`), Worst case: O(`size()`)
+
+|Erase a single element by iterator
+|Amortized constant
+|Average case: O(1), Worst case: O(`size()`)
+
+|Erase a range of _N_ elements
+|O(log(`size()`) + _N_)
+|Average case: O(_N_), Worst case: O(`size()`)
+
+|Clearing the container
+|O(`size()`)
+|O(`size()`)
+
+|Find
+|logarithmic
+|Average case: O(1), Worst case: O(`size()`)
+
+|Count
+|O(log(`size()`) + `count(k)`)
+|Average case: O(1), Worst case: O(`size()`)
+
+|`equal_range(k)`
+|logarithmic
+|Average case: O(`count(k)`), Worst case: O(`size()`)
+
+|`lower_bound`,`upper_bound`
+|logarithmic
+|n/a
+
+|===
@@ -1,10 +1,17 @@
-[/ Copyright 2011 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) ]
+[#compliance]
+= Standard Compliance

-[section:compliance C++11 Compliance]
+:idprefix: compliance_

-[section:move Move emulation]
+:cpp: C++
+
+The intent of Boost.Unordered is to implement a close (but imperfect)
+implementation of the {cpp}17 standard, that will work with {cpp}98 upwards.
+The wide compatibility does mean some comprimises have to be made.
+With a compiler and library that fully support {cpp}11, the differences should
+be minor.
+
+== Move emulation

 Support for move semantics is implemented using Boost.Move. If rvalue
 references are available it will use them, but if not it uses a close,
@@ -16,11 +23,9 @@ but imperfect emulation. On such compilers:
 * The containers themselves are not movable.
 * Argument forwarding is not perfect.

-[endsect]
+== Use of allocators

-[section:allocator_compliance Use of allocators]
-
-C++11 introduced a new allocator system. It's backwards compatible due to
+{cpp}11 introduced a new allocator system. It's backwards compatible due to
 the lax requirements for allocators in the old standard, but might need
 some changes for allocators which worked with the old versions of the
 unordered containers.
@@ -51,23 +56,27 @@ Due to imperfect move emulation, some assignments might check
 `propagate_on_container_copy_assignment` on some compilers and
 `propagate_on_container_move_assignment` on others.

-The use of the allocator's construct and destruct methods might be a bit
-surprising.
-Nodes are constructed and destructed using the allocator, but the elements
-are stored in aligned space within the node and constructed and destructed
-by calling the constructor and destructor directly.
+== Construction/Destruction using allocators

-In C++11 the allocator's construct function has the signature:
+The following support is required for full use of {cpp}11 style
+construction/destruction:

-    template <class U, class... Args>
-    void construct(U* p, Args&&... args);
+* Variadic templates.
+* Piecewise construction of `std::pair`.
+* Either `std::allocator_traits` or expression SFINAE.

-which supports calling `construct` for the contained object, but
-most existing allocators don't support this. If member function detection
-was good enough then with old allocators it would fall back to calling
-the element's constructor directly but in general, detection isn't good
-enough to do this which is why Boost.Unordered just calls the constructor
-directly every time. In most cases this will work okay.
+This is detected using Boost.Config. The macro
+`BOOST_UNORDERED_CXX11_CONSTRUCTION` will be set to 1 if it is found, or 0
+otherwise.
+
+When this is the case `allocator_traits::construct` and
+`allocator_traits::destroy` will always be used, apart from when piecewise
+constructing a `std::pair` using `boost::tuple` (see <<compliance_pairs,below>>), but that should be easily avoided.
+
+When support is not available `allocator_traits::construct` and
+`allocator_traits::destroy` are never called.
+
+== Pointer Traits

 `pointer_traits` aren't used. Instead, pointer types are obtained from
 rebound allocators, this can cause problems if the allocator can't be
@@ -75,38 +84,33 @@ used with incomplete types. If `const_pointer` is not defined in the
 allocator, `boost::pointer_to_other<pointer, const value_type>::type`
 is used to obtain a const pointer.

-[endsect]
-
-[section:pairs Pairs]
+== Pairs

 Since the containers use `std::pair` they're limited to the version
-from the current standard library. But since C++11 `std::pair`'s
+from the current standard library. But since {cpp}11 ``std::pair``'s
 `piecewise_construct` based constructor is very useful, `emplace`
 emulates it with a `piecewise_construct` in the `boost::unordered`
 namespace. So for example, the following will work:

-    boost::unordered_multimap<std::string, std::complex> x;
+[source,c++]
+----
+boost::unordered_multimap<std::string, std::complex> x;

-    x.emplace(
-        boost::unordered::piecewise_construct,
-        boost::make_tuple("key"), boost::make_tuple(1, 2));
+x.emplace(
+    boost::unordered::piecewise_construct,
+    boost::make_tuple("key"), boost::make_tuple(1, 2));
+----

 Older drafts of the standard also supported variadic constructors
 for `std::pair`, where the first argument would be used for the
 first part of the pair, and the remaining for the second part.

-[endsect]
-
-[section:misc Miscellaneous]
+== Miscellaneous

 When swapping, `Pred` and `Hash` are not currently swapped by calling
 `swap`, their copy constructors are used. As a consequence when swapping
-an exception may be throw from their  copy constructor.
+an exception may be thrown from their copy constructor.

 Variadic constructor arguments for `emplace` are only used when both
 rvalue references and variadic template parameters are available.
 Otherwise `emplace` can only take up to 10 constructors arguments.
-
-[endsect]
-
-[endsect]
@@ -0,0 +1,12 @@
+[#copyright]
+= Copyright and License
+
+:idprefix: copyright_
+
+*Daniel James*
+
+Copyright (C) 2003, 2004 Jeremy B. Maitin-Shepard
+
+Copyright (C) 2005-2008 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)
@@ -0,0 +1,149 @@
+[#hash_equality]
+
+:idprefix: hash_equality_
+
+= Equality Predicates and Hash Functions
+
+While the associative containers use an ordering relation to specify how the
+elements are stored, the unordered associative containers use an equality
+predicate and a hash function. For example, <<unordered_map,boost::unordered_map>>
+is declared as:
+
+```
+template <
+    class Key, class Mapped,
+    class Hash = boost::hash<Key>,
+    class Pred = std::equal_to<Key>,
+    class Alloc = std::allocator<std::pair<Key const, Mapped> > >
+class unordered_map;
+```
+
+The hash function comes first as you might want to change the hash function
+but not the equality predicate. For example, if you wanted to use the
+http://www.isthe.com/chongo/tech/comp/fnv/[FNV-1 hash^] you could write:
+
+```
+boost::unordered_map<std::string, int, hash::fnv_1>
+    dictionary;
+```
+
+There is an link:../../examples/fnv1.hpp[implementation of FNV-1^] in the examples directory.
+
+If you wish to use a different equality function, you will also need to use a matching hash function. For example, to implement a case insensitive dictionary you need to define a case insensitive equality predicate and hash function:
+
+```
+struct iequal_to
+{
+    bool operator()(std::string const& x,
+        std::string const& y) const
+    {
+        return boost::algorithm::iequals(x, y, std::locale());
+    }
+};
+
+struct ihash
+{
+    std::size_t operator()(std::string const& x) const
+    {
+        std::size_t seed = 0;
+        std::locale locale;
+
+        for(std::string::const_iterator it = x.begin();
+            it != x.end(); ++it)
+        {
+            boost::hash_combine(seed, std::toupper(*it, locale));
+        }
+
+        return seed;
+    }
+};
+```
+
+Which you can then use in a case insensitive dictionary:
+```
+boost::unordered_map<std::string, int, ihash, iequal_to>
+    idictionary;
+```
+
+This is a simplified version of the example at
+link:../../examples/case_insensitive.hpp[/libs/unordered/examples/case_insensitive.hpp^] which supports other locales and string types.
+
+CAUTION: Be careful when using the equality (`==`) operator with custom equality
+predicates, especially if you're using a function pointer. If you compare two
+containers with different equality predicates then the result is undefined.
+For most stateless function objects this is impossible - since you can only
+compare objects with the same equality predicate you know the equality
+predicates must be equal. But if you're using function pointers or a stateful
+equality predicate (e.g. `boost::function`) then you can get into trouble.
+
+== Custom Types
+
+Similarly, a custom hash function can be used for custom types:
+
+```
+struct point {
+    int x;
+    int y;
+};
+
+bool operator==(point const& p1, point const& p2)
+{
+    return p1.x == p2.x && p1.y == p2.y;
+}
+
+struct point_hash
+{
+    std::size_t operator()(point const& p) const
+    {
+        std::size_t seed = 0;
+        boost::hash_combine(seed, p.x);
+        boost::hash_combine(seed, p.y);
+        return seed;
+    }
+};
+
+boost::unordered_multiset<point, point_hash> points;
+```
+
+Since the default hash function is link:../../../container_hash/index.html[Boost.Hash^],
+we can extend it to support the type so that the hash function doesn't need to be explicitly given:
+
+```
+struct point {
+    int x;
+    int y;
+};
+
+bool operator==(point const& p1, point const& p2)
+{
+    return p1.x == p2.x && p1.y == p2.y;
+}
+
+std::size_t hash_value(point const& p) {
+    std::size_t seed = 0;
+    boost::hash_combine(seed, p.x);
+    boost::hash_combine(seed, p.y);
+    return seed;
+}
+
+// Now the default function objects work.
+boost::unordered_multiset<point> points;
+```
+
+See the link:../../../container_hash/index.html[Boost.Hash documentation^] for more detail on how to
+do this. Remember that it relies on extensions to the standard - so it
+won't work for other implementations of the unordered associative containers,
+you'll need to explicitly use Boost.Hash.
+
+[caption=, title='Table {counter:table-counter} Methods for accessing the hash and equality functions']
+[cols="1,.^1", frame=all, grid=rows]
+|===
+|Method |Description
+
+|`hasher hash_function() const` 
+|Returns the container's hash function.
+
+|`key_equal key_eq() const` 
+|Returns the container's key equality function..
+
+|===
@@ -0,0 +1,116 @@
+[#intro]
+= Introduction
+
+:idprefix: intro_
+:cpp: C++
+
+For accessing data based on key lookup, the {cpp} standard library offers `std::set`,
+`std::map`, `std::multiset` and `std::multimap`. These are generally
+implemented using balanced binary trees so that lookup time has
+logarithmic complexity. That is generally okay, but in many cases a
+link:https://en.wikipedia.org/wiki/Hash_table[hash table^] can perform better, as accessing data has constant complexity,
+on average. The worst case complexity is linear, but that occurs rarely and
+with some care, can be avoided.
+
+Also, the existing containers require a 'less than' comparison object
+to order their elements. For some data types this is impossible to implement
+or isn't practical. In contrast, a hash table only needs an equality function
+and a hash function for the key.
+
+With this in mind, unordered associative containers were added to the {cpp}
+standard. This is an implementation of the containers described in {cpp}11,
+with some <<compliance,deviations from the standard>> in
+order to work with non-{cpp}11 compilers and libraries.
+
+`unordered_set` and `unordered_multiset` are defined in the header
+`<boost/unordered_set.hpp>`
+[source,c++]
+----  
+namespace boost {
+    template <
+        class Key,
+        class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key>,
+        class Alloc = std::allocator<Key> >
+    class unordered_set;
+
+    template<
+        class Key,
+        class Hash = boost::hash<Key>, 
+        class Pred = std::equal_to<Key>, 
+        class Alloc = std::allocator<Key> > 
+    class unordered_multiset;
+}
+----
+
+`unordered_map` and `unordered_multimap` are defined in the header
+`<boost/unordered_map.hpp>`
+
+[source,c++]
+----
+namespace boost {
+    template <
+        class Key, class Mapped,
+        class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key>,
+        class Alloc = std::allocator<std::pair<Key const, Mapped> > >
+    class unordered_map;
+
+    template<
+        class Key, class Mapped,
+        class Hash = boost::hash<Key>,
+        class Pred = std::equal_to<Key>,
+        class Alloc = std::allocator<std::pair<Key const, Mapped> > >
+    class unordered_multimap;
+}
+----
+
+When using Boost.TR1, these classes are included from `<unordered_set>` and
+`<unordered_map>`, with the classes added to the `std::tr1` namespace.
+
+The containers are used in a similar manner to the normal associative
+containers:
+
+[source,cpp]
+----
+typedef boost::unordered_map<std::string, int> map;
+map x;
+x["one"] = 1;
+x["two"] = 2;
+x["three"] = 3;
+
+assert(x.at("one") == 1);
+assert(x.find("missing") == x.end());
+----
+
+But since the elements aren't ordered, the output of:
+
+[source,c++]
+----
+BOOST_FOREACH(map::value_type i, x) {
+    std::cout<<i.first<<","<<i.second<<"\n";
+}
+----
+
+can be in any order. For example, it might be:
+
+[source]
+----
+two,2
+one,1
+three,3
+----
+
+To store an object in an unordered associative container requires both a
+key equality function and a hash function. The default function objects in
+the standard containers support a few basic types including integer types,
+floating point types, pointer types, and the standard strings. Since
+Boost.Unordered uses link:../../../container_hash/index.html[boost::hash^] it also supports some other types,
+including standard containers. To use any types not supported by these methods
+you have to extend Boost.Hash to support the type or use
+your own custom equality predicates and hash functions. See the
+<<hash_equality,Equality Predicates and Hash Functions>> section
+for more details.
+
+There are other differences, which are listed in the
+<<comparison,Comparison with Associative Containers>> section.
@@ -0,0 +1,68 @@
+[#rationale]
+
+:idprefix: rationale_
+
+= Implementation Rationale
+
+The intent of this library is to implement the unordered
+containers in the standard, so the interface was fixed. But there are
+still some implementation decisions to make. The priorities are
+conformance to the standard and portability.
+
+The http://en.wikipedia.org/wiki/Hash_table[Wikipedia article on hash tables^]
+has a good summary of the implementation issues for hash tables in general.
+
+== Data Structure
+
+By specifying an interface for accessing the buckets of the container the
+standard pretty much requires that the hash table uses chained addressing.
+
+It would be conceivable to write a hash table that uses another method. For
+example, it could use open addressing, and use the lookup chain to act as a
+bucket but there are some serious problems with this:
+
+* The standard requires that pointers to elements aren't invalidated, so
+  the elements can't be stored in one array, but will need a layer of
+  indirection instead - losing the efficiency and most of the memory gain,
+  the main advantages of open addressing.
+* Local iterators would be very inefficient and may not be able to
+  meet the complexity requirements.
+* There are also the restrictions on when iterators can be invalidated. Since
+  open addressing degrades badly when there are a high number of collisions the
+  restrictions could prevent a rehash when it's really needed. The maximum load
+  factor could be set to a fairly low value to work around this - but the
+  standard requires that it is initially set to 1.0.
+* And since the standard is written with a eye towards chained
+  addressing, users will be surprised if the performance doesn't reflect that.
+
+So chained addressing is used.
+
+== Number of Buckets
+
+There are two popular methods for choosing the number of buckets in a hash
+table. One is to have a prime number of buckets, another is to use a power
+of 2.
+
+Using a prime number of buckets, and choosing a bucket by using the modulus
+of the hash function's result will usually give a good result. The downside
+is that the required modulus operation is fairly expensive. This is what the
+containers used to do in most cases.
+
+Using a power of 2 allows for much quicker selection of the bucket to use,
+but at the expense of losing the upper bits of the hash value. For some
+specially designed hash functions it is possible to do this and still get a
+good result but as the containers can take arbitrary hash functions this can't
+be relied on.
+
+To avoid this a transformation could be applied to the hash function, for an
+example see
+http://web.archive.org/web/20121102023700/http://www.concentric.net/~Ttwang/tech/inthash.htm[Thomas Wang's article on integer hash functions^].
+Unfortunately, a transformation like Wang's requires knowledge of the number
+of bits in the hash value, so it was only used when `size_t` was 64 bit.
+
+Since release 1.79.0, https://en.wikipedia.org/wiki/Hash_function#Fibonacci_hashing[Fibonacci hashing]
+is used instead. With this implementation, the bucket number is determined
+by using `(h * m) >> (w - k)`, where `h` is the hash value, `m` is the golden
+ratio multiplied by `2^w`, `w` is the word size (32 or 64), and `2^k` is the
+number of buckets. This provides a good compromise between speed and
+distribution.
@@ -0,0 +1,7 @@
+[#reference]
+= Reference
+
+include::unordered_map.adoc[]
+include::unordered_multimap.adoc[]
+include::unordered_set.adoc[]
+include::unordered_multiset.adoc[]
@@ -4,7 +4,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 #include "./case_insensitive.hpp"
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/unordered_map.hpp>

 struct word_info {
@@ -11,6 +11,8 @@
 #pragma once
 #endif

+#include <boost/predef.h>
+
 #if defined(BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT)
 // Already defined.
 #elif defined(BOOST_LIBSTDCXX11)
@@ -18,20 +20,24 @@
 #if BOOST_LIBSTDCXX_VERSION > 40600
 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
 #endif
-#elif defined(_LIBCPP_VERSION)
+#elif BOOST_LIB_STD_CXX
 // https://github.com/llvm-mirror/libcxx/blob/release_30/include/utility#L206
-#if LIBCPP_VERSION >= 3000
+#if BOOST_LIB_STD_CXX >= BOOST_VERSION_NUMBER(3, 0, 0)
 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
 #endif
-#elif defined(BOOST_MSVC)
+#elif defined(BOOST_LIB_STD_DINKUMWARE)
 // Apparently C++11 standard supported in Visual Studio 2012
 // https://msdn.microsoft.com/en-us/library/hh567368.aspx#stl
 // 2012 = VC+11 = BOOST_MSVC 1700 Hopefully!
-#if BOOST_MSVC >= 1700
+// I have no idea when Dinkumware added it, probably a lot
+// earlier than this check.
+#if BOOST_LIB_STD_DINKUMWARE >= BOOST_VERSION_NUMBER(6, 50, 0) ||              \
+  BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(17, 0, 0)
 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
 #endif
 #endif

+// Assume that an unknown library does not support piecewise construction.
 #if !defined(BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT)
 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 0
 #endif
@@ -41,17 +47,17 @@
 #endif

 namespace boost {
-namespace unordered {
+  namespace unordered {
 #if BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT
-using std::piecewise_construct_t;
-using std::piecewise_construct;
+    using std::piecewise_construct_t;
+    using std::piecewise_construct;
 #else
-struct piecewise_construct_t
-{
-};
-const piecewise_construct_t piecewise_construct = piecewise_construct_t();
+    struct piecewise_construct_t
+    {
+    };
+    const piecewise_construct_t piecewise_construct = piecewise_construct_t();
 #endif
-}
+  }
 }

 #endif
@@ -7,101 +7,61 @@
 #include <boost/unordered/unordered_map_fwd.hpp>

 namespace boost {
-namespace unordered {
-namespace detail {
-template <typename A, typename K, typename M, typename H, typename P> struct map
-{
-    typedef boost::unordered::detail::map<A, K, M, H, P> types;
+  namespace unordered {
+    namespace detail {
+      template <typename A, typename K, typename M, typename H, typename P>
+      struct map
+      {
+        typedef boost::unordered::detail::map<A, K, M, H, P> types;

-    typedef std::pair<K const, M> value_type;
-    typedef H hasher;
-    typedef P key_equal;
-    typedef K const const_key_type;
+        typedef std::pair<K const, M> value_type;
+        typedef H hasher;
+        typedef P key_equal;
+        typedef K const const_key_type;

-    typedef typename ::boost::unordered::detail::rebind_wrap<A,
-        value_type>::type value_allocator;
-    typedef boost::unordered::detail::allocator_traits<value_allocator>
-        value_allocator_traits;
+        typedef
+          typename ::boost::unordered::detail::rebind_wrap<A, value_type>::type
+            value_allocator;
+        typedef boost::unordered::detail::allocator_traits<value_allocator>
+          value_allocator_traits;

-    typedef boost::unordered::detail::pick_node<A, value_type> pick;
-    typedef typename pick::node node;
-    typedef typename pick::bucket bucket;
-    typedef typename pick::link_pointer link_pointer;
-    typedef typename pick::node_algo node_algo;
+        typedef boost::unordered::detail::pick_node<A, value_type> pick;
+        typedef typename pick::node node;
+        typedef typename pick::bucket bucket;
+        typedef typename pick::link_pointer link_pointer;

-    typedef boost::unordered::detail::table_impl<types> table;
-    typedef boost::unordered::detail::map_extractor<value_type> extractor;
+        typedef boost::unordered::detail::table<types> table;
+        typedef boost::unordered::detail::map_extractor<value_type> extractor;

-    typedef typename boost::unordered::detail::pick_policy<K>::type policy;
+        typedef typename boost::unordered::detail::pick_policy<K>::type policy;

-    typedef boost::unordered::iterator_detail::iterator<node> iterator;
-    typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
-    typedef boost::unordered::iterator_detail::l_iterator<node, policy>
-        l_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        cl_iterator;
+        typedef boost::unordered::iterator_detail::iterator<node> iterator;
+        typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
+        typedef boost::unordered::iterator_detail::l_iterator<node> l_iterator;
+        typedef boost::unordered::iterator_detail::cl_iterator<node>
+          cl_iterator;

-    typedef boost::unordered::node_handle_map<node, K, M, A> node_type;
-    typedef boost::unordered::insert_return_type_map<node, K, M, A>
-        insert_return_type;
-};
+        typedef boost::unordered::node_handle_map<node, K, M, A> node_type;
+        typedef boost::unordered::insert_return_type_map<node, K, M, A>
+          insert_return_type;
+      };

-template <typename A, typename K, typename M, typename H, typename P>
-struct multimap
-{
-    typedef boost::unordered::detail::multimap<A, K, M, H, P> types;
+      template <typename K, typename M, typename H, typename P, typename A>
+      class instantiate_map
+      {
+        typedef boost::unordered_map<K, M, H, P, A> container;
+        container x;
+        typename container::node_type node_type;
+        typename container::insert_return_type insert_return_type;
+      };

-    typedef std::pair<K const, M> value_type;
-    typedef H hasher;
-    typedef P key_equal;
-    typedef K const const_key_type;
-
-    typedef typename ::boost::unordered::detail::rebind_wrap<A,
-        value_type>::type value_allocator;
-    typedef boost::unordered::detail::allocator_traits<value_allocator>
-        value_allocator_traits;
-
-#if BOOST_UNORDERED_INTEROPERABLE_NODES
-    typedef boost::unordered::detail::pick_node<A, value_type> pick;
-#else
-    typedef boost::unordered::detail::pick_grouped_node<A, value_type> pick;
-#endif
-    typedef typename pick::node node;
-    typedef typename pick::bucket bucket;
-    typedef typename pick::link_pointer link_pointer;
-    typedef typename pick::node_algo node_algo;
-
-    typedef boost::unordered::detail::grouped_table_impl<types> table;
-    typedef boost::unordered::detail::map_extractor<value_type> extractor;
-
-    typedef typename boost::unordered::detail::pick_policy<K>::type policy;
-
-    typedef boost::unordered::iterator_detail::iterator<node> iterator;
-    typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
-    typedef boost::unordered::iterator_detail::l_iterator<node, policy>
-        l_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        cl_iterator;
-
-    typedef boost::unordered::node_handle_map<node, K, M, A> node_type;
-};
-
-template <typename K, typename M, typename H, typename P, typename A>
-class instantiate_map
-{
-    typedef boost::unordered_map<K, M, H, P, A> container;
-    container x;
-    typename container::node_type node_type;
-    typename container::insert_return_type insert_return_type;
-};
-
-template <typename K, typename M, typename H, typename P, typename A>
-class instantiate_multimap
-{
-    typedef boost::unordered_multimap<K, M, H, P, A> container;
-    container x;
-    typename container::node_type node_type;
-};
-}
-}
+      template <typename K, typename M, typename H, typename P, typename A>
+      class instantiate_multimap
+      {
+        typedef boost::unordered_multimap<K, M, H, P, A> container;
+        container x;
+        typename container::node_type node_type;
+      };
+    }
+  }
 }
@@ -7,99 +7,60 @@
 #include <boost/unordered/unordered_set_fwd.hpp>

 namespace boost {
-namespace unordered {
-namespace detail {
-template <typename A, typename T, typename H, typename P> struct set
-{
-    typedef boost::unordered::detail::set<A, T, H, P> types;
+  namespace unordered {
+    namespace detail {
+      template <typename A, typename T, typename H, typename P> struct set
+      {
+        typedef boost::unordered::detail::set<A, T, H, P> types;

-    typedef T value_type;
-    typedef H hasher;
-    typedef P key_equal;
-    typedef T const const_key_type;
+        typedef T value_type;
+        typedef H hasher;
+        typedef P key_equal;
+        typedef T const const_key_type;

-    typedef typename ::boost::unordered::detail::rebind_wrap<A,
-        value_type>::type value_allocator;
-    typedef boost::unordered::detail::allocator_traits<value_allocator>
-        value_allocator_traits;
+        typedef
+          typename ::boost::unordered::detail::rebind_wrap<A, value_type>::type
+            value_allocator;
+        typedef boost::unordered::detail::allocator_traits<value_allocator>
+          value_allocator_traits;

-    typedef boost::unordered::detail::pick_node<A, value_type> pick;
-    typedef typename pick::node node;
-    typedef typename pick::bucket bucket;
-    typedef typename pick::link_pointer link_pointer;
-    typedef typename pick::node_algo node_algo;
+        typedef boost::unordered::detail::pick_node<A, value_type> pick;
+        typedef typename pick::node node;
+        typedef typename pick::bucket bucket;
+        typedef typename pick::link_pointer link_pointer;

-    typedef boost::unordered::detail::table_impl<types> table;
-    typedef boost::unordered::detail::set_extractor<value_type> extractor;
+        typedef boost::unordered::detail::table<types> table;
+        typedef boost::unordered::detail::set_extractor<value_type> extractor;

-    typedef typename boost::unordered::detail::pick_policy<T>::type policy;
+        typedef typename boost::unordered::detail::pick_policy<T>::type policy;

-    typedef boost::unordered::iterator_detail::c_iterator<node> iterator;
-    typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        l_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        cl_iterator;
+        typedef boost::unordered::iterator_detail::c_iterator<node> iterator;
+        typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
+        typedef boost::unordered::iterator_detail::cl_iterator<node> l_iterator;
+        typedef boost::unordered::iterator_detail::cl_iterator<node>
+          cl_iterator;

-    typedef boost::unordered::node_handle_set<node, T, A> node_type;
-    typedef boost::unordered::insert_return_type_set<node, T, A>
-        insert_return_type;
-};
+        typedef boost::unordered::node_handle_set<node, T, A> node_type;
+        typedef boost::unordered::insert_return_type_set<node, T, A>
+          insert_return_type;
+      };

-template <typename A, typename T, typename H, typename P> struct multiset
-{
-    typedef boost::unordered::detail::multiset<A, T, H, P> types;
+      template <typename T, typename H, typename P, typename A>
+      class instantiate_set
+      {
+        typedef boost::unordered_set<T, H, P, A> container;
+        container x;
+        typename container::node_type node_type;
+        typename container::insert_return_type insert_return_type;
+      };

-    typedef T value_type;
-    typedef H hasher;
-    typedef P key_equal;
-    typedef T const const_key_type;
-
-    typedef typename ::boost::unordered::detail::rebind_wrap<A,
-        value_type>::type value_allocator;
-    typedef boost::unordered::detail::allocator_traits<value_allocator>
-        value_allocator_traits;
-
-#if BOOST_UNORDERED_INTEROPERABLE_NODES
-    typedef boost::unordered::detail::pick_node<A, value_type> pick;
-#else
-    typedef boost::unordered::detail::pick_grouped_node<A, value_type> pick;
-#endif
-    typedef typename pick::node node;
-    typedef typename pick::bucket bucket;
-    typedef typename pick::link_pointer link_pointer;
-    typedef typename pick::node_algo node_algo;
-
-    typedef boost::unordered::detail::grouped_table_impl<types> table;
-    typedef boost::unordered::detail::set_extractor<value_type> extractor;
-
-    typedef typename boost::unordered::detail::pick_policy<T>::type policy;
-
-    typedef boost::unordered::iterator_detail::c_iterator<node> iterator;
-    typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        l_iterator;
-    typedef boost::unordered::iterator_detail::cl_iterator<node, policy>
-        cl_iterator;
-
-    typedef boost::unordered::node_handle_set<node, T, A> node_type;
-};
-
-template <typename T, typename H, typename P, typename A> class instantiate_set
-{
-    typedef boost::unordered_set<T, H, P, A> container;
-    container x;
-    typename container::node_type node_type;
-    typename container::insert_return_type insert_return_type;
-};
-
-template <typename T, typename H, typename P, typename A>
-class instantiate_multiset
-{
-    typedef boost::unordered_multiset<T, H, P, A> container;
-    container x;
-    typename container::node_type node_type;
-};
-}
-}
+      template <typename T, typename H, typename P, typename A>
+      class instantiate_multiset
+      {
+        typedef boost::unordered_multiset<T, H, P, A> container;
+        container x;
+        typename container::node_type node_type;
+      };
+    }
+  }
 }
@@ -17,45 +17,56 @@
 #include <memory>

 namespace boost {
-namespace unordered {
-template <class K, class T, class H = boost::hash<K>,
-    class P = std::equal_to<K>,
-    class A = std::allocator<std::pair<const K, T> > >
-class unordered_map;
+  namespace unordered {
+    template <class K, class T, class H = boost::hash<K>,
+      class P = std::equal_to<K>,
+      class A = std::allocator<std::pair<const K, T> > >
+    class unordered_map;

-template <class K, class T, class H, class P, class A>
-inline bool operator==(
-    unordered_map<K, T, H, P, A> const&, unordered_map<K, T, H, P, A> const&);
-template <class K, class T, class H, class P, class A>
-inline bool operator!=(
-    unordered_map<K, T, H, P, A> const&, unordered_map<K, T, H, P, A> const&);
-template <class K, class T, class H, class P, class A>
-inline void swap(unordered_map<K, T, H, P, A>&, unordered_map<K, T, H, P, A>&);
+    template <class K, class T, class H, class P, class A>
+    inline bool operator==(
+      unordered_map<K, T, H, P, A> const&, unordered_map<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    inline bool operator!=(
+      unordered_map<K, T, H, P, A> const&, unordered_map<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    inline void swap(
+      unordered_map<K, T, H, P, A>& m1, unordered_map<K, T, H, P, A>& m2)
+      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));

-template <class K, class T, class H = boost::hash<K>,
-    class P = std::equal_to<K>,
-    class A = std::allocator<std::pair<const K, T> > >
-class unordered_multimap;
+    template <class K, class T, class H, class P, class A, class Predicate>
+    typename unordered_map<K, T, H, P, A>::size_type erase_if(
+      unordered_map<K, T, H, P, A>& c, Predicate pred);

-template <class K, class T, class H, class P, class A>
-inline bool operator==(unordered_multimap<K, T, H, P, A> const&,
-    unordered_multimap<K, T, H, P, A> const&);
-template <class K, class T, class H, class P, class A>
-inline bool operator!=(unordered_multimap<K, T, H, P, A> const&,
-    unordered_multimap<K, T, H, P, A> const&);
-template <class K, class T, class H, class P, class A>
-inline void swap(
-    unordered_multimap<K, T, H, P, A>&, unordered_multimap<K, T, H, P, A>&);
+    template <class K, class T, class H = boost::hash<K>,
+      class P = std::equal_to<K>,
+      class A = std::allocator<std::pair<const K, T> > >
+    class unordered_multimap;

-template <class N, class K, class T, class A> class node_handle_map;
-template <class N, class K, class T, class A> struct insert_return_type_map;
-}
+    template <class K, class T, class H, class P, class A>
+    inline bool operator==(unordered_multimap<K, T, H, P, A> const&,
+      unordered_multimap<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    inline bool operator!=(unordered_multimap<K, T, H, P, A> const&,
+      unordered_multimap<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    inline void swap(unordered_multimap<K, T, H, P, A>& m1,
+      unordered_multimap<K, T, H, P, A>& m2)
+      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));

-using boost::unordered::unordered_map;
-using boost::unordered::unordered_multimap;
-using boost::unordered::swap;
-using boost::unordered::operator==;
-using boost::unordered::operator!=;
+    template <class K, class T, class H, class P, class A, class Predicate>
+    typename unordered_multimap<K, T, H, P, A>::size_type erase_if(
+      unordered_multimap<K, T, H, P, A>& c, Predicate pred);
+
+    template <class N, class K, class T, class A> class node_handle_map;
+    template <class N, class K, class T, class A> struct insert_return_type_map;
+  }
+
+  using boost::unordered::unordered_map;
+  using boost::unordered::unordered_multimap;
+  using boost::unordered::swap;
+  using boost::unordered::operator==;
+  using boost::unordered::operator!=;
 }

 #endif
@@ -17,43 +17,54 @@
 #include <memory>

 namespace boost {
-namespace unordered {
-template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
-    class A = std::allocator<T> >
-class unordered_set;
+  namespace unordered {
+    template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
+      class A = std::allocator<T> >
+    class unordered_set;

-template <class T, class H, class P, class A>
-inline bool operator==(
-    unordered_set<T, H, P, A> const&, unordered_set<T, H, P, A> const&);
-template <class T, class H, class P, class A>
-inline bool operator!=(
-    unordered_set<T, H, P, A> const&, unordered_set<T, H, P, A> const&);
-template <class T, class H, class P, class A>
-inline void swap(unordered_set<T, H, P, A>& m1, unordered_set<T, H, P, A>& m2);
+    template <class T, class H, class P, class A>
+    inline bool operator==(
+      unordered_set<T, H, P, A> const&, unordered_set<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    inline bool operator!=(
+      unordered_set<T, H, P, A> const&, unordered_set<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    inline void swap(
+      unordered_set<T, H, P, A>& m1, unordered_set<T, H, P, A>& m2)
+      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));

-template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
-    class A = std::allocator<T> >
-class unordered_multiset;
+    template <class K, class H, class P, class A, class Predicate>
+    typename unordered_set<K, H, P, A>::size_type erase_if(
+      unordered_set<K, H, P, A>& c, Predicate pred);

-template <class T, class H, class P, class A>
-inline bool operator==(unordered_multiset<T, H, P, A> const&,
-    unordered_multiset<T, H, P, A> const&);
-template <class T, class H, class P, class A>
-inline bool operator!=(unordered_multiset<T, H, P, A> const&,
-    unordered_multiset<T, H, P, A> const&);
-template <class T, class H, class P, class A>
-inline void swap(
-    unordered_multiset<T, H, P, A>& m1, unordered_multiset<T, H, P, A>& m2);
+    template <class T, class H = boost::hash<T>, class P = std::equal_to<T>,
+      class A = std::allocator<T> >
+    class unordered_multiset;

-template <class N, class T, class A> class node_handle_set;
-template <class N, class T, class A> struct insert_return_type_set;
-}
+    template <class T, class H, class P, class A>
+    inline bool operator==(unordered_multiset<T, H, P, A> const&,
+      unordered_multiset<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    inline bool operator!=(unordered_multiset<T, H, P, A> const&,
+      unordered_multiset<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    inline void swap(
+      unordered_multiset<T, H, P, A>& m1, unordered_multiset<T, H, P, A>& m2)
+      BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(m1.swap(m2)));

-using boost::unordered::unordered_set;
-using boost::unordered::unordered_multiset;
-using boost::unordered::swap;
-using boost::unordered::operator==;
-using boost::unordered::operator!=;
+    template <class K, class H, class P, class A, class Predicate>
+    typename unordered_multiset<K, H, P, A>::size_type erase_if(
+      unordered_multiset<K, H, P, A>& c, Predicate pred);
+
+    template <class N, class T, class A> class node_handle_set;
+    template <class N, class T, class A> struct insert_return_type_set;
+  }
+
+  using boost::unordered::unordered_set;
+  using boost::unordered::unordered_multiset;
+  using boost::unordered::swap;
+  using boost::unordered::operator==;
+  using boost::unordered::operator!=;
 }

 #endif
@@ -7,10 +7,10 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 <html>
 <head>
-    <meta http-equiv="refresh" content="0; URL=../../doc/html/unordered.html">
+    <meta http-equiv="refresh" content="0; URL=doc/html/unordered.html">
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="../../doc/html/unordered.html">../../doc/html/unordered.html</a>
+<a href="doc/html/unordered.html">doc/html/unordered.html</a>
 </body>
 </html>
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2017-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>
+    <!-- unordered -->
+    <library name="unordered">
+      <mark-expected-failures>
+        <test name="unnecessary_copy_tests"/>
+        <toolset name="borland-*"/>
+        <toolset name="sun-*"/>
+        <note author="Daniel James">
+            This tests whether inserting elements creates as few copies as I think
+            is possible. If this fails it just means that the container might be
+            a little inefficient.
+        </note>
+      </mark-expected-failures>
+
+      <mark-expected-failures>
+        <test name="compile_map_unordered_allocator"/>
+        <toolset name="msvc-7.1"/>
+        <note author="Daniel James">
+            This test fail because it's using unordered's internal
+            allocator traits, which doesn't work on Visual C++ 7.1.
+            It normally uses the one from Boost.Container by default.
+        </note>
+      </mark-expected-failures>
+
+      <mark-expected-failures>
+        <test name="noexcept_tests"/>
+        <toolset name="gcc-4.3c+"/>
+        <note author="Daniel James">
+            boost::is_nothrow_move_constructible and
+            boost::is_nothrow_move_assignable don't seem to work on this
+            compiler. I'd hope that anyone wanting noexcept support would
+            use a more recent compiler anyway.
+        </note>
+      </mark-expected-failures>
+      </library>
+</explicit-failures-markup>
+
@@ -13,5 +13,6 @@
    ],
    "category": [
        "Containers"
-    ]
+    ],
+    "cxxstd": "03"
 }
@@ -5,16 +5,27 @@

 import testing ;

-project unordered-test/unordered
+# Adding -Wundef is blocked on (at least)
+# https://github.com/boostorg/type_traits/issues/165
+
+local gcc-flags = -Wsign-promo -Wconversion -Wsign-conversion -Wfloat-equal -Wshadow -Wno-variadic-macros ;
+local clang-flags = $(gcc-flags) -Wno-c99-extensions ;
+local msvc-flags = /wd4494 ;
+
+project
    : requirements
-        <warnings>all
+
+        <warnings>pedantic
        <toolset>intel:<warnings>on
-        # Would be nice to define -Wundef, but I'm getting warnings from
-        # Boost.Preprocessor on trunk.
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>msvc:<cxxflags>"/wd4494"
+
+        <toolset>gcc:<cxxflags>$(gcc-flags)
+        <toolset>darwin:<cxxflags>$(gcc-flags)
+        <toolset>clang:<cxxflags>$(clang-flags)
+        <toolset>msvc:<cxxflags>$(msvc-flags)
+
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>clang:<warnings-as-errors>on
+        <toolset>msvc:<warnings-as-errors>on
    ;

 #alias framework : /boost/test//boost_unit_test_framework ;
@@ -28,9 +39,6 @@ test-suite unordered
        [ run unordered/minimal_allocator.cpp ]
        [ run unordered/compile_set.cpp ]
        [ run unordered/compile_map.cpp ]
-        [ run unordered/compile_map.cpp : :
-            : <define>BOOST_UNORDERED_USE_ALLOCATOR_TRAITS=0
-            : compile_map_unordered_allocator ]
        [ run unordered/noexcept_tests.cpp ]
        [ run unordered/link_test_1.cpp unordered/link_test_2.cpp ]
        [ run unordered/incomplete_test.cpp ]
@@ -45,7 +53,7 @@ test-suite unordered
        [ run unordered/insert_hint_tests.cpp ]
        [ run unordered/emplace_tests.cpp ]
        [ run unordered/unnecessary_copy_tests.cpp ]
-        [ run unordered/erase_tests.cpp ]
+        [ run unordered/erase_tests.cpp : : : <define>BOOST_UNORDERED_SUPPRESS_DEPRECATED ]
        [ run unordered/erase_equiv_tests.cpp ]
        [ run unordered/extract_tests.cpp ]
        [ run unordered/node_handle_tests.cpp ]
@@ -61,6 +69,14 @@ test-suite unordered
        [ run unordered/rehash_tests.cpp ]
        [ run unordered/equality_tests.cpp ]
        [ run unordered/swap_tests.cpp ]
+        [ run unordered/detail_tests.cpp ]
+        [ run unordered/deduction_tests.cpp ]
+        [ run unordered/scoped_allocator.cpp : : : <toolset>msvc-14.0:<build>no ]
+        [ run unordered/transparent_tests.cpp ]
+        [ run unordered/reserve_tests.cpp ]
+        [ run unordered/contains_tests.cpp ]
+        [ run unordered/mix_policy.cpp ]
+        [ run unordered/erase_if.cpp ]

        [ run unordered/compile_set.cpp : :
            : <define>BOOST_UNORDERED_USE_MOVE
@@ -90,4 +106,5 @@ test-suite unordered-exception
        [ run exception/rehash_exception_tests.cpp framework ]
        [ run exception/swap_exception_tests.cpp framework : : :
            <define>BOOST_UNORDERED_SWAP_METHOD=2 ]
+        [ run exception/merge_exception_tests.cpp framework ]
    ;
@@ -7,25 +7,43 @@

 #include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
+#include "../helpers/tracker.hpp"

 #if defined(BOOST_MSVC)
 #pragma warning(disable : 4512) // assignment operator could not be generated
 #endif

+#if defined(__clang__) && defined(__has_warning)
+#if __has_warning("-Wself-assign-overloaded")
+#pragma clang diagnostic ignored "-Wself-assign-overloaded"
+#endif
+#endif
+
 test::seed_t initialize_seed(12847);

 template <class T> struct self_assign_base : public test::exception_base
 {
-    test::random_values<T> values;
-    self_assign_base(std::size_t count = 0) : values(count) {}
+  test::random_values<T> values;
+  self_assign_base(std::size_t count = 0) : values(count, test::limited_range)
+  {
+  }

-    typedef T data_type;
-    T init() const { return T(values.begin(), values.end()); }
-    void run(T& x) const { x = x; }
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
-    {
-        test::check_equivalent_keys(x);
-    }
+  typedef T data_type;
+  T init() const { return T(values.begin(), values.end()); }
+
+  void run(T& x) const
+  {
+    x = x;
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, values);
+    test::check_equivalent_keys(x);
+  }
+
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
+  {
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct self_assign_test1 : self_assign_base<T>
@@ -34,105 +52,140 @@ template <class T> struct self_assign_test1 : self_assign_base<T>

 template <class T> struct self_assign_test2 : self_assign_base<T>
 {
-    self_assign_test2() : self_assign_base<T>(100) {}
+  self_assign_test2() : self_assign_base<T>(100) {}
 };

 template <class T> struct assign_base : public test::exception_base
 {
-    test::random_values<T> x_values, y_values;
-    T x, y;
+  test::random_values<T> x_values, y_values;
+  T x, y;

-    typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
-    typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+  typedef typename T::hasher hasher;
+  typedef typename T::key_equal key_equal;
+  typedef typename T::allocator_type allocator_type;

-    assign_base(int tag1, int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
-        : x_values(), y_values(),
-          x(0, hasher(tag1), key_equal(tag1), allocator_type(tag1)),
-          y(0, hasher(tag2), key_equal(tag2), allocator_type(tag2))
-    {
-        x.max_load_factor(mlf1);
-        y.max_load_factor(mlf2);
-    }
+  assign_base(int tag1, int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
+      : x_values(), y_values(),
+        x(0, hasher(tag1), key_equal(tag1), allocator_type(tag1)),
+        y(0, hasher(tag2), key_equal(tag2), allocator_type(tag2))
+  {
+    x.max_load_factor(mlf1);
+    y.max_load_factor(mlf2);
+  }

-    typedef T data_type;
-    T init() const { return T(x); }
-    void run(T& x1) const { x1 = y; }
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x1) const
-    {
-        test::check_equivalent_keys(x1);
+  typedef T data_type;
+  T init() const { return T(x); }

-        // If the container is empty at the point of the exception, the
-        // internal structure is hidden, this exposes it, at the cost of
-        // messing up the data.
-        if (x_values.size()) {
-            T& x2 = const_cast<T&>(x1);
-            x2.emplace(*x_values.begin());
-            test::check_equivalent_keys(x2);
-        }
+  void run(T& x1) const
+  {
+    x1 = y;
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x1, y_values);
+    test::check_equivalent_keys(x1);
+  }
+
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x1) const
+  {
+    test::check_equivalent_keys(x1);
+
+    // If the container is empty at the point of the exception, the
+    // internal structure is hidden, this exposes it, at the cost of
+    // messing up the data.
+    if (x_values.size()) {
+      T& x2 = const_cast<T&>(x1);
+      x2.emplace(*x_values.begin());
+      test::check_equivalent_keys(x2);
    }
+  }
 };

 template <class T> struct assign_values : assign_base<T>
 {
-    assign_values(unsigned int count1, unsigned int count2, int tag1, int tag2,
-        float mlf1 = 1.0, float mlf2 = 1.0)
-        : assign_base<T>(tag1, tag2, mlf1, mlf2)
-    {
-        this->x_values.fill(count1);
-        this->y_values.fill(count2);
-        this->x.insert(this->x_values.begin(), this->x_values.end());
-        this->y.insert(this->y_values.begin(), this->y_values.end());
-    }
+  assign_values(unsigned int count1, unsigned int count2, int tag1, int tag2,
+    test::random_generator gen = test::default_generator, float mlf1 = 1.0,
+    float mlf2 = 1.0)
+      : assign_base<T>(tag1, tag2, mlf1, mlf2)
+  {
+    this->x_values.fill(count1, gen);
+    this->y_values.fill(count2, gen);
+    this->x.insert(this->x_values.begin(), this->x_values.end());
+    this->y.insert(this->y_values.begin(), this->y_values.end());
+  }
 };

 template <class T> struct assign_test1 : assign_values<T>
 {
-    assign_test1() : assign_values<T>(0, 0, 0, 0) {}
+  assign_test1() : assign_values<T>(0, 0, 0, 0) {}
 };

 template <class T> struct assign_test2 : assign_values<T>
 {
-    assign_test2() : assign_values<T>(60, 0, 0, 0) {}
+  assign_test2() : assign_values<T>(60, 0, 0, 0) {}
+};
+
+template <class T> struct assign_test2a : assign_values<T>
+{
+  assign_test2a() : assign_values<T>(60, 0, 0, 0, test::limited_range) {}
 };

 template <class T> struct assign_test3 : assign_values<T>
 {
-    assign_test3() : assign_values<T>(0, 60, 0, 0) {}
+  assign_test3() : assign_values<T>(0, 60, 0, 0) {}
+};
+
+template <class T> struct assign_test3a : assign_values<T>
+{
+  assign_test3a() : assign_values<T>(0, 60, 0, 0, test::limited_range) {}
 };

 template <class T> struct assign_test4 : assign_values<T>
 {
-    assign_test4() : assign_values<T>(10, 10, 1, 2) {}
+  assign_test4() : assign_values<T>(10, 10, 1, 2) {}
 };

 template <class T> struct assign_test4a : assign_values<T>
 {
-    assign_test4a() : assign_values<T>(10, 100, 1, 2) {}
+  assign_test4a() : assign_values<T>(10, 100, 1, 2) {}
+};
+
+template <class T> struct assign_test4b : assign_values<T>
+{
+  assign_test4b() : assign_values<T>(10, 100, 1, 2, test::limited_range) {}
 };

 template <class T> struct assign_test5 : assign_values<T>
 {
-    assign_test5() : assign_values<T>(5, 60, 0, 0, 1.0f, 0.1f) {}
+  assign_test5()
+      : assign_values<T>(5, 60, 0, 0, test::default_generator, 1.0f, 0.1f)
+  {
+  }
 };

 template <class T> struct equivalent_test1 : assign_base<T>
 {
-    equivalent_test1() : assign_base<T>(0, 0)
-    {
-        test::random_values<T> x_values2(10);
-        this->x_values.insert(x_values2.begin(), x_values2.end());
-        this->x_values.insert(x_values2.begin(), x_values2.end());
-        test::random_values<T> y_values2(10);
-        this->y_values.insert(y_values2.begin(), y_values2.end());
-        this->y_values.insert(y_values2.begin(), y_values2.end());
-        this->x.insert(this->x_values.begin(), this->x_values.end());
-        this->y.insert(this->y_values.begin(), this->y_values.end());
-    }
+  equivalent_test1() : assign_base<T>(0, 0)
+  {
+    test::random_values<T> x_values2(10);
+    this->x_values.insert(x_values2.begin(), x_values2.end());
+    this->x_values.insert(x_values2.begin(), x_values2.end());
+    test::random_values<T> y_values2(10);
+    this->y_values.insert(y_values2.begin(), y_values2.end());
+    this->y_values.insert(y_values2.begin(), y_values2.end());
+    this->x.insert(this->x_values.begin(), this->x_values.end());
+    this->y.insert(this->y_values.begin(), this->y_values.end());
+  }
 };

-EXCEPTION_TESTS((self_assign_test1)(self_assign_test2)(assign_test1)(
-                    assign_test2)(assign_test3)(assign_test4)(assign_test4a)(
-                    assign_test5)(equivalent_test1),
+// clang-format off
+EXCEPTION_TESTS_REPEAT(5,
+    (self_assign_test1)(self_assign_test2)
+    (assign_test1)(assign_test2)(assign_test2a)
+    (assign_test3)(assign_test3a)
+    (assign_test4)(assign_test4a)(assign_test4b)
+    (assign_test5)
+    (equivalent_test1),
    CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -6,7 +6,9 @@
 #include "./containers.hpp"

 #include "../helpers/input_iterator.hpp"
+#include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
+#include "../helpers/tracker.hpp"

 template <typename T> inline void avoid_unused_warning(T const&) {}

@@ -14,157 +16,197 @@ test::seed_t initialize_seed(91274);

 struct objects
 {
-    test::exception::object obj;
-    test::exception::hash hash;
-    test::exception::equal_to equal_to;
-    test::exception::allocator<test::exception::object> allocator;
+  test::exception::object obj;
+  test::exception::hash hash;
+  test::exception::equal_to equal_to;
+  test::exception::allocator<test::exception::object> allocator;
 };

 template <class T> struct construct_test1 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x;
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x;
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct construct_test2 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x(300);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(300);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct construct_test3 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x(0, hash);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(0, hash);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct construct_test4 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x(0, hash, equal_to);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(0, hash, equal_to);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct construct_test5 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x(50, hash, equal_to, allocator);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(50, hash, equal_to, allocator);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct construct_test6 : public objects, test::exception_base
 {
-    void run() const
-    {
-        T x(allocator);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(allocator);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct range : public test::exception_base
 {
-    test::random_values<T> values;
+  test::random_values<T> values;

-    range() : values(5) {}
-    range(unsigned int count) : values(count) {}
+  range() : values(5, test::limited_range) {}
+  range(unsigned int count) : values(count, test::limited_range) {}
 };

 template <class T> struct range_construct_test1 : public range<T>, objects
 {
-    void run() const
-    {
-        T x(this->values.begin(), this->values.end());
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(this->values.begin(), this->values.end());
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct range_construct_test2 : public range<T>, objects
 {
-    void run() const
-    {
-        T x(this->values.begin(), this->values.end(), 0);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(this->values.begin(), this->values.end(), 0);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct range_construct_test3 : public range<T>, objects
 {
-    void run() const
-    {
-        T x(this->values.begin(), this->values.end(), 0, hash);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(this->values.begin(), this->values.end(), 0, hash);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct range_construct_test4 : public range<T>, objects
 {
-    void run() const
-    {
-        T x(this->values.begin(), this->values.end(), 100, hash, equal_to);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(this->values.begin(), this->values.end(), 100, hash, equal_to);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 // Need to run at least one test with a fairly large number
 // of objects in case it triggers a rehash.
 template <class T> struct range_construct_test5 : public range<T>, objects
 {
-    range_construct_test5() : range<T>(60) {}
+  range_construct_test5() : range<T>(60) {}

-    void run() const
-    {
-        T x(this->values.begin(), this->values.end(), 0, hash, equal_to,
-            allocator);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(this->values.begin(), this->values.end(), 0, hash, equal_to, allocator);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct input_range_construct_test : public range<T>, objects
 {
-    input_range_construct_test() : range<T>(60) {}
+  input_range_construct_test() : range<T>(60) {}

-    void run() const
-    {
-        BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-            begin = this->values.begin(),
-            end = this->values.end();
-        T x(test::input_iterator(begin), test::input_iterator(end), 0, hash,
-            equal_to, allocator);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    typename test::random_values<T>::const_iterator begin =
+                                                      this->values.begin(),
+                                                    end = this->values.end();
+    T x(test::input_iterator(begin), test::input_iterator(end), 0, hash,
+      equal_to, allocator);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct copy_range_construct_test : public range<T>, objects
 {
-    copy_range_construct_test() : range<T>(60) {}
+  copy_range_construct_test() : range<T>(60) {}

-    void run() const
-    {
-        T x(test::copy_iterator(this->values.begin()),
-            test::copy_iterator(this->values.end()), 0, hash, equal_to,
-            allocator);
-        avoid_unused_warning(x);
-    }
+  void run() const
+  {
+    T x(test::copy_iterator(this->values.begin()),
+      test::copy_iterator(this->values.end()), 0, hash, equal_to, allocator);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

+// clang-format off
 EXCEPTION_TESTS(
-    (construct_test1)(construct_test2)(construct_test3)(construct_test4)(
-        construct_test5)(construct_test6)(range_construct_test1)(
-        range_construct_test2)(range_construct_test3)(range_construct_test4)(
-        range_construct_test5)(input_range_construct_test)(
-        copy_range_construct_test),
-    CONTAINER_SEQ)
+  (construct_test1)(construct_test2)(construct_test3)(construct_test4)
+  (construct_test5)(construct_test6)(range_construct_test1)
+  (range_construct_test2)(range_construct_test3)(range_construct_test4)
+  (range_construct_test5)(input_range_construct_test)
+  (copy_range_construct_test),
+  CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -13,32 +13,32 @@
 #include "../objects/exception.hpp"

 typedef boost::unordered_set<test::exception::object, test::exception::hash,
-    test::exception::equal_to,
-    test::exception::allocator<test::exception::object> >
-    test_set;
+  test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >
+  test_set;
 typedef boost::unordered_multiset<test::exception::object,
-    test::exception::hash, test::exception::equal_to,
-    test::exception::allocator2<test::exception::object> >
-    test_multiset;
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >
+  test_multiset;
 typedef boost::unordered_map<test::exception::object, test::exception::object,
-    test::exception::hash, test::exception::equal_to,
-    test::exception::allocator2<test::exception::object> >
-    test_map;
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >
+  test_map;
 typedef boost::unordered_multimap<test::exception::object,
-    test::exception::object, test::exception::hash, test::exception::equal_to,
-    test::exception::allocator<test::exception::object> >
-    test_multimap;
+  test::exception::object, test::exception::hash, test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >
+  test_multimap;
 typedef boost::unordered_set<
-    std::pair<test::exception::object, test::exception::object>,
-    test::exception::hash, test::exception::equal_to,
-    test::exception::allocator<test::exception::object> >
-    test_pair_set;
+  std::pair<test::exception::object, test::exception::object>,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >
+  test_pair_set;
 typedef boost::unordered_multiset<
-    std::pair<test::exception::object, test::exception::object>,
-    test::exception::hash, test::exception::equal_to,
-    test::exception::allocator2<test::exception::object> >
-    test_pair_multiset;
+  std::pair<test::exception::object, test::exception::object>,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >
+  test_pair_multiset;

 #define CONTAINER_SEQ (test_set)(test_multiset)(test_map)(test_multimap)
 #define CONTAINER_PAIR_SEQ                                                     \
-    (test_pair_set)(test_pair_multiset)(test_map)(test_multimap)
+  (test_pair_set)(test_pair_multiset)(test_map)(test_multimap)
@@ -5,7 +5,9 @@

 #include "./containers.hpp"

+#include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
+#include "../helpers/tracker.hpp"

 template <typename T> inline void avoid_unused_warning(T const&) {}

@@ -13,58 +15,96 @@ test::seed_t initialize_seed(73041);

 template <class T> struct copy_test1 : public test::exception_base
 {
-    T x;
+  T x;

-    void run() const
-    {
-        T y(x);
-        avoid_unused_warning(y);
-    }
+  void run() const
+  {
+    T y(x);
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(y.empty());
+    test::check_equivalent_keys(y);
+  }
 };

 template <class T> struct copy_test2 : public test::exception_base
 {
-    test::random_values<T> values;
-    T x;
+  test::random_values<T> values;
+  T x;

-    copy_test2() : values(5), x(values.begin(), values.end()) {}
+  copy_test2() : values(5, test::limited_range), x(values.begin(), values.end())
+  {
+  }

-    void run() const
-    {
-        T y(x);
-        avoid_unused_warning(y);
-    }
+  void run() const
+  {
+    T y(x);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(y, this->values);
+    test::check_equivalent_keys(y);
+  }
 };

 template <class T> struct copy_test3 : public test::exception_base
 {
-    test::random_values<T> values;
-    T x;
+  test::random_values<T> values;
+  T x;

-    copy_test3() : values(100), x(values.begin(), values.end()) {}
+  copy_test3() : values(100), x(values.begin(), values.end()) {}

-    void run() const
-    {
-        T y(x);
-        avoid_unused_warning(y);
-    }
+  void run() const
+  {
+    T y(x);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(y, this->values);
+    test::check_equivalent_keys(y);
+  }
+};
+
+template <class T> struct copy_test3a : public test::exception_base
+{
+  test::random_values<T> values;
+  T x;
+
+  copy_test3a()
+      : values(100, test::limited_range), x(values.begin(), values.end())
+  {
+  }
+
+  void run() const
+  {
+    T y(x);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(y, this->values);
+    test::check_equivalent_keys(y);
+  }
 };

 template <class T> struct copy_with_allocator_test : public test::exception_base
 {
-    test::random_values<T> values;
-    T x;
-    test::exception::allocator<test::exception::object> allocator;
+  test::random_values<T> values;
+  T x;
+  test::exception::allocator<test::exception::object> allocator;

-    copy_with_allocator_test() : values(100), x(values.begin(), values.end()) {}
+  copy_with_allocator_test() : values(100), x(values.begin(), values.end()) {}

-    void run() const
-    {
-        T y(x, allocator);
-        avoid_unused_warning(y);
-    }
+  void run() const
+  {
+    T y(x, allocator);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(y, this->values);
+    test::check_equivalent_keys(y);
+  }
 };

-EXCEPTION_TESTS((copy_test1)(copy_test2)(copy_test3)(copy_with_allocator_test),
+// clang-format off
+EXCEPTION_TESTS(
+    (copy_test1)(copy_test2)(copy_test3)(copy_test3a)(copy_with_allocator_test),
    CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -13,37 +13,42 @@ test::seed_t initialize_seed(835193);

 template <class T> struct erase_test_base : public test::exception_base
 {
-    test::random_values<T> values;
-    erase_test_base(unsigned int count = 5) : values(count) {}
+  test::random_values<T> values;
+  erase_test_base(unsigned int count = 5) : values(count, test::limited_range)
+  {
+  }

-    typedef T data_type;
+  typedef T data_type;

-    data_type init() const { return T(values.begin(), values.end()); }
+  data_type init() const { return T(values.begin(), values.end()); }

-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
-    {
-        std::string scope(test::scope);
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
+  {
+    std::string scope(test::scope);

-        BOOST_TEST(scope.find("hash::") != std::string::npos ||
-                   scope.find("equal_to::") != std::string::npos ||
-                   scope == "operator==(object, object)");
+    BOOST_TEST(scope.find("hash::") != std::string::npos ||
+               scope.find("equal_to::") != std::string::npos ||
+               scope == "operator==(object, object)");

-        test::check_equivalent_keys(x);
-    }
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct erase_by_key_test1 : public erase_test_base<T>
 {
-    void run(T& x) const
-    {
-        typedef BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-            iterator;
+  void run(T& x) const
+  {
+    typedef typename test::random_values<T>::const_iterator iterator;

-        for (iterator it = this->values.begin(), end = this->values.end();
-             it != end; ++it) {
-            x.erase(test::get_key<T>(*it));
-        }
+    for (iterator it = this->values.begin(), end = this->values.end();
+         it != end; ++it) {
+      x.erase(test::get_key<T>(*it));
    }
+
+    DISABLE_EXCEPTIONS;
+    BOOST_TEST(x.empty());
+    test::check_equivalent_keys(x);
+  }
 };

 EXCEPTION_TESTS((erase_by_key_test1), CONTAINER_SEQ)
@@ -2,306 +2,415 @@
 // Copyright 2006-2009 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)
-
 #include "./containers.hpp"

 #include "../helpers/helpers.hpp"
 #include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/strong.hpp"
+#include "../helpers/tracker.hpp"
 #include <cmath>
 #include <string>

 test::seed_t initialize_seed(747373);

-template <class T> struct insert_test_base : public test::exception_base
+// Fill in a container so that it's about to rehash
+template <typename T> void rehash_prep(T& x)
 {
-    test::random_values<T> values;
-    insert_test_base(unsigned int count = 5)
-        : values(count, test::limited_range)
-    {
+  using namespace std;
+  typedef typename T::size_type size_type;
+
+  x.max_load_factor(0.25);
+  size_type bucket_count = x.bucket_count();
+  size_type initial_elements = static_cast<size_type>(
+    ceil((double)bucket_count * (double)x.max_load_factor()) - 1);
+  test::random_values<T> v(initial_elements);
+  x.insert(v.begin(), v.end());
+  BOOST_TEST(bucket_count == x.bucket_count());
+}
+
+// Overload to generate inserters that need type information.
+
+template <typename Inserter, typename T>
+Inserter generate(Inserter inserter, T&)
+{
+  return inserter;
+}
+
+// Get the iterator returned from an insert/emplace.
+
+template <typename T> T get_iterator(T const& x) { return x; }
+
+template <typename T> T get_iterator(std::pair<T, bool> const& x)
+{
+  return x.first;
+}
+
+// Generic insert exception test for typical single element inserts..
+
+template <typename T, typename Inserter, typename Values>
+void insert_exception_test_impl(T x, Inserter insert, Values const& v)
+{
+  test::strong<T> strong;
+
+  test::ordered<T> tracker;
+  tracker.insert(x.begin(), x.end());
+
+  try {
+    ENABLE_EXCEPTIONS;
+
+    for (typename Values::const_iterator it = v.begin(); it != v.end(); ++it) {
+      strong.store(x, test::detail::tracker.count_allocations);
+      insert(x, it);
    }
+  } catch (...) {
+    test::check_equivalent_keys(x);
+    insert.exception_check(x, strong);
+    throw;
+  }

-    typedef T data_type;
-    typedef test::strong<T> strong_type;
+  test::check_equivalent_keys(x);
+  insert.track(tracker, v.begin(), v.end());
+  tracker.compare(x);
+}

-    data_type init() const { return T(); }
+// Simple insert exception test

-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(
-        T const& x, strong_type const& strong) const
-    {
-        std::string scope(test::scope);
+template <typename T, typename Inserter>
+void insert_exception_test(T*, Inserter insert, test::random_generator gen)
+{
+  for (int i = 0; i < 5; ++i) {
+    test::random_values<T> v(10, gen);
+    T x;

-        if (scope.find("hash::operator()") == std::string::npos)
-            strong.test(x, test::detail::tracker.count_allocations);
-        test::check_equivalent_keys(x);
-    }
+    EXCEPTION_LOOP(insert_exception_test_impl(x, generate(insert, x), v));
+  }
+}
+
+// Insert into a container which is about to hit its max load, so that it
+// rehashes.
+
+template <typename T, typename Inserter>
+void insert_rehash_exception_test(
+  T*, Inserter insert, test::random_generator gen)
+{
+  for (int i = 0; i < 5; ++i) {
+    T x;
+    rehash_prep(x);
+
+    test::random_values<T> v2(5, gen);
+    EXCEPTION_LOOP(insert_exception_test_impl(x, generate(insert, x), v2));
+  }
+}
+
+// Various methods for inserting a single element
+
+struct inserter_base
+{
+  template <typename T> void exception_check(T& x, test::strong<T>& strong)
+  {
+    std::string scope(test::scope);
+
+    if (scope.find("hash::operator()") == std::string::npos)
+      strong.test(x, test::detail::tracker.count_allocations);
+  }
+
+  template <typename T, typename Iterator>
+  void track(T& tracker, Iterator begin, Iterator end)
+  {
+    tracker.insert(begin, end);
+  }
 };

-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) &&                              \
-    !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-
-template <class T> struct emplace_test1 : public insert_test_base<T>
+struct insert_lvalue_type : inserter_base
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.insert(*it);
+  }
+} insert_lvalue;

-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.emplace(*it);
-        }
-    }
+struct insert_lvalue_begin_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.insert(x.begin(), *it);
+  }
+} insert_lvalue_begin;
+
+struct insert_lvalue_end_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.insert(x.end(), *it);
+  }
+} insert_lvalue_end;
+
+template <typename T> struct insert_lvalue_pos_type_impl : inserter_base
+{
+  typename T::iterator pos;
+
+  insert_lvalue_pos_type_impl(T& x) : pos(x.begin()) {}
+
+  template <typename Iterator> void operator()(T& x, Iterator it)
+  {
+    pos = get_iterator(x.insert(pos, *it));
+  }
 };

-#endif
-
-template <class T> struct insert_test1 : public insert_test_base<T>
+struct insert_lvalue_pos_type
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  template <typename T>
+  friend insert_lvalue_pos_type_impl<T> generate(insert_lvalue_pos_type, T& x)
+  {
+    return insert_lvalue_pos_type_impl<T>(x);
+  }
+} insert_lvalue_pos;

-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.insert(*it);
-        }
-    }
+struct insert_single_item_range_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.insert(it, test::next(it));
+  }
+} insert_single_item_range;
+
+struct emplace_lvalue_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.emplace(*it);
+  }
+} emplace_lvalue;
+
+struct emplace_lvalue_begin_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.emplace_hint(x.begin(), *it);
+  }
+} emplace_lvalue_begin;
+
+struct emplace_lvalue_end_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.emplace_hint(x.end(), *it);
+  }
+} emplace_lvalue_end;
+
+template <typename T> struct emplace_lvalue_pos_type_impl : inserter_base
+{
+  typename T::iterator pos;
+
+  emplace_lvalue_pos_type_impl(T& x) : pos(x.begin()) {}
+
+  template <typename Iterator> void operator()(T& x, Iterator it)
+  {
+    pos = get_iterator(x.emplace_hint(pos, *it));
+  }
 };

-template <class T> struct insert_test2 : public insert_test_base<T>
+struct emplace_lvalue_pos_type
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  template <typename T>
+  friend emplace_lvalue_pos_type_impl<T> generate(emplace_lvalue_pos_type, T& x)
+  {
+    return emplace_lvalue_pos_type_impl<T>(x);
+  }
+} emplace_lvalue_pos;

-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.insert(x.begin(), *it);
-        }
+// Run the exception tests in various combinations.
+
+test_set* test_set_;
+test_multiset* test_multiset_;
+test_map* test_map_;
+test_multimap* test_multimap_;
+
+using test::default_generator;
+using test::limited_range;
+using test::generate_collisions;
+
+// clang-format off
+UNORDERED_TEST(insert_exception_test,
+    ((test_set_)(test_multiset_)(test_map_)(test_multimap_))
+    ((insert_lvalue)(insert_lvalue_begin)(insert_lvalue_end)
+     (insert_lvalue_pos)(insert_single_item_range)
+     (emplace_lvalue)(emplace_lvalue_begin)(emplace_lvalue_end)
+     (emplace_lvalue_pos)
+    )
+    ((default_generator)(limited_range)(generate_collisions))
+)
+
+UNORDERED_TEST(insert_rehash_exception_test,
+    ((test_set_)(test_multiset_)(test_map_)(test_multimap_))
+    ((insert_lvalue)(insert_lvalue_begin)(insert_lvalue_end)
+     (insert_lvalue_pos)(insert_single_item_range)
+     (emplace_lvalue)(emplace_lvalue_begin)(emplace_lvalue_end)
+     (emplace_lvalue_pos)
+    )
+    ((default_generator)(limited_range)(generate_collisions))
+)
+// clang-format on
+
+// Repeat insert tests with pairs
+
+struct pair_emplace_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.emplace(boost::unordered::piecewise_construct,
+      boost::make_tuple(it->first), boost::make_tuple(it->second));
+  }
+} pair_emplace;
+
+struct pair_emplace2_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.emplace_hint(x.begin(), boost::unordered::piecewise_construct,
+      boost::make_tuple(it->first),
+      boost::make_tuple(it->second.tag1_, it->second.tag2_));
+  }
+} pair_emplace2;
+
+test_pair_set* test_pair_set_;
+test_pair_multiset* test_pair_multiset_;
+
+// clang-format off
+UNORDERED_TEST(insert_exception_test,
+    ((test_pair_set_)(test_pair_multiset_)(test_map_)(test_multimap_))
+    ((pair_emplace)(pair_emplace2))
+    ((default_generator)(limited_range)(generate_collisions))
+)
+UNORDERED_TEST(insert_rehash_exception_test,
+    ((test_pair_set_)(test_pair_multiset_)(test_map_)(test_multimap_))
+    ((pair_emplace)(pair_emplace2))
+    ((default_generator)(limited_range)(generate_collisions))
+)
+// clang-format on
+
+// Test inserting using operator[]
+
+struct try_emplace_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.try_emplace(it->first, it->second);
+  }
+} try_emplace;
+
+struct try_emplace2_type : inserter_base
+{
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.try_emplace(it->first, it->second.tag1_, it->second.tag2_);
+  }
+} try_emplace2;
+
+struct map_inserter_base
+{
+  template <typename T> void exception_check(T& x, test::strong<T>& strong)
+  {
+    std::string scope(test::scope);
+
+    if (scope.find("hash::operator()") == std::string::npos &&
+        scope.find("::operator=") == std::string::npos)
+      strong.test(x, test::detail::tracker.count_allocations);
+  }
+
+  template <typename T, typename Iterator>
+  void track(T& tracker, Iterator begin, Iterator end)
+  {
+    for (; begin != end; ++begin) {
+      tracker[begin->first] = begin->second;
    }
+  }
 };

-template <class T> struct insert_test3 : public insert_test_base<T>
+struct map_insert_operator_type : map_inserter_base
 {
-    void run(T& x) const { x.insert(this->values.begin(), this->values.end()); }
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x[it->first] = it->second;
+  }
+} map_insert_operator;

-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
-    {
-        test::check_equivalent_keys(x);
-    }
-};
-
-template <class T> struct insert_test4 : public insert_test_base<T>
+struct map_insert_or_assign_type : map_inserter_base
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  template <typename T, typename Iterator> void operator()(T& x, Iterator it)
+  {
+    x.insert_or_assign(it->first, it->second);
+  }
+} map_insert_or_assign;

-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.insert(it, test::next(it));
-        }
-    }
-};
+// clang-format off
+UNORDERED_TEST(insert_exception_test,
+    ((test_map_))
+    ((try_emplace)(try_emplace2)(map_insert_operator)(map_insert_or_assign))
+    ((default_generator)(limited_range)(generate_collisions))
+)
+UNORDERED_TEST(insert_rehash_exception_test,
+    ((test_map_))
+    ((try_emplace)(try_emplace2)(map_insert_operator)(map_insert_or_assign))
+    ((default_generator)(limited_range)(generate_collisions))
+)
+// clang-format on

-template <class T> struct insert_test_rehash1 : public insert_test_base<T>
+// Range insert tests
+
+template <typename T, typename Values>
+void insert_range_exception_test_impl(T x, Values const& v)
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  test::ordered<T> tracker;
+  tracker.insert(x.begin(), x.end());

-    insert_test_rehash1() : insert_test_base<T>(1000) {}
+  try {
+    ENABLE_EXCEPTIONS;
+    x.insert(v.begin(), v.end());
+  } catch (...) {
+    test::check_equivalent_keys(x);
+    throw;
+  }

-    T init() const
-    {
-        using namespace std;
-        typedef BOOST_DEDUCED_TYPENAME T::size_type size_type;
+  test::check_equivalent_keys(x);
+  tracker.insert(v.begin(), v.end());
+  tracker.compare(x);
+}

-        T x;
-        x.max_load_factor(0.25);
-        // TODO: This doesn't really work is bucket_count is 0
-        size_type bucket_count = x.bucket_count();
-        size_type initial_elements = static_cast<size_type>(
-            ceil((double)bucket_count * (double)x.max_load_factor()) - 1);
-        BOOST_TEST(initial_elements < this->values.size());
-        x.insert(this->values.begin(),
-            test::next(this->values.begin(), initial_elements));
-        BOOST_TEST(bucket_count == x.bucket_count());
-        return x;
-    }
-
-    void run(T& x, strong_type& strong) const
-    {
-        BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
-        int count = 0;
-        BOOST_DEDUCED_TYPENAME T::const_iterator pos = x.cbegin();
-
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = test::next(this->values.begin(), x.size()),
-                 end = this->values.end();
-             it != end && count < 10; ++it, ++count) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            pos = x.insert(pos, *it);
-        }
-
-        // This isn't actually a failure, but it means the test isn't doing its
-        // job.
-        BOOST_TEST(x.bucket_count() != bucket_count);
-    }
-};
-
-template <class T> struct insert_test_rehash2 : public insert_test_rehash1<T>
+template <typename T>
+void insert_range_exception_test(T*, test::random_generator gen)
 {
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+  for (int i = 0; i < 5; ++i) {
+    test::random_values<T> v(10, gen);
+    T x;

-    void run(T& x, strong_type& strong) const
-    {
-        BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
-        int count = 0;
+    EXCEPTION_LOOP(insert_range_exception_test_impl(x, v));
+  }
+}

-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = test::next(this->values.begin(), x.size()),
-                 end = this->values.end();
-             it != end && count < 10; ++it, ++count) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.insert(*it);
-        }
-
-        // This isn't actually a failure, but it means the test isn't doing its
-        // job.
-        BOOST_TEST(x.bucket_count() != bucket_count);
-    }
-};
-
-template <class T> struct insert_test_rehash3 : public insert_test_base<T>
+template <typename T>
+void insert_range_rehash_exception_test(T*, test::random_generator gen)
 {
-    BOOST_DEDUCED_TYPENAME T::size_type mutable rehash_bucket_count,
-        original_bucket_count;
+  for (int i = 0; i < 5; ++i) {
+    T x;
+    rehash_prep(x);

-    insert_test_rehash3() : insert_test_base<T>(1000) {}
+    test::random_values<T> v2(5, gen);
+    EXCEPTION_LOOP(insert_range_exception_test_impl(x, v2));
+  }
+}

-    T init() const
-    {
-        using namespace std;
-        typedef BOOST_DEDUCED_TYPENAME T::size_type size_type;
+// clang-format off
+UNORDERED_TEST(insert_range_exception_test,
+    ((test_set_)(test_multiset_)(test_map_)(test_multimap_))
+    ((default_generator)(limited_range)(generate_collisions))
+)

-        T x;
-        x.max_load_factor(0.25);
-
-        original_bucket_count = x.bucket_count();
-        rehash_bucket_count =
-            static_cast<size_type>(ceil(
-                (double)original_bucket_count * (double)x.max_load_factor())) -
-            1;
-
-        size_type initial_elements =
-            rehash_bucket_count > 5 ? rehash_bucket_count - 5 : 1;
-
-        BOOST_TEST(initial_elements < this->values.size());
-        x.insert(this->values.begin(),
-            test::next(this->values.begin(), initial_elements));
-        BOOST_TEST(original_bucket_count == x.bucket_count());
-        return x;
-    }
-
-    void run(T& x) const
-    {
-        BOOST_DEDUCED_TYPENAME T::size_type bucket_count = x.bucket_count();
-
-        x.insert(test::next(this->values.begin(), x.size()),
-            test::next(this->values.begin(), x.size() + 20));
-
-        // This isn't actually a failure, but it means the test isn't doing its
-        // job.
-        BOOST_TEST(x.bucket_count() != bucket_count);
-    }
-
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
-    {
-        if (x.size() < rehash_bucket_count) {
-            // BOOST_TEST(x.bucket_count() == original_bucket_count);
-        }
-        test::check_equivalent_keys(x);
-    }
-};
-
-#define BASIC_TESTS                                                            \
-    (insert_test1)(insert_test2)(insert_test3)(insert_test4)(                  \
-        insert_test_rehash1)(insert_test_rehash2)(insert_test_rehash3)
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) &&                              \
-    !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#define ALL_TESTS (emplace_test1) BASIC_TESTS
-#else
-#define ALL_TESTS BASIC_TESTS
-#endif
-
-EXCEPTION_TESTS(ALL_TESTS, CONTAINER_SEQ)
-
-template <class T> struct pair_emplace_test1 : public insert_test_base<T>
-{
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
-
-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.emplace(boost::unordered::piecewise_construct,
-                boost::make_tuple(it->first), boost::make_tuple(it->second));
-        }
-    }
-};
-
-template <class T> struct pair_emplace_test2 : public insert_test_base<T>
-{
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
-
-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x.emplace(boost::unordered::piecewise_construct,
-                boost::make_tuple(it->first),
-                boost::make_tuple(it->second.tag1_, it->second.tag2_));
-        }
-    }
-};
-
-EXCEPTION_TESTS((pair_emplace_test1)(pair_emplace_test2), CONTAINER_PAIR_SEQ)
-
-template <class T> struct index_insert_test1 : public insert_test_base<T>
-{
-    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
-
-    void run(T& x, strong_type& strong) const
-    {
-        for (BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-                 it = this->values.begin(),
-                 end = this->values.end();
-             it != end; ++it) {
-            strong.store(x, test::detail::tracker.count_allocations);
-            x[it->first];
-        }
-    }
-};
-
-EXCEPTION_TESTS((index_insert_test1), (test_map))
+UNORDERED_TEST(insert_range_rehash_exception_test,
+    ((test_set_)(test_multiset_)(test_map_)(test_multimap_))
+    ((default_generator)(limited_range)(generate_collisions))
+)
+// clang-format on

 RUN_TESTS()
@@ -0,0 +1,108 @@
+
+// Copyright 2017-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)
+
+#include "../helpers/exception_test.hpp"
+#include "../helpers/invariants.hpp"
+#include "../helpers/metafunctions.hpp"
+#include "../helpers/random_values.hpp"
+#include "./containers.hpp"
+
+template <typename T1, typename T2> void merge_exception_test(T1 x, T2 y)
+{
+  std::size_t size = x.size() + y.size();
+
+  try {
+    ENABLE_EXCEPTIONS;
+    x.merge(y);
+  } catch (...) {
+    test::check_equivalent_keys(x);
+    test::check_equivalent_keys(y);
+    throw;
+  }
+
+  // Not a full check, just want to make sure the merge completed.
+  BOOST_TEST(size == x.size() + y.size());
+  if (y.size()) {
+    BOOST_TEST(test::has_unique_keys<T1>::value);
+    for (typename T2::iterator it = y.begin(); it != y.end(); ++it) {
+      BOOST_TEST(x.find(test::get_key<T2>(*it)) != x.end());
+    }
+  }
+  test::check_equivalent_keys(x);
+  test::check_equivalent_keys(y);
+}
+
+template <typename T1, typename T2>
+void merge_exception_test(T1 const*, T2 const*, std::size_t count12, int tag12,
+  test::random_generator gen1, test::random_generator gen2)
+{
+  std::size_t count1 = count12 / 256;
+  std::size_t count2 = count12 % 256;
+  int tag1 = tag12 / 256;
+  int tag2 = tag12 % 256;
+  test::random_values<T1> v1(count1, gen1);
+  test::random_values<T2> v2(count2, gen2);
+  T1 x(v1.begin(), v1.end(), 0, test::exception::hash(tag1),
+    test::exception::equal_to(tag1));
+  T2 y(v2.begin(), v2.end(), 0, test::exception::hash(tag2),
+    test::exception::equal_to(tag2));
+
+  EXCEPTION_LOOP(merge_exception_test(x, y))
+}
+
+boost::unordered_set<test::exception::object, test::exception::hash,
+  test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >* test_set_;
+boost::unordered_multiset<test::exception::object, test::exception::hash,
+  test::exception::equal_to,
+  test::exception::allocator<test::exception::object> >* test_multiset_;
+boost::unordered_map<test::exception::object, test::exception::object,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >* test_map_;
+boost::unordered_multimap<test::exception::object, test::exception::object,
+  test::exception::hash, test::exception::equal_to,
+  test::exception::allocator2<test::exception::object> >* test_multimap_;
+
+using test::default_generator;
+using test::generate_collisions;
+using test::limited_range;
+
+// clang-format off
+UNORDERED_MULTI_TEST(set_merge, merge_exception_test,
+    ((test_set_)(test_multiset_))
+    ((test_set_)(test_multiset_))
+    ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
+    ((0x0000)(0x0001)(0x0102))
+    ((default_generator)(limited_range))
+    ((default_generator)(limited_range))
+)
+UNORDERED_MULTI_TEST(map_merge, merge_exception_test,
+    ((test_map_)(test_multimap_))
+    ((test_map_)(test_multimap_))
+    ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
+    ((0x0101)(0x0200)(0x0201))
+    ((default_generator)(limited_range))
+    ((default_generator)(limited_range))
+)
+// Run fewer generate_collisions tests, as they're slow.
+UNORDERED_MULTI_TEST(set_merge_collisions, merge_exception_test,
+    ((test_set_)(test_multiset_))
+    ((test_set_)(test_multiset_))
+    ((0x0a0a))
+    ((0x0202)(0x0100)(0x0201))
+    ((generate_collisions))
+    ((generate_collisions))
+)
+UNORDERED_MULTI_TEST(map_merge_collisions, merge_exception_test,
+    ((test_map_)(test_multimap_))
+    ((test_map_)(test_multimap_))
+    ((0x0a0a))
+    ((0x0000)(0x0002)(0x0102))
+    ((generate_collisions))
+    ((generate_collisions))
+)
+// clang-format on
+
+RUN_TESTS_QUIET()
@@ -7,117 +7,126 @@

 #include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
-#include <iostream>
+#include "../helpers/tracker.hpp"

 #if defined(BOOST_MSVC)
 #pragma warning(                                                               \
-    disable : 4512) // move_assignment operator could not be generated
+  disable : 4512) // move_assignment operator could not be generated
 #endif

 test::seed_t initialize_seed(12847);

 template <class T> struct move_assign_base : public test::exception_base
 {
-    test::random_values<T> x_values, y_values;
-    T x, y;
+  test::random_values<T> x_values, y_values;
+  T x, y;

-    typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
-    typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+  typedef typename T::hasher hasher;
+  typedef typename T::key_equal key_equal;
+  typedef typename T::allocator_type allocator_type;

-    move_assign_base(int tag1, int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
-        : x_values(), y_values(),
-          x(0, hasher(tag1), key_equal(tag1), allocator_type(tag1)),
-          y(0, hasher(tag2), key_equal(tag2), allocator_type(tag2))
-    {
-        x.max_load_factor(mlf1);
-        y.max_load_factor(mlf2);
-    }
+  move_assign_base(int tag1, int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
+      : x_values(), y_values(),
+        x(0, hasher(tag1), key_equal(tag1), allocator_type(tag1)),
+        y(0, hasher(tag2), key_equal(tag2), allocator_type(tag2))
+  {
+    x.max_load_factor(mlf1);
+    y.max_load_factor(mlf2);
+  }

-    typedef T data_type;
-    T init() const { return T(x); }
-    void run(T& x1) const
-    {
-        test::exceptions_enable disable_exceptions(false);
-        T y1 = y;
-        disable_exceptions.release();
-        x1 = boost::move(y1);
-    }
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x1) const
-    {
-        test::check_equivalent_keys(x1);
+  typedef T data_type;
+  T init() const { return T(x); }
+  void run(T& x1) const
+  {
+    test::exceptions_enable disable_exceptions(false);
+    T y1 = y;
+    disable_exceptions.release();
+    x1 = boost::move(y1);

-        // If the container is empty at the point of the exception, the
-        // internal structure is hidden, this exposes it, at the cost of
-        // messing up the data.
-        if (x_values.size()) {
-            T& x2 = const_cast<T&>(x1);
-            x2.emplace(*x_values.begin());
-            test::check_equivalent_keys(x2);
-        }
+    DISABLE_EXCEPTIONS;
+    test::check_container(x1, y_values);
+    test::check_equivalent_keys(x1);
+  }
+
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x1) const
+  {
+    test::check_equivalent_keys(x1);
+
+    // If the container is empty at the point of the exception, the
+    // internal structure is hidden, this exposes it, at the cost of
+    // messing up the data.
+    if (x_values.size()) {
+      T& x2 = const_cast<T&>(x1);
+      x2.emplace(*x_values.begin());
+      test::check_equivalent_keys(x2);
    }
+  }
 };

 template <class T> struct move_assign_values : move_assign_base<T>
 {
-    move_assign_values(unsigned int count1, unsigned int count2, int tag1,
-        int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
-        : move_assign_base<T>(tag1, tag2, mlf1, mlf2)
-    {
-        this->x_values.fill(count1);
-        this->y_values.fill(count2);
-        this->x.insert(this->x_values.begin(), this->x_values.end());
-        this->y.insert(this->y_values.begin(), this->y_values.end());
-    }
+  move_assign_values(unsigned int count1, unsigned int count2, int tag1,
+    int tag2, float mlf1 = 1.0, float mlf2 = 1.0)
+      : move_assign_base<T>(tag1, tag2, mlf1, mlf2)
+  {
+    this->x_values.fill(count1, test::limited_range);
+    this->y_values.fill(count2, test::limited_range);
+    this->x.insert(this->x_values.begin(), this->x_values.end());
+    this->y.insert(this->y_values.begin(), this->y_values.end());
+  }
 };

 template <class T> struct move_assign_test1 : move_assign_values<T>
 {
-    move_assign_test1() : move_assign_values<T>(0, 0, 0, 0) {}
+  move_assign_test1() : move_assign_values<T>(0, 0, 0, 0) {}
 };

 template <class T> struct move_assign_test2 : move_assign_values<T>
 {
-    move_assign_test2() : move_assign_values<T>(60, 0, 0, 0) {}
+  move_assign_test2() : move_assign_values<T>(60, 0, 0, 0) {}
 };

 template <class T> struct move_assign_test3 : move_assign_values<T>
 {
-    move_assign_test3() : move_assign_values<T>(0, 60, 0, 0) {}
+  move_assign_test3() : move_assign_values<T>(0, 60, 0, 0) {}
 };

 template <class T> struct move_assign_test4 : move_assign_values<T>
 {
-    move_assign_test4() : move_assign_values<T>(10, 10, 1, 2) {}
+  move_assign_test4() : move_assign_values<T>(10, 10, 1, 2) {}
 };

 template <class T> struct move_assign_test4a : move_assign_values<T>
 {
-    move_assign_test4a() : move_assign_values<T>(10, 100, 1, 2) {}
+  move_assign_test4a() : move_assign_values<T>(10, 100, 1, 2) {}
 };

 template <class T> struct move_assign_test5 : move_assign_values<T>
 {
-    move_assign_test5() : move_assign_values<T>(5, 60, 0, 0, 1.0f, 0.1f) {}
+  move_assign_test5() : move_assign_values<T>(5, 60, 0, 0, 1.0f, 0.1f) {}
 };

 template <class T> struct equivalent_test1 : move_assign_base<T>
 {
-    equivalent_test1() : move_assign_base<T>(0, 0)
-    {
-        test::random_values<T> x_values2(10);
-        this->x_values.insert(x_values2.begin(), x_values2.end());
-        this->x_values.insert(x_values2.begin(), x_values2.end());
-        test::random_values<T> y_values2(10);
-        this->y_values.insert(y_values2.begin(), y_values2.end());
-        this->y_values.insert(y_values2.begin(), y_values2.end());
-        this->x.insert(this->x_values.begin(), this->x_values.end());
-        this->y.insert(this->y_values.begin(), this->y_values.end());
-    }
+  equivalent_test1() : move_assign_base<T>(0, 0)
+  {
+    test::random_values<T> x_values2(10, test::limited_range);
+    this->x_values.insert(x_values2.begin(), x_values2.end());
+    this->x_values.insert(x_values2.begin(), x_values2.end());
+    test::random_values<T> y_values2(10, test::limited_range);
+    this->y_values.insert(y_values2.begin(), y_values2.end());
+    this->y_values.insert(y_values2.begin(), y_values2.end());
+    this->x.insert(this->x_values.begin(), this->x_values.end());
+    this->y.insert(this->y_values.begin(), this->y_values.end());
+  }
 };

-EXCEPTION_TESTS((move_assign_test1)(move_assign_test2)(move_assign_test3)(
-                    move_assign_test4)(move_assign_test4a)(move_assign_test5)(
-                    equivalent_test1),
-    CONTAINER_SEQ)
+// clang-format off
+EXCEPTION_TESTS(
+  (move_assign_test1)(move_assign_test2)(move_assign_test3)
+  (move_assign_test4)(move_assign_test4a)(move_assign_test5)
+  (equivalent_test1),
+  CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -8,75 +8,126 @@
 #include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
 #include "../helpers/strong.hpp"
+#include "../helpers/tracker.hpp"
 #include <string>

-#include <iostream>
-
 test::seed_t initialize_seed(3298597);

 template <class T> struct rehash_test_base : public test::exception_base
 {
-    test::random_values<T> values;
-    unsigned int n;
-    rehash_test_base(unsigned int count = 100, unsigned int n_ = 0)
-        : values(count), n(n_)
-    {
-    }
+  test::random_values<T> values;
+  unsigned int n;
+  rehash_test_base(unsigned int count = 100, unsigned int n_ = 0)
+      : values(count, test::limited_range), n(n_)
+  {
+  }

-    typedef T data_type;
-    typedef test::strong<T> strong_type;
+  typedef T data_type;
+  typedef test::strong<T> strong_type;

-    data_type init() const
-    {
-        T x(values.begin(), values.end(), n);
-        return x;
-    }
+  data_type init() const
+  {
+    T x(values.begin(), values.end(), n);
+    return x;
+  }

-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(
-        T const& x, strong_type const& strong) const
-    {
-        std::string scope(test::scope);
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(
+    T const& x, strong_type const& strong) const
+  {
+    std::string scope(test::scope);

-        if (scope.find("hash::operator()") == std::string::npos &&
-            scope.find("equal_to::operator()") == std::string::npos &&
-            scope != "operator==(object, object)")
-            strong.test(x);
+    if (scope.find("hash::operator()") == std::string::npos &&
+        scope.find("equal_to::operator()") == std::string::npos &&
+        scope != "operator==(object, object)")
+      strong.test(x);

-        test::check_equivalent_keys(x);
-    }
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct rehash_test0 : rehash_test_base<T>
 {
-    rehash_test0() : rehash_test_base<T>(0) {}
-    void run(T& x) const { x.rehash(0); }
+  rehash_test0() : rehash_test_base<T>(0) {}
+  void run(T& x) const
+  {
+    x.rehash(0);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct rehash_test1 : rehash_test_base<T>
 {
-    rehash_test1() : rehash_test_base<T>(0) {}
-    void run(T& x) const { x.rehash(200); }
+  rehash_test1() : rehash_test_base<T>(0) {}
+  void run(T& x) const
+  {
+    x.rehash(200);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct rehash_test2 : rehash_test_base<T>
 {
-    rehash_test2() : rehash_test_base<T>(0, 200) {}
-    void run(T& x) const { x.rehash(0); }
+  rehash_test2() : rehash_test_base<T>(0, 200) {}
+  void run(T& x) const
+  {
+    x.rehash(0);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct rehash_test3 : rehash_test_base<T>
 {
-    rehash_test3() : rehash_test_base<T>(10, 0) {}
-    void run(T& x) const { x.rehash(200); }
+  rehash_test3() : rehash_test_base<T>(10, 0) {}
+  void run(T& x) const
+  {
+    x.rehash(200);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct rehash_test4 : rehash_test_base<T>
 {
-    rehash_test4() : rehash_test_base<T>(10, 200) {}
-    void run(T& x) const { x.rehash(0); }
+  rehash_test4() : rehash_test_base<T>(10, 200) {}
+  void run(T& x) const
+  {
+    x.rehash(0);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
 };

+template <class T> struct rehash_test5 : rehash_test_base<T>
+{
+  rehash_test5() : rehash_test_base<T>(200, 10) {}
+  void run(T& x) const
+  {
+    x.rehash(0);
+
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
+};
+
+// clang-format off
 EXCEPTION_TESTS(
-    (rehash_test0)(rehash_test1)(rehash_test2)(rehash_test3)(rehash_test4),
-    CONTAINER_SEQ)
+  (rehash_test0)(rehash_test1)(rehash_test2)(rehash_test3)(rehash_test4)
+  (rehash_test5),
+  CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -7,6 +7,7 @@

 #include "../helpers/invariants.hpp"
 #include "../helpers/random_values.hpp"
+#include "../helpers/tracker.hpp"

 #if defined(BOOST_MSVC)
 #pragma warning(disable : 4512) // assignment operator could not be generated
@@ -16,24 +17,33 @@ test::seed_t initialize_seed(9387);

 template <class T> struct self_swap_base : public test::exception_base
 {
-    test::random_values<T> values;
-    self_swap_base(std::size_t count = 0) : values(count) {}
+  test::random_values<T> values;
+  self_swap_base(std::size_t count = 0) : values(count, test::limited_range) {}

-    typedef T data_type;
-    T init() const { return T(values.begin(), values.end()); }
-    void run(T& x) const { x.swap(x); }
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
-    {
-        std::string scope(test::scope);
+  typedef T data_type;
+  T init() const { return T(values.begin(), values.end()); }

-        // TODO: In C++11 exceptions are only allowed in the swap function.
-        BOOST_TEST(scope == "hash::hash(hash)" ||
-                   scope == "hash::operator=(hash)" ||
-                   scope == "equal_to::equal_to(equal_to)" ||
-                   scope == "equal_to::operator=(equal_to)");
+  void run(T& x) const
+  {
+    x.swap(x);

-        test::check_equivalent_keys(x);
-    }
+    DISABLE_EXCEPTIONS;
+    test::check_container(x, this->values);
+    test::check_equivalent_keys(x);
+  }
+
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
+  {
+    std::string scope(test::scope);
+
+    // TODO: In C++11 exceptions are only allowed in the swap function.
+    BOOST_TEST(scope == "hash::hash(hash)" ||
+               scope == "hash::operator=(hash)" ||
+               scope == "equal_to::equal_to(equal_to)" ||
+               scope == "equal_to::operator=(equal_to)");
+
+    test::check_equivalent_keys(x);
+  }
 };

 template <class T> struct self_swap_test1 : self_swap_base<T>
@@ -42,83 +52,94 @@ template <class T> struct self_swap_test1 : self_swap_base<T>

 template <class T> struct self_swap_test2 : self_swap_base<T>
 {
-    self_swap_test2() : self_swap_base<T>(100) {}
+  self_swap_test2() : self_swap_base<T>(100) {}
 };

 template <class T> struct swap_base : public test::exception_base
 {
-    const test::random_values<T> x_values, y_values;
-    const T initial_x, initial_y;
+  const test::random_values<T> x_values, y_values;
+  const T initial_x, initial_y;

-    typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
-    typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+  typedef typename T::hasher hasher;
+  typedef typename T::key_equal key_equal;
+  typedef typename T::allocator_type allocator_type;

-    swap_base(unsigned int count1, unsigned int count2, int tag1, int tag2)
-        : x_values(count1), y_values(count2),
-          initial_x(x_values.begin(), x_values.end(), 0, hasher(tag1),
-              key_equal(tag1), allocator_type(tag1)),
-          initial_y(
-              y_values.begin(), y_values.end(), 0, hasher(tag2),
-              key_equal(tag2),
-              allocator_type(
-                  T::allocator_type::propagate_on_container_swap::value ? tag2
-                                                                        : tag1))
-    {
+  swap_base(unsigned int count1, unsigned int count2, int tag1, int tag2)
+      : x_values(count1, test::limited_range),
+        y_values(count2, test::limited_range),
+        initial_x(x_values.begin(), x_values.end(), 0, hasher(tag1),
+          key_equal(tag1), allocator_type(tag1)),
+        initial_y(y_values.begin(), y_values.end(), 0, hasher(tag2),
+          key_equal(tag2),
+          allocator_type(T::allocator_type::propagate_on_container_swap::value
+                           ? tag2
+                           : tag1))
+  {
+  }
+
+  struct data_type
+  {
+    data_type(T const& x_, T const& y_) : x(x_), y(y_) {}
+
+    T x, y;
+  };
+
+  data_type init() const { return data_type(initial_x, initial_y); }
+
+  void run(data_type& d) const
+  {
+    try {
+      d.x.swap(d.y);
+    } catch (std::runtime_error&) {
    }

-    struct data_type
-    {
-        data_type(T const& x_, T const& y_) : x(x_), y(y_) {}
+    DISABLE_EXCEPTIONS;
+    test::check_container(d.x, this->y_values);
+    test::check_equivalent_keys(d.x);
+    test::check_container(d.y, this->x_values);
+    test::check_equivalent_keys(d.y);
+  }

-        T x, y;
-    };
+  void check BOOST_PREVENT_MACRO_SUBSTITUTION(data_type const& d) const
+  {
+    std::string scope(test::scope);

-    data_type init() const { return data_type(initial_x, initial_y); }
+    // TODO: In C++11 exceptions are only allowed in the swap function.
+    BOOST_TEST(scope == "hash::hash(hash)" ||
+               scope == "hash::operator=(hash)" ||
+               scope == "equal_to::equal_to(equal_to)" ||
+               scope == "equal_to::operator=(equal_to)");

-    void run(data_type& d) const
-    {
-        try {
-            d.x.swap(d.y);
-        } catch (std::runtime_error) {
-        }
-    }
-    void check BOOST_PREVENT_MACRO_SUBSTITUTION(data_type const& d) const
-    {
-        std::string scope(test::scope);
-
-        // TODO: In C++11 exceptions are only allowed in the swap function.
-        BOOST_TEST(scope == "hash::hash(hash)" ||
-                   scope == "hash::operator=(hash)" ||
-                   scope == "equal_to::equal_to(equal_to)" ||
-                   scope == "equal_to::operator=(equal_to)");
-
-        test::check_equivalent_keys(d.x);
-        test::check_equivalent_keys(d.y);
-    }
+    test::check_equivalent_keys(d.x);
+    test::check_equivalent_keys(d.y);
+  }
 };

 template <class T> struct swap_test1 : swap_base<T>
 {
-    swap_test1() : swap_base<T>(0, 0, 0, 0) {}
+  swap_test1() : swap_base<T>(0, 0, 0, 0) {}
 };

 template <class T> struct swap_test2 : swap_base<T>
 {
-    swap_test2() : swap_base<T>(60, 0, 0, 0) {}
+  swap_test2() : swap_base<T>(60, 0, 0, 0) {}
 };

 template <class T> struct swap_test3 : swap_base<T>
 {
-    swap_test3() : swap_base<T>(0, 60, 0, 0) {}
+  swap_test3() : swap_base<T>(0, 60, 0, 0) {}
 };

 template <class T> struct swap_test4 : swap_base<T>
 {
-    swap_test4() : swap_base<T>(10, 10, 1, 2) {}
+  swap_test4() : swap_base<T>(10, 10, 1, 2) {}
 };

-EXCEPTION_TESTS((self_swap_test1)(self_swap_test2)(swap_test1)(swap_test2)(
-                    swap_test3)(swap_test4),
-    CONTAINER_SEQ)
+// clang-format off
+EXCEPTION_TESTS(
+  (self_swap_test1)(self_swap_test2)
+  (swap_test1)(swap_test2)(swap_test3)(swap_test4),
+  CONTAINER_SEQ)
+// clang-format on
+
 RUN_TESTS()
@@ -11,23 +11,23 @@
 #include <boost/type_traits/is_same.hpp>

 namespace test {
-template <class T1> struct check_return_type
-{
+  template <class T1> struct check_return_type
+  {
    template <class T2> static void equals(T2)
    {
-        BOOST_STATIC_ASSERT((boost::is_same<T1, T2>::value));
+      BOOST_STATIC_ASSERT((boost::is_same<T1, T2>::value));
    }

    template <class T2> static void equals_ref(T2&)
    {
-        BOOST_STATIC_ASSERT((boost::is_same<T1, T2>::value));
+      BOOST_STATIC_ASSERT((boost::is_same<T1, T2>::value));
    }

    template <class T2> static void convertible(T2)
    {
-        BOOST_STATIC_ASSERT((boost::is_convertible<T2, T1>::value));
+      BOOST_STATIC_ASSERT((boost::is_convertible<T2, T1>::value));
    }
-};
+  };
 }

 #endif
@@ -6,12 +6,11 @@
 #if !defined(BOOST_UNORDERED_TEST_HELPERS_COUNT_HEAD)
 #define BOOST_UNORDERED_TEST_HELPERS_COUNT_HEAD

-#include <boost/detail/lightweight_test.hpp>
-#include <iostream>
+#include <boost/core/lightweight_test.hpp>

 namespace test {
-struct object_count
-{
+  struct object_count
+  {
    int instances;
    int constructions;

@@ -20,52 +19,52 @@ struct object_count

    void construct()
    {
-        ++instances;
-        ++constructions;
+      ++instances;
+      ++constructions;
    }

    void destruct()
    {
-        if (instances == 0) {
-            BOOST_ERROR("Unbalanced constructions.");
-        } else {
-            --instances;
-        }
+      if (instances == 0) {
+        BOOST_ERROR("Unbalanced constructions.");
+      } else {
+        --instances;
+      }
    }

    bool operator==(object_count const& x) const
    {
-        return instances == x.instances && constructions == x.constructions;
+      return instances == x.instances && constructions == x.constructions;
    }

    bool operator!=(object_count const& x) const { return !(*this == x); }

    friend std::ostream& operator<<(std::ostream& out, object_count const& c)
    {
-        out << "[instances: " << c.instances
-            << ", constructions: " << c.constructions << "]";
-        return out;
+      out << "[instances: " << c.instances
+          << ", constructions: " << c.constructions << "]";
+      return out;
    }
-};
+  };

-// This won't be a problem as I'm only using a single compile unit
-// in each test (this is actually require by the minimal test
-// framework).
-//
-// boostinspect:nounnamed
-namespace {
-object_count global_object_count;
-}
+  // This won't be a problem as I'm only using a single compile unit
+  // in each test (this is actually require by the minimal test
+  // framework).
+  //
+  // boostinspect:nounnamed
+  namespace {
+    object_count global_object_count;
+  }

-struct counted_object
-{
+  struct counted_object
+  {
    counted_object() { global_object_count.construct(); }
    counted_object(counted_object const&) { global_object_count.construct(); }
    ~counted_object() { global_object_count.destruct(); }
-};
+  };

-struct check_instances
-{
+  struct check_instances
+  {
    int instances_;
    int constructions_;

@@ -76,15 +75,15 @@ struct check_instances
    }
    ~check_instances()
    {
-        BOOST_TEST(global_object_count.instances == instances_);
+      BOOST_TEST(global_object_count.instances == instances_);
    }

    int instances() const { return global_object_count.instances - instances_; }
    int constructions() const
    {
-        return global_object_count.constructions - constructions_;
+      return global_object_count.constructions - constructions_;
    }
-};
+  };
 }

 #endif
@@ -10,59 +10,60 @@
 #include "./list.hpp"
 #include "./metafunctions.hpp"
 #include <algorithm>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>

 namespace test {
-template <class T1, class T2>
-bool equivalent_impl(T1 const& x, T2 const& y, base_type)
-{
+  template <class T1, class T2>
+  bool equivalent_impl(T1 const& x, T2 const& y, base_type)
+  {
    return x == y;
-}
+  }

-template <class T>
-bool equivalent_impl(boost::hash<T> const&, boost::hash<T> const&, derived_type)
-{
+  template <class T>
+  bool equivalent_impl(
+    boost::hash<T> const&, boost::hash<T> const&, derived_type)
+  {
    return true;
-}
+  }

-template <class T>
-bool equivalent_impl(
+  template <class T>
+  bool equivalent_impl(
    std::equal_to<T> const&, std::equal_to<T> const&, derived_type)
-{
+  {
    return true;
-}
+  }

-template <class T1, class T2, class T3, class T4>
-bool equivalent_impl(
+  template <class T1, class T2, class T3, class T4>
+  bool equivalent_impl(
    std::pair<T1, T2> const& x1, std::pair<T3, T4> const& x2, derived_type)
-{
+  {
    return equivalent_impl(x1.first, x2.first, derived) &&
           equivalent_impl(x1.second, x2.second, derived);
-}
+  }

-struct equivalent_type
-{
+  struct equivalent_type
+  {
    equivalent_type() {}

    template <class T1, class T2>
    bool operator()(T1 const& x, T2 const& y) const
    {
-        return equivalent_impl(x, y, derived);
+      return equivalent_impl(x, y, derived);
    }
-};
+  };

-const equivalent_type equivalent;
+  const equivalent_type equivalent;

-template <class Container> class unordered_equivalence_tester
-{
-    BOOST_DEDUCED_TYPENAME Container::size_type size_;
-    BOOST_DEDUCED_TYPENAME Container::hasher hasher_;
-    BOOST_DEDUCED_TYPENAME Container::key_equal key_equal_;
+  template <class Container> class unordered_equivalence_tester
+  {
+    typename Container::size_type size_;
+    typename Container::hasher hasher_;
+    typename Container::key_equal key_equal_;
    float max_load_factor_;

-    typedef test::list<BOOST_DEDUCED_TYPENAME Container::value_type> value_list;
+    typedef test::list<typename Container::value_type> value_list;
    value_list values_;

  public:
@@ -70,26 +71,26 @@ template <class Container> class unordered_equivalence_tester
        : size_(x.size()), hasher_(x.hash_function()), key_equal_(x.key_eq()),
          max_load_factor_(x.max_load_factor()), values_(x.begin(), x.end())
    {
-        values_.sort();
+      values_.sort();
    }

    bool operator()(Container const& x) const
    {
-        if (!((size_ == x.size()) &&
-                (test::equivalent(hasher_, x.hash_function())) &&
-                (test::equivalent(key_equal_, x.key_eq())) &&
-                (max_load_factor_ == x.max_load_factor()) &&
-                (values_.size() == x.size())))
-            return false;
+      if (!((size_ == x.size()) &&
+            (test::equivalent(hasher_, x.hash_function())) &&
+            (test::equivalent(key_equal_, x.key_eq())) &&
+            (max_load_factor_ == x.max_load_factor()) &&
+            (values_.size() == x.size())))
+        return false;

-        value_list copy(x.begin(), x.end());
-        copy.sort();
-        return values_ == copy;
+      value_list copy(x.begin(), x.end());
+      copy.sort();
+      return values_ == copy;
    }

  private:
    unordered_equivalence_tester();
-};
+  };
 }

 #endif
@@ -14,64 +14,59 @@
 #include <boost/preprocessor/seq/for_each_product.hpp>

 #define UNORDERED_EXCEPTION_TEST_CASE(name, test_func, type)                   \
-    UNORDERED_AUTO_TEST(name)                                                  \
-    {                                                                          \
-        test_func<type> fixture;                                               \
-        ::test::lightweight::exception_safety(                                 \
-            fixture, BOOST_STRINGIZE(test_func<type>));                        \
-    }
+  UNORDERED_AUTO_TEST (name) {                                                 \
+    test_func<type> fixture;                                                   \
+    ::test::lightweight::exception_safety(                                     \
+      fixture, BOOST_STRINGIZE(test_func<type>));                              \
+  }

 #define UNORDERED_EXCEPTION_TEST_CASE_REPEAT(name, test_func, n, type)         \
-    UNORDERED_AUTO_TEST(name)                                                  \
-    {                                                                          \
-        for (unsigned i = 0; i < n; ++i) {                                     \
-            test_func<type> fixture;                                           \
-            ::test::lightweight::exception_safety(                             \
-                fixture, BOOST_STRINGIZE(test_func<type>));                    \
-        }                                                                      \
-    }
+  UNORDERED_AUTO_TEST (name) {                                                 \
+    for (unsigned i = 0; i < n; ++i) {                                         \
+      test_func<type> fixture;                                                 \
+      ::test::lightweight::exception_safety(                                   \
+        fixture, BOOST_STRINGIZE(test_func<type>));                            \
+    }                                                                          \
+  }

 #define UNORDERED_EPOINT_IMPL ::test::lightweight::epoint

 #define UNORDERED_EXCEPTION_TEST_POSTFIX RUN_TESTS()

 #define EXCEPTION_TESTS(test_seq, param_seq)                                   \
-    BOOST_PP_SEQ_FOR_EACH_PRODUCT(                                             \
-        EXCEPTION_TESTS_OP, (test_seq)((1))(param_seq))
+  BOOST_PP_SEQ_FOR_EACH_PRODUCT(EXCEPTION_TESTS_OP, (test_seq)((1))(param_seq))

 #define EXCEPTION_TESTS_REPEAT(n, test_seq, param_seq)                         \
-    BOOST_PP_SEQ_FOR_EACH_PRODUCT(                                             \
-        EXCEPTION_TESTS_OP, (test_seq)((n))(param_seq))
+  BOOST_PP_SEQ_FOR_EACH_PRODUCT(EXCEPTION_TESTS_OP, (test_seq)((n))(param_seq))

 #define EXCEPTION_TESTS_OP(r, product)                                         \
-    UNORDERED_EXCEPTION_TEST_CASE_REPEAT(                                      \
-        BOOST_PP_CAT(BOOST_PP_SEQ_ELEM(0, product),                            \
-            BOOST_PP_CAT(_, BOOST_PP_SEQ_ELEM(2, product))),                   \
-        BOOST_PP_SEQ_ELEM(0, product), BOOST_PP_SEQ_ELEM(1, product),          \
-        BOOST_PP_SEQ_ELEM(2, product))
+  UNORDERED_EXCEPTION_TEST_CASE_REPEAT(                                        \
+    BOOST_PP_CAT(BOOST_PP_SEQ_ELEM(0, product),                                \
+      BOOST_PP_CAT(_, BOOST_PP_SEQ_ELEM(2, product))),                         \
+    BOOST_PP_SEQ_ELEM(0, product), BOOST_PP_SEQ_ELEM(1, product),              \
+    BOOST_PP_SEQ_ELEM(2, product))

 #define UNORDERED_SCOPE(scope_name)                                            \
-    for (::test::scope_guard unordered_test_guard(                             \
-             BOOST_STRINGIZE(scope_name));                                     \
-         !unordered_test_guard.dismissed(); unordered_test_guard.dismiss())
+  for (::test::scope_guard unordered_test_guard(BOOST_STRINGIZE(scope_name));  \
+       !unordered_test_guard.dismissed(); unordered_test_guard.dismiss())

 #define UNORDERED_EPOINT(name)                                                 \
-    if (::test::exceptions_enabled) {                                          \
-        UNORDERED_EPOINT_IMPL(name);                                           \
-    }
+  if (::test::exceptions_enabled) {                                            \
+    UNORDERED_EPOINT_IMPL(name);                                               \
+  }

 #define ENABLE_EXCEPTIONS                                                      \
-    ::test::exceptions_enable BOOST_PP_CAT(ENABLE_EXCEPTIONS_, __LINE__)(true)
+  ::test::exceptions_enable BOOST_PP_CAT(ENABLE_EXCEPTIONS_, __LINE__)(true)

 #define DISABLE_EXCEPTIONS                                                     \
-    ::test::exceptions_enable BOOST_PP_CAT(ENABLE_EXCEPTIONS_, __LINE__)(false)
+  ::test::exceptions_enable BOOST_PP_CAT(ENABLE_EXCEPTIONS_, __LINE__)(false)

 namespace test {
-static char const* scope = "";
-bool exceptions_enabled = false;
+  static char const* scope = "";
+  bool exceptions_enabled = false;

-class scope_guard
-{
+  class scope_guard
+  {
    scope_guard& operator=(scope_guard const&);
    scope_guard(scope_guard const&);

@@ -83,22 +78,22 @@ class scope_guard
    scope_guard(char const* name)
        : old_scope_(scope), scope_(name), dismissed_(false)
    {
-        scope = scope_;
+      scope = scope_;
    }

    ~scope_guard()
    {
-        if (dismissed_)
-            scope = old_scope_;
+      if (dismissed_)
+        scope = old_scope_;
    }

    void dismiss() { dismissed_ = true; }

    bool dismissed() const { return dismissed_; }
-};
+  };

-class exceptions_enable
-{
+  class exceptions_enable
+  {
    exceptions_enable& operator=(exceptions_enable const&);
    exceptions_enable(exceptions_enable const&);

@@ -109,65 +104,65 @@ class exceptions_enable
    exceptions_enable(bool enable)
        : old_value_(exceptions_enabled), released_(false)
    {
-        exceptions_enabled = enable;
+      exceptions_enabled = enable;
    }

    ~exceptions_enable()
    {
-        if (!released_) {
-            exceptions_enabled = old_value_;
-            released_ = true;
-        }
+      if (!released_) {
+        exceptions_enabled = old_value_;
+        released_ = true;
+      }
    }

    void release()
    {
-        if (!released_) {
-            exceptions_enabled = old_value_;
-            released_ = true;
-        }
+      if (!released_) {
+        exceptions_enabled = old_value_;
+        released_ = true;
+      }
    }
-};
+  };

-struct exception_base
-{
+  struct exception_base
+  {
    struct data_type
    {
    };
    struct strong_type
    {
-        template <class T> void store(T const&) {}
-        template <class T> void test(T const&) const {}
+      template <class T> void store(T const&) {}
+      template <class T> void test(T const&) const {}
    };
    data_type init() const { return data_type(); }
    void check BOOST_PREVENT_MACRO_SUBSTITUTION() const {}
-};
+  };

-template <class T, class P1, class P2, class T2>
-inline void call_ignore_extra_parameters(
+  template <class T, class P1, class P2, class T2>
+  inline void call_ignore_extra_parameters(
    void (T::*fn)() const, T2 const& obj, P1&, P2&)
-{
+  {
    (obj.*fn)();
-}
+  }

-template <class T, class P1, class P2, class T2>
-inline void call_ignore_extra_parameters(
+  template <class T, class P1, class P2, class T2>
+  inline void call_ignore_extra_parameters(
    void (T::*fn)(P1&) const, T2 const& obj, P1& p1, P2&)
-{
+  {
    (obj.*fn)(p1);
-}
+  }

-template <class T, class P1, class P2, class T2>
-inline void call_ignore_extra_parameters(
+  template <class T, class P1, class P2, class T2>
+  inline void call_ignore_extra_parameters(
    void (T::*fn)(P1&, P2&) const, T2 const& obj, P1& p1, P2& p2)
-{
+  {
    (obj.*fn)(p1, p2);
-}
+  }

-template <class T> T const& constant(T const& x) { return x; }
+  template <class T> T const& constant(T const& x) { return x; }

-template <class Test> class test_runner
-{
+  template <class Test> class test_runner
+  {
    Test const& test_;
    bool exception_in_check_;

@@ -178,94 +173,176 @@ template <class Test> class test_runner
    test_runner(Test const& t) : test_(t), exception_in_check_(false) {}
    void run()
    {
-        DISABLE_EXCEPTIONS;
-        test::check_instances check;
-        test::scope = "";
-        BOOST_DEDUCED_TYPENAME Test::data_type x(test_.init());
-        BOOST_DEDUCED_TYPENAME Test::strong_type strong;
-        strong.store(x);
+      DISABLE_EXCEPTIONS;
+      test::check_instances check;
+      test::scope = "";
+      typename Test::data_type x(test_.init());
+      typename Test::strong_type strong;
+      strong.store(x);
+      try {
+        ENABLE_EXCEPTIONS;
+        call_ignore_extra_parameters<Test, typename Test::data_type,
+          typename Test::strong_type>(&Test::run, test_, x, strong);
+      } catch (...) {
        try {
-            ENABLE_EXCEPTIONS;
-            call_ignore_extra_parameters<Test,
-                BOOST_DEDUCED_TYPENAME Test::data_type,
-                BOOST_DEDUCED_TYPENAME Test::strong_type>(
-                &Test::run, test_, x, strong);
+          DISABLE_EXCEPTIONS;
+          call_ignore_extra_parameters<Test, typename Test::data_type const,
+            typename Test::strong_type const>(
+            &Test::check, test_, constant(x), constant(strong));
        } catch (...) {
-            try {
-                DISABLE_EXCEPTIONS;
-                call_ignore_extra_parameters<Test,
-                    BOOST_DEDUCED_TYPENAME Test::data_type const,
-                    BOOST_DEDUCED_TYPENAME Test::strong_type const>(
-                    &Test::check, test_, constant(x), constant(strong));
-            } catch (...) {
-                exception_in_check_ = true;
-            }
-            throw;
+          exception_in_check_ = true;
        }
+        throw;
+      }
    }
    void end()
    {
-        if (exception_in_check_) {
-            BOOST_ERROR("Unexcpected exception in test_runner check call.");
-        }
+      if (exception_in_check_) {
+        BOOST_ERROR("Unexcpected exception in test_runner check call.");
+      }
    }
-};
+  };

-// Quick exception testing based on lightweight test
+  // Quick exception testing based on lightweight test

-namespace lightweight {
-static int iteration;
-static int count;
+  namespace lightweight {
+    static int iteration;
+    static int count;

-struct test_exception
-{
-    char const* name;
-    test_exception(char const* n) : name(n) {}
-};
+    struct test_exception
+    {
+      char const* name;
+      test_exception(char const* n) : name(n) {}
+    };

-struct test_failure
-{
-};
+    struct test_failure
+    {
+    };

-void epoint(char const* name)
-{
-    ++count;
-    if (count == iteration) {
+    void epoint(char const* name)
+    {
+      ++count;
+      if (count == iteration) {
        throw test_exception(name);
+      }
    }
-}

-template <class Test> void exception_safety(Test const& f, char const* /*name*/)
-{
-    test_runner<Test> runner(f);
+    template <class Test>
+    void exception_safety(Test const& f, char const* /*name*/)
+    {
+      test_runner<Test> runner(f);

-    iteration = 0;
-    bool success = false;
-    char const* error_msg = 0;
-    do {
+      iteration = 0;
+      bool success = false;
+      unsigned int failure_count = 0;
+      char const* error_msg = 0;
+      do {
+        int error_count = boost::detail::test_errors();
        ++iteration;
        count = 0;

        try {
-            runner.run();
-            success = true;
+          runner.run();
+          success = true;
        } catch (test_failure) {
-            error_msg = "test_failure caught.";
-            break;
-        } catch (test_exception) {
-            continue;
+          error_msg = "test_failure caught.";
+          break;
+        } catch (test_exception e) {
+          if (error_count != boost::detail::test_errors()) {
+            BOOST_LIGHTWEIGHT_TEST_OSTREAM
+              << "Iteration: " << iteration
+              << " Error found for epoint: " << e.name << std::endl;
+          }
        } catch (...) {
-            error_msg = "Unexpected exception.";
-            break;
+          error_msg = "Unexpected exception.";
+          break;
        }
-    } while (!success);

-    if (error_msg) {
+        if (error_count != boost::detail::test_errors()) {
+          ++failure_count;
+        }
+      } while (!success && failure_count < 5);
+
+      if (error_msg) {
        BOOST_ERROR(error_msg);
+      }
+      runner.end();
    }
-    runner.end();
-}
-}
+
+    //
+    // An alternative way to run exception tests.
+    // See merge_exception_tests.cpp for an example.
+
+    struct exception_looper
+    {
+      bool success;
+      unsigned int failure_count;
+      char const* error_msg;
+      int error_count;
+
+      exception_looper() : success(false), failure_count(0), error_msg(0) {}
+
+      void start() { iteration = 0; }
+
+      bool loop_condition() const
+      {
+        return !error_msg && !success && failure_count < 5;
+      }
+
+      void start_iteration()
+      {
+        error_count = boost::detail::test_errors();
+        ++iteration;
+        count = 0;
+      }
+
+      void successful_run() { success = true; }
+
+      void test_failure_caught(test_failure const&)
+      {
+        error_msg = "test_failure caught.";
+      }
+
+      void test_exception_caught(test_exception const& e)
+      {
+        if (error_count != boost::detail::test_errors()) {
+          BOOST_LIGHTWEIGHT_TEST_OSTREAM
+            << "Iteration: " << iteration
+            << " Error found for epoint: " << e.name << std::endl;
+        }
+      }
+
+      void unexpected_exception_caught()
+      {
+        error_msg = "Unexpected exception.";
+      }
+
+      void end()
+      {
+        if (error_msg) {
+          BOOST_ERROR(error_msg);
+        }
+      }
+    };
+
+#define EXCEPTION_LOOP(op)                                                     \
+  test::lightweight::exception_looper looper;                                  \
+  looper.start();                                                              \
+  while (looper.loop_condition()) {                                            \
+    looper.start_iteration();                                                  \
+    try {                                                                      \
+      op;                                                                      \
+      looper.successful_run();                                                 \
+    } catch (test::lightweight::test_failure e) {                              \
+      looper.test_failure_caught(e);                                           \
+    } catch (test::lightweight::test_exception e) {                            \
+      looper.test_exception_caught(e);                                         \
+    } catch (...) {                                                            \
+      looper.unexpected_exception_caught();                                    \
+    }                                                                          \
+  }                                                                            \
+  looper.end();
+  }
 }

 #endif
@@ -9,24 +9,24 @@
 #include <string>

 namespace test {
-typedef enum {
+  typedef enum {
    default_generator,
    generate_collisions,
    limited_range
-} random_generator;
+  } random_generator;

-int generate(int const*, random_generator);
-char generate(char const*, random_generator);
-signed char generate(signed char const*, random_generator);
-std::string generate(std::string const*, random_generator);
-float generate(float const*, random_generator);
+  int generate(int const*, random_generator);
+  char generate(char const*, random_generator);
+  signed char generate(signed char const*, random_generator);
+  std::string generate(std::string const*, random_generator);
+  float generate(float const*, random_generator);

-struct base_type
-{
-} base;
-struct derived_type : base_type
-{
-} derived;
+  struct base_type
+  {
+  } base;
+  struct derived_type : base_type
+  {
+  } derived;
 }

 #endif
@@ -19,45 +19,45 @@
 #include <utility>

 namespace test {
-struct seed_t
-{
+  struct seed_t
+  {
    seed_t(unsigned int x)
    {
-        using namespace std;
-        srand(x);
+      using namespace std;
+      srand(x);
    }
-};
+  };

-std::size_t random_value(std::size_t max)
-{
+  std::size_t random_value(std::size_t max)
+  {
    using namespace std;
    return static_cast<std::size_t>(rand()) % max;
-}
+  }

-inline int generate(int const*, random_generator g)
-{
+  inline int generate(int const*, random_generator g)
+  {
    using namespace std;
    int value = rand();
    if (g == limited_range) {
-        value = value % 100;
+      value = value % 100;
    }
    return value;
-}
+  }

-inline char generate(char const*, random_generator)
-{
+  inline char generate(char const*, random_generator)
+  {
    using namespace std;
    return static_cast<char>((rand() >> 1) % (128 - 32) + 32);
-}
+  }

-inline signed char generate(signed char const*, random_generator)
-{
+  inline signed char generate(signed char const*, random_generator)
+  {
    using namespace std;
    return static_cast<signed char>(rand());
-}
+  }

-inline std::string generate(std::string const*, random_generator g)
-{
+  inline std::string generate(std::string const*, random_generator g)
+  {
    using namespace std;

    char* char_ptr = 0;
@@ -65,30 +65,29 @@ inline std::string generate(std::string const*, random_generator g)
    std::string result;

    if (g == limited_range) {
-        std::size_t length = test::random_value(2) + 2;
+      std::size_t length = test::random_value(2) + 2;

-        char const* strings[] = {"'vZh(3~ms", "%m", "_Y%U", "N'Y", "4,J_J"};
-        for (std::size_t i = 0; i < length; ++i) {
-            result +=
-                strings[random_value(sizeof(strings) / sizeof(strings[0]))];
-        }
+      char const* strings[] = {"'vZh(3~ms", "%m", "_Y%U", "N'Y", "4,J_J"};
+      for (std::size_t i = 0; i < length; ++i) {
+        result += strings[random_value(sizeof(strings) / sizeof(strings[0]))];
+      }
    } else {
-        std::size_t length = test::random_value(10) + 1;
-        for (std::size_t i = 0; i < length; ++i) {
-            result += generate(char_ptr, g);
-        }
+      std::size_t length = test::random_value(10) + 1;
+      for (std::size_t i = 0; i < length; ++i) {
+        result += generate(char_ptr, g);
+      }
    }

    return result;
-}
+  }

-float generate(float const*, random_generator g)
-{
+  float generate(float const*, random_generator g)
+  {
    using namespace std;
    int x = 0;
    int value = generate(&x, g);
    return (float)value / (float)RAND_MAX;
-}
+  }
 }

 #endif
@@ -6,48 +6,51 @@
 #if !defined(BOOST_UNORDERED_TEST_HELPERS_HEADER)
 #define BOOST_UNORDERED_TEST_HELPERS_HEADER

+#include <iterator>
+
 namespace test {
-template <class Container> struct get_key_impl
-{
-    typedef BOOST_DEDUCED_TYPENAME Container::key_type key_type;
+  template <class Container> struct get_key_impl
+  {
+    typedef typename Container::key_type key_type;

    static key_type const& get_key(key_type const& x) { return x; }

    template <class T>
    static key_type const& get_key(std::pair<key_type, T> const& x, char = 0)
    {
-        return x.first;
+      return x.first;
    }

    template <class T>
    static key_type const& get_key(
-        std::pair<key_type const, T> const& x, unsigned char = 0)
+      std::pair<key_type const, T> const& x, unsigned char = 0)
    {
-        return x.first;
+      return x.first;
    }
-};
+  };

-template <class Container, class T>
-inline BOOST_DEDUCED_TYPENAME Container::key_type const& get_key(T const& x)
-{
+  template <class Container, class T>
+  inline typename Container::key_type const& get_key(T const& x)
+  {
    return get_key_impl<Container>::get_key(x);
-}
+  }

-// test::next
-//
-// Increments an iterator by 1 or a given value.
-// Like boost::next, but simpler and slower.
+  // test::next
+  //
+  // Increments an iterator by 1 or a given value.
+  // Like boost::next, but simpler.
+  // Mainly because boost::next uses an MPL file
+  // which causes warnings.

-template <typename Iterator> Iterator next(Iterator it) { return ++it; }
+  template <typename Iterator> Iterator next(Iterator it) { return ++it; }

-template <typename Iterator, typename IntType>
-Iterator next(Iterator it, IntType x)
-{
-    for (; x > 0; --x) {
-        ++it;
-    }
+  template <typename Iterator, typename IntType>
+  Iterator next(Iterator it, IntType x)
+  {
+    std::advance(it,
+      static_cast<typename std::iterator_traits<Iterator>::difference_type>(x));
    return it;
-}
+  }
 }

 #endif
@@ -7,13 +7,12 @@
 #define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER

 #include <boost/config.hpp>
-#include <boost/iterator/iterator_traits.hpp>
 #include <iterator>

 namespace test {
-template <class Iterator> struct proxy
-{
-    typedef BOOST_DEDUCED_TYPENAME Iterator::value_type value_type;
+  template <class Iterator> struct proxy
+  {
+    typedef typename Iterator::value_type value_type;

    explicit proxy(value_type const& v) : v_(v) {}
    proxy(proxy const& x) : v_(x.v_) {}
@@ -23,18 +22,15 @@ template <class Iterator> struct proxy

  private:
    proxy& operator=(proxy const&);
-};
+  };

-template <class Iterator>
-struct input_iterator_adaptor
-    : public std::iterator<std::input_iterator_tag,
-          BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
-          std::ptrdiff_t,
-          BOOST_DEDUCED_TYPENAME boost::iterator_pointer<Iterator>::type,
-          proxy<Iterator> >
-{
-    typedef BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type
-        value_type;
+  template <class Iterator> struct input_iterator_adaptor
+  {
+    typedef typename std::iterator_traits<Iterator>::value_type value_type;
+    typedef typename std::iterator_traits<Iterator>::pointer pointer;
+    typedef proxy<Iterator> reference;
+    typedef std::ptrdiff_t difference_type;
+    typedef std::input_iterator_tag iterator_category;

    input_iterator_adaptor() : base_() {}
    explicit input_iterator_adaptor(Iterator& it) : base_(&it) {}
@@ -42,43 +38,39 @@ struct input_iterator_adaptor
    value_type* operator->() const { return &**base_; }
    input_iterator_adaptor& operator++()
    {
-        ++*base_;
-        return *this;
+      ++*base_;
+      return *this;
    }
    // input_iterator_adaptor operator++(int) {
    //}
    bool operator==(input_iterator_adaptor const& x) const
    {
-        return *base_ == *x.base_;
+      return *base_ == *x.base_;
    }
    bool operator!=(input_iterator_adaptor const& x) const
    {
-        return *base_ != *x.base_;
+      return *base_ != *x.base_;
    }

  private:
    Iterator* base_;
-};
+  };

-template <class Iterator>
-input_iterator_adaptor<Iterator> input_iterator(Iterator& it)
-{
+  template <class Iterator>
+  input_iterator_adaptor<Iterator> input_iterator(Iterator& it)
+  {
    return input_iterator_adaptor<Iterator>(it);
-}
+  }

-template <class Iterator>
-struct copy_iterator_adaptor
-    : public std::iterator<
-          BOOST_DEDUCED_TYPENAME boost::iterator_category<Iterator>::type,
-          BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
-          BOOST_DEDUCED_TYPENAME boost::iterator_difference<Iterator>::type,
-          BOOST_DEDUCED_TYPENAME boost::iterator_pointer<Iterator>::type,
-          proxy<Iterator> >
-{
-    typedef BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type
-        value_type;
-    typedef BOOST_DEDUCED_TYPENAME boost::iterator_difference<Iterator>::type
-        difference_type;
+  template <class Iterator> struct copy_iterator_adaptor
+  {
+    typedef typename std::iterator_traits<Iterator>::value_type value_type;
+    typedef
+      typename std::iterator_traits<Iterator>::difference_type difference_type;
+    typedef typename std::iterator_traits<Iterator>::iterator_category
+      iterator_category;
+    typedef typename std::iterator_traits<Iterator>::pointer pointer;
+    typedef proxy<Iterator> reference;

    copy_iterator_adaptor() : base_() {}
    explicit copy_iterator_adaptor(Iterator const& it) : base_(it) {}
@@ -87,87 +79,87 @@ struct copy_iterator_adaptor
    value_type operator[](difference_type d) { return base_[d]; }
    copy_iterator_adaptor& operator++()
    {
-        ++base_;
-        return *this;
+      ++base_;
+      return *this;
    }
    copy_iterator_adaptor operator++(int)
    {
-        copy_iterator_adaptor tmp(*this);
-        ++base_;
-        return tmp;
+      copy_iterator_adaptor tmp(*this);
+      ++base_;
+      return tmp;
    }
    copy_iterator_adaptor& operator--()
    {
-        --base_;
-        return *this;
+      --base_;
+      return *this;
    }
    copy_iterator_adaptor operator--(int)
    {
-        copy_iterator_adaptor tmp(*this);
-        --base_;
-        return tmp;
+      copy_iterator_adaptor tmp(*this);
+      --base_;
+      return tmp;
    }
    copy_iterator_adaptor operator+=(difference_type x)
    {
-        base_ += x;
-        return *this;
+      base_ += x;
+      return *this;
    }
    copy_iterator_adaptor operator-=(difference_type x)
    {
-        base_ -= x;
-        return *this;
+      base_ -= x;
+      return *this;
    }
    copy_iterator_adaptor operator+(difference_type n)
    {
-        return copy_iterator_adaptor(base_ + n);
+      return copy_iterator_adaptor(base_ + n);
    }
    copy_iterator_adaptor operator-(difference_type n)
    {
-        return copy_iterator_adaptor(base_ - n);
+      return copy_iterator_adaptor(base_ - n);
    }
    friend copy_iterator_adaptor operator+(
-        difference_type n, copy_iterator_adaptor x)
+      difference_type n, copy_iterator_adaptor x)
    {
-        return x + n;
+      return x + n;
    }
    difference_type operator-(copy_iterator_adaptor const& other)
    {
-        return base_ - other.base_;
+      return base_ - other.base_;
    }
    bool operator==(copy_iterator_adaptor const& x) const
    {
-        return base_ == x.base_;
+      return base_ == x.base_;
    }
    bool operator!=(copy_iterator_adaptor const& x) const
    {
-        return base_ != x.base_;
+      return base_ != x.base_;
    }
    bool operator<(copy_iterator_adaptor const& x) const
    {
-        return base_ < x.base_;
+      return base_ < x.base_;
    }
    bool operator>(copy_iterator_adaptor const& x) const
    {
-        return base_ > x.base_;
+      return base_ > x.base_;
    }
    bool operator<=(copy_iterator_adaptor const& x) const
    {
-        return base_ <= x.base_;
+      return base_ <= x.base_;
    }
    bool operator>=(copy_iterator_adaptor const& x) const
    {
-        return base_ >= x.base_;
+      return base_ >= x.base_;
    }

  private:
    Iterator base_;
-};
+  };

-template <class Iterator>
-copy_iterator_adaptor<Iterator> copy_iterator(Iterator const& it)
-{
+  template <class Iterator>
+  copy_iterator_adaptor<Iterator> copy_iterator(Iterator const& it)
+  {
    return copy_iterator_adaptor<Iterator>(it);
-}
+  }
 }

 #endif
@@ -22,100 +22,105 @@
 #endif

 namespace test {
-template <class X> void check_equivalent_keys(X const& x1)
-{
-    BOOST_DEDUCED_TYPENAME X::key_equal eq = x1.key_eq();
-    typedef BOOST_DEDUCED_TYPENAME X::key_type key_type;
+  template <class X> void check_equivalent_keys(X const& x1)
+  {
+    typename X::key_equal eq = x1.key_eq();
+    typedef typename X::key_type key_type;
    std::set<key_type, std::less<key_type> > found_;

-    BOOST_DEDUCED_TYPENAME X::const_iterator it = x1.begin(), end = x1.end();
-    BOOST_DEDUCED_TYPENAME X::size_type size = 0;
+    typename X::const_iterator it = x1.begin(), end = x1.end();
+    typename X::size_type size = 0;
    while (it != end) {
-        // First test that the current key has not occurred before, required
-        // to test either that keys are unique or that equivalent keys are
-        // adjacent. (6.3.1/6)
-        key_type key = get_key<X>(*it);
-        if (!found_.insert(key).second)
-            BOOST_ERROR("Elements with equivalent keys aren't adjacent.");
+      // First test that the current key has not occurred before, required
+      // to test either that keys are unique or that equivalent keys are
+      // adjacent. (6.3.1/6)
+      key_type key = get_key<X>(*it);
+      if (!found_.insert(key).second)
+        BOOST_ERROR("Elements with equivalent keys aren't adjacent.");

-        // Iterate over equivalent keys, counting them.
-        unsigned int count = 0;
-        do {
-            ++it;
-            ++count;
-            ++size;
-        } while (it != end && eq(get_key<X>(*it), key));
+      // Iterate over equivalent keys, counting them.
+      unsigned int count = 0;
+      do {
+        ++it;
+        ++count;
+        ++size;
+      } while (it != end && eq(get_key<X>(*it), key));

-        // If the container has unique keys, test that there's only one.
-        // Since the previous test makes sure that all equivalent keys are
-        // adjacent, this is all the equivalent keys - so the test is
-        // sufficient. (6.3.1/6 again).
-        if (test::has_unique_keys<X>::value && count != 1)
-            BOOST_ERROR("Non-unique key.");
+      // If the container has unique keys, test that there's only one.
+      // Since the previous test makes sure that all equivalent keys are
+      // adjacent, this is all the equivalent keys - so the test is
+      // sufficient. (6.3.1/6 again).
+      if (test::has_unique_keys<X>::value && count != 1)
+        BOOST_ERROR("Non-unique key.");

-        if (x1.count(key) != count) {
-            BOOST_ERROR("Incorrect output of count.");
-            std::cerr << x1.count(key) << "," << count << "\n";
-        }
+      if (x1.count(key) != count) {
+        BOOST_ERROR("Incorrect output of count.");
+        std::cerr << x1.count(key) << "," << count << "\n";
+      }

-        // Check that the keys are in the correct bucket and are
-        // adjacent in the bucket.
-        BOOST_DEDUCED_TYPENAME X::size_type bucket = x1.bucket(key);
-        BOOST_DEDUCED_TYPENAME X::const_local_iterator lit = x1.begin(bucket),
-                                                       lend = x1.end(bucket);
-        for (; lit != lend && !eq(get_key<X>(*lit), key); ++lit)
-            continue;
-        if (lit == lend)
-            BOOST_ERROR("Unable to find element with a local_iterator");
+      // Check that the keys are in the correct bucket and are
+      // adjacent in the bucket.
+      typename X::size_type bucket = x1.bucket(key);
+      typename X::const_local_iterator lit = x1.begin(bucket),
+                                       lend = x1.end(bucket);
+
+      unsigned int count_checked = 0;
+      for (; lit != lend && !eq(get_key<X>(*lit), key); ++lit) {
+        ++count_checked;
+      }
+
+      if (lit == lend) {
+        BOOST_ERROR("Unable to find element with a local_iterator");
+        std::cerr << "Checked: " << count_checked << " elements" << std::endl;
+      } else {
        unsigned int count2 = 0;
        for (; lit != lend && eq(get_key<X>(*lit), key); ++lit)
-            ++count2;
+          ++count2;
        if (count != count2)
-            BOOST_ERROR("Element count doesn't match local_iterator.");
+          BOOST_ERROR("Element count doesn't match local_iterator.");
        for (; lit != lend; ++lit) {
-            if (eq(get_key<X>(*lit), key)) {
-                BOOST_ERROR("Non-adjacent element with equivalent key "
-                            "in bucket.");
-                break;
-            }
+          if (eq(get_key<X>(*lit), key)) {
+            BOOST_ERROR("Non-adjacent element with equivalent key "
+                        "in bucket.");
+            break;
+          }
        }
+      }
    };

    // Check that size matches up.

    if (x1.size() != size) {
-        BOOST_ERROR("x1.size() doesn't match actual size.");
-        std::cout << x1.size() << "/" << size << std::endl;
+      BOOST_ERROR("x1.size() doesn't match actual size.");
+      std::cout << x1.size() << "/" << size << std::endl;
    }

    // Check the load factor.

-    float load_factor =
-        size == 0 ? 0 : static_cast<float>(size) /
-                            static_cast<float>(x1.bucket_count());
+    float load_factor = size == 0 ? 0
+                                  : static_cast<float>(size) /
+                                      static_cast<float>(x1.bucket_count());
    using namespace std;
    if (fabs(x1.load_factor() - load_factor) > x1.load_factor() / 64)
-        BOOST_ERROR("x1.load_factor() doesn't match actual load_factor.");
+      BOOST_ERROR("x1.load_factor() doesn't match actual load_factor.");

    // Check that size in the buckets matches up.

-    BOOST_DEDUCED_TYPENAME X::size_type bucket_size = 0;
+    typename X::size_type bucket_size = 0;

-    for (BOOST_DEDUCED_TYPENAME X::size_type i = 0; i < x1.bucket_count();
-         ++i) {
-        for (BOOST_DEDUCED_TYPENAME X::const_local_iterator
-                 begin2 = x1.begin(i),
-                 end2 = x1.end(i);
-             begin2 != end2; ++begin2) {
-            ++bucket_size;
-        }
+    for (typename X::size_type i = 0; i < x1.bucket_count(); ++i) {
+      for (typename X::const_local_iterator begin2 = x1.begin(i),
+                                            end2 = x1.end(i);
+           begin2 != end2; ++begin2) {
+        ++bucket_size;
+      }
    }

    if (x1.size() != bucket_size) {
-        BOOST_ERROR("x1.size() doesn't match bucket size.");
-        std::cout << x1.size() << "/" << bucket_size << std::endl;
+      BOOST_ERROR("x1.size() doesn't match bucket size.");
+      std::cout << x1.size() << "/" << bucket_size << std::endl;
    }
-}
+  }
 }

 #if defined(BOOST_MSVC)
@@ -16,143 +16,155 @@
 #include <iterator>

 namespace test {
-template <typename It1, typename It2>
-bool equal(It1 begin, It1 end, It2 compare)
-{
+  template <typename It1, typename It2>
+  bool equal(It1 begin, It1 end, It2 compare)
+  {
    for (; begin != end; ++begin, ++compare)
-        if (*begin != *compare)
-            return false;
+      if (*begin != *compare)
+        return false;
    return true;
-}
+  }

-template <typename It1, typename It2, typename Pred>
-bool equal(It1 begin, It1 end, It2 compare, Pred predicate)
-{
+  template <typename It1, typename It2, typename Pred>
+  bool equal(It1 begin, It1 end, It2 compare, Pred predicate)
+  {
    for (; begin != end; ++begin, ++compare)
-        if (!predicate(*begin, *compare))
-            return false;
+      if (!predicate(*begin, *compare))
+        return false;
    return true;
-}
+  }

-template <typename T> class list;
+  template <typename T> class list;

-namespace test_detail {
-template <typename T> class list_node;
-template <typename T> class list_data;
-template <typename T> class list_iterator;
-template <typename T> class list_const_iterator;
+  namespace test_detail {
+    template <typename T> class list_node;
+    template <typename T> class list_data;
+    template <typename T> class list_iterator;
+    template <typename T> class list_const_iterator;

-template <typename T> class list_node
-{
-    list_node(list_node const&);
-    list_node& operator=(list_node const&);
-
-  public:
-    T value_;
-    list_node* next_;
-
-    list_node(T const& v) : value_(v), next_(0) {}
-    list_node(T const& v, list_node* n) : value_(v), next_(n) {}
-};
-
-template <typename T> class list_data
-{
-  public:
-    typedef list_node<T> node;
-    typedef unsigned int size_type;
-
-    node* first_;
-    node** last_ptr_;
-    size_type size_;
-
-    list_data() : first_(0), last_ptr_(&first_), size_(0) {}
-
-    ~list_data()
+    template <typename T> class list_node
    {
+      list_node(list_node const&);
+      list_node& operator=(list_node const&);
+
+    public:
+      T value_;
+      list_node* next_;
+
+      list_node(T const& v) : value_(v), next_(0) {}
+      list_node(T const& v, list_node* n) : value_(v), next_(n) {}
+    };
+
+    template <typename T> class list_data
+    {
+    public:
+      typedef list_node<T> node;
+      typedef unsigned int size_type;
+
+      node* first_;
+      node** last_ptr_;
+      size_type size_;
+
+      list_data() : first_(0), last_ptr_(&first_), size_(0) {}
+
+      ~list_data()
+      {
        while (first_) {
-            node* tmp = first_;
-            first_ = first_->next_;
-            delete tmp;
+          node* tmp = first_;
+          first_ = first_->next_;
+          delete tmp;
        }
-    }
+      }

-  private:
-    list_data(list_data const&);
-    list_data& operator=(list_data const&);
-};
+    private:
+      list_data(list_data const&);
+      list_data& operator=(list_data const&);
+    };

-template <typename T>
-class list_iterator
-    : public std::iterator<std::forward_iterator_tag, T, int, T*, T&>
-{
-    friend class list_const_iterator<T>;
-    friend class test::list<T>;
-    typedef list_node<T> node;
-    typedef list_const_iterator<T> const_iterator;
-
-    node* ptr_;
-
-  public:
-    list_iterator() : ptr_(0) {}
-    explicit list_iterator(node* x) : ptr_(x) {}
-
-    T& operator*() const { return ptr_->value_; }
-    T* operator->() const { return &ptr_->value_; }
-    list_iterator& operator++()
+    template <typename T> class list_iterator
    {
+      friend class list_const_iterator<T>;
+      friend class test::list<T>;
+      typedef list_node<T> node;
+      typedef list_const_iterator<T> const_iterator;
+
+      node* ptr_;
+
+    public:
+      typedef T value_type;
+      typedef T* pointer;
+      typedef T& reference;
+      typedef int difference_type;
+      typedef std::forward_iterator_tag iterator_category;
+
+      list_iterator() : ptr_(0) {}
+      explicit list_iterator(node* x) : ptr_(x) {}
+
+      T& operator*() const { return ptr_->value_; }
+      T* operator->() const { return &ptr_->value_; }
+      list_iterator& operator++()
+      {
        ptr_ = ptr_->next_;
        return *this;
-    }
-    list_iterator operator++(int)
-    {
+      }
+      list_iterator operator++(int)
+      {
        list_iterator tmp = *this;
        ptr_ = ptr_->next_;
        return tmp;
-    }
-    bool operator==(const_iterator y) const { return ptr_ == y.ptr_; }
-    bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
-};
+      }

-template <typename T>
-class list_const_iterator : public std::iterator<std::forward_iterator_tag, T,
-                                int, T const*, T const&>
-{
-    friend class list_iterator<T>;
-    friend class test::list<T>;
-    typedef list_node<T> node;
-    typedef list_iterator<T> iterator;
-    typedef list_const_iterator<T> const_iterator;
+      bool operator==(list_iterator y) const { return ptr_ == y.ptr_; }
+      bool operator!=(list_iterator y) const { return ptr_ != y.ptr_; }

-    node* ptr_;
+      bool operator==(const_iterator y) const { return ptr_ == y.ptr_; }
+      bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
+    };

-  public:
-    list_const_iterator() : ptr_(0) {}
-    list_const_iterator(list_iterator<T> const& x) : ptr_(x.ptr_) {}
-
-    T const& operator*() const { return ptr_->value_; }
-    T const* operator->() const { return &ptr_->value_; }
-
-    list_const_iterator& operator++()
+    template <typename T> class list_const_iterator
    {
+      friend class list_iterator<T>;
+      friend class test::list<T>;
+      typedef list_node<T> node;
+      typedef list_iterator<T> iterator;
+      typedef list_const_iterator<T> const_iterator;
+
+      node* ptr_;
+
+    public:
+      typedef T value_type;
+      typedef T const* pointer;
+      typedef T const& reference;
+      typedef int difference_type;
+      typedef std::forward_iterator_tag iterator_category;
+
+      list_const_iterator() : ptr_(0) {}
+      list_const_iterator(list_iterator<T> const& x) : ptr_(x.ptr_) {}
+
+      T const& operator*() const { return ptr_->value_; }
+      T const* operator->() const { return &ptr_->value_; }
+
+      list_const_iterator& operator++()
+      {
        ptr_ = ptr_->next_;
        return *this;
-    }
+      }

-    list_const_iterator operator++(int)
-    {
+      list_const_iterator operator++(int)
+      {
        list_const_iterator tmp = *this;
        ptr_ = ptr_->next_;
        return tmp;
-    }
+      }

-    bool operator==(const_iterator y) const { return ptr_ == y.ptr_; }
+      bool operator==(const_iterator y) const { return ptr_ == y.ptr_; }

-    bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
-};
-}
+      bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
+    };
+  }

-template <typename T> class list
-{
+  template <typename T> class list
+  {
    typedef test::test_detail::list_data<T> data;
    typedef test::test_detail::list_node<T> node;
    data data_;
@@ -173,14 +185,14 @@ template <typename T> class list
    template <class InputIterator>
    list(InputIterator i, InputIterator j) : data_()
    {
-        insert(i, j);
+      insert(i, j);
    }

    list& operator=(list const& other)
    {
-        clear();
-        insert(other.begin(), other.end());
-        return *this;
+      clear();
+      insert(other.begin(), other.end());
+      return *this;
    }

    iterator begin() { return iterator(data_.first_); }
@@ -192,53 +204,53 @@ template <typename T> class list

    template <class InputIterator> void insert(InputIterator i, InputIterator j)
    {
-        for (; i != j; ++i)
-            push_back(*i);
+      for (; i != j; ++i)
+        push_back(*i);
    }

    void push_front(value_type const& v)
    {
-        data_.first_ = new node(v, data_.first_);
-        if (!data_.size_)
-            data_.last_ptr_ = &(*data_.last_ptr_)->next_;
-        ++data_.size_;
+      data_.first_ = new node(v, data_.first_);
+      if (!data_.size_)
+        data_.last_ptr_ = &(*data_.last_ptr_)->next_;
+      ++data_.size_;
    }

    void push_back(value_type const& v)
    {
-        *data_.last_ptr_ = new node(v);
-        data_.last_ptr_ = &(*data_.last_ptr_)->next_;
-        ++data_.size_;
+      *data_.last_ptr_ = new node(v);
+      data_.last_ptr_ = &(*data_.last_ptr_)->next_;
+      ++data_.size_;
    }

    void clear()
    {
-        while (data_.first_) {
-            node* tmp = data_.first_;
-            data_.first_ = data_.first_->next_;
-            --data_.size_;
-            delete tmp;
-        }
-        data_.last_ptr_ = &data_.first_;
+      while (data_.first_) {
+        node* tmp = data_.first_;
+        data_.first_ = data_.first_->next_;
+        --data_.size_;
+        delete tmp;
+      }
+      data_.last_ptr_ = &data_.first_;
    }

    void erase(const_iterator i, const_iterator j)
    {
-        node** ptr = &data_.first_;
+      node** ptr = &data_.first_;

-        while (*ptr != i.ptr_) {
-            ptr = &(*ptr)->next_;
-        }
+      while (*ptr != i.ptr_) {
+        ptr = &(*ptr)->next_;
+      }

-        while (*ptr != j.ptr_) {
-            node* to_delete = *ptr;
-            *ptr = (*ptr)->next_;
-            --data_.size_;
-            delete to_delete;
-        }
+      while (*ptr != j.ptr_) {
+        node* to_delete = *ptr;
+        *ptr = (*ptr)->next_;
+        --data_.size_;
+        delete to_delete;
+      }

-        if (!*ptr)
-            data_.last_ptr_ = ptr;
+      if (!*ptr)
+        data_.last_ptr_ = ptr;
    }

    bool empty() const { return !data_.size_; }
@@ -249,14 +261,14 @@ template <typename T> class list

    template <typename Less> void sort(Less less = Less())
    {
-        if (!empty())
-            merge_sort(
-                &data_.first_, (std::numeric_limits<size_type>::max)(), less);
+      if (!empty())
+        merge_sort(
+          &data_.first_, (std::numeric_limits<size_type>::max)(), less);
    }

    bool operator==(list const& y) const
    {
-        return size() == y.size() && test::equal(begin(), end(), y.begin());
+      return size() == y.size() && test::equal(begin(), end(), y.begin());
    }

    bool operator!=(list const& y) const { return !(*this == y); }
@@ -265,56 +277,55 @@ template <typename T> class list
    template <typename Less>
    node** merge_sort(node** l, size_type recurse_limit, Less less)
    {
-        node** ptr = &(*l)->next_;
-        for (size_type count = 0; count < recurse_limit && *ptr; ++count) {
-            ptr = merge_adjacent_ranges(
-                l, ptr, merge_sort(ptr, count, less), less);
-        }
-        return ptr;
+      node** ptr = &(*l)->next_;
+      for (size_type count = 0; count < recurse_limit && *ptr; ++count) {
+        ptr = merge_adjacent_ranges(l, ptr, merge_sort(ptr, count, less), less);
+      }
+      return ptr;
    }

    template <typename Less>
    node** merge_adjacent_ranges(
-        node** first, node** second, node** third, Less less)
+      node** first, node** second, node** third, Less less)
    {
+      for (;;) {
        for (;;) {
-            for (;;) {
-                if (first == second)
-                    return third;
-                if (less((*second)->value_, (*first)->value_))
-                    break;
-                first = &(*first)->next_;
-            }
-
-            swap_adjacent_ranges(first, second, third);
-            first = &(*first)->next_;
-
-            // Since the two ranges we just swapped, the order is now:
-            // first...third...second
-
-            for (;;) {
-                if (first == third)
-                    return second;
-                if (!less((*first)->value_, (*third)->value_))
-                    break;
-                first = &(*first)->next_;
-            }
-
-            swap_adjacent_ranges(first, third, second);
-            first = &(*first)->next_;
+          if (first == second)
+            return third;
+          if (less((*second)->value_, (*first)->value_))
+            break;
+          first = &(*first)->next_;
        }
+
+        swap_adjacent_ranges(first, second, third);
+        first = &(*first)->next_;
+
+        // Since the two ranges we just swapped, the order is now:
+        // first...third...second
+
+        for (;;) {
+          if (first == third)
+            return second;
+          if (!less((*first)->value_, (*third)->value_))
+            break;
+          first = &(*first)->next_;
+        }
+
+        swap_adjacent_ranges(first, third, second);
+        first = &(*first)->next_;
+      }
    }

    void swap_adjacent_ranges(node** first, node** second, node** third)
    {
-        node* tmp = *first;
-        *first = *second;
-        *second = *third;
-        *third = tmp;
-        if (!*second)
-            data_.last_ptr_ = second;
+      node* tmp = *first;
+      *first = *second;
+      *second = *third;
+      *third = tmp;
+      if (!*second)
+        data_.last_ptr_ = second;
    }
-};
+  };
 }

 #endif
@@ -13,146 +13,177 @@
 #include <memory>

 namespace test {
-namespace detail {
-struct memory_area
-{
-    void const* start;
-    void const* end;
-
-    memory_area(void const* s, void const* e) : start(s), end(e)
+  namespace detail {
+    struct memory_area
    {
+      void const* start;
+      void const* end;
+
+      memory_area(void const* s, void const* e) : start(s), end(e)
+      {
        BOOST_ASSERT(start != end);
-    }
-};
+      }
+    };

-struct memory_track
-{
-    explicit memory_track(int tag = -1) : constructed_(0), tag_(tag) {}
-
-    int constructed_;
-    int tag_;
-};
-
-// This is a bit dodgy as it defines overlapping
-// areas as 'equal', so this isn't a total ordering.
-// But it is for non-overlapping memory regions - which
-// is what'll be stored.
-//
-// All searches will be for areas entirely contained by
-// a member of the set - so it should find the area that contains
-// the region that is searched for.
-
-struct memory_area_compare
-{
-    bool operator()(memory_area const& x, memory_area const& y) const
+    struct memory_track
    {
-        return x.end <= y.start;
-    }
-};
+      explicit memory_track(int tag = -1) : constructed_(0), tag_(tag) {}

-struct memory_tracker
-{
-    typedef std::map<memory_area, memory_track, memory_area_compare,
+      int constructed_;
+      int tag_;
+    };
+
+    // This is a bit dodgy as it defines overlapping
+    // areas as 'equal', so this isn't a total ordering.
+    // But it is for non-overlapping memory regions - which
+    // is what'll be stored.
+    //
+    // All searches will be for areas entirely contained by
+    // a member of the set - so it should find the area that contains
+    // the region that is searched for.
+
+    struct memory_area_compare
+    {
+      bool operator()(memory_area const& x, memory_area const& y) const
+      {
+        return x.end <= y.start;
+      }
+    };
+
+    struct memory_tracker
+    {
+      typedef std::map<memory_area, memory_track, memory_area_compare,
        std::allocator<std::pair<memory_area const, memory_track> > >
        allocated_memory_type;

-    allocated_memory_type allocated_memory;
-    unsigned int count_allocators;
-    unsigned int count_allocations;
-    unsigned int count_constructions;
+      allocated_memory_type allocated_memory;
+      unsigned int count_allocators;
+      unsigned int count_allocations;
+      unsigned int count_constructions;
+      bool tracking_constructions;

-    memory_tracker()
-        : count_allocators(0), count_allocations(0), count_constructions(0)
-    {
-    }
+      memory_tracker()
+          : count_allocators(0), count_allocations(0), count_constructions(0),
+            tracking_constructions(true)
+      {
+      }

-    void allocator_ref()
-    {
+      ~memory_tracker() { BOOST_ASSERT(count_allocators == 0); }
+
+      void allocator_ref()
+      {
        if (count_allocators == 0) {
+          count_allocations = 0;
+          count_constructions = 0;
+          allocated_memory.clear();
+        }
+        ++count_allocators;
+      }
+
+      void allocator_unref()
+      {
+        BOOST_TEST(count_allocators > 0);
+        if (count_allocators > 0) {
+          --count_allocators;
+          if (count_allocators == 0) {
+            bool no_allocations_left = (count_allocations == 0);
+            bool no_constructions_left = (count_constructions == 0);
+            bool allocated_memory_empty = allocated_memory.empty();
+
+            // Clearing the data before the checks terminate the
+            // tests.
            count_allocations = 0;
            count_constructions = 0;
            allocated_memory.clear();
+
+            BOOST_TEST(no_allocations_left);
+            BOOST_TEST(no_constructions_left);
+            BOOST_TEST(allocated_memory_empty);
+          }
        }
-        ++count_allocators;
-    }
+      }

-    void allocator_unref()
-    {
-        BOOST_TEST(count_allocators > 0);
-        if (count_allocators > 0) {
-            --count_allocators;
-            if (count_allocators == 0) {
-                bool no_allocations_left = (count_allocations == 0);
-                bool no_constructions_left = (count_constructions == 0);
-                bool allocated_memory_empty = allocated_memory.empty();
-
-                // Clearing the data before the checks terminate the
-                // tests.
-                count_allocations = 0;
-                count_constructions = 0;
-                allocated_memory.clear();
-
-                BOOST_TEST(no_allocations_left);
-                BOOST_TEST(no_constructions_left);
-                BOOST_TEST(allocated_memory_empty);
-            }
-        }
-    }
-
-    void track_allocate(void* ptr, std::size_t n, std::size_t size, int tag)
-    {
+      void track_allocate(void* ptr, std::size_t n, std::size_t size, int tag)
+      {
        if (n == 0) {
-            BOOST_ERROR("Allocating 0 length array.");
+          BOOST_ERROR("Allocating 0 length array.");
        } else {
-            ++count_allocations;
-            allocated_memory.insert(std::pair<memory_area const, memory_track>(
-                memory_area(ptr, (char*)ptr + n * size), memory_track(tag)));
+          ++count_allocations;
+          allocated_memory.insert(std::pair<memory_area const, memory_track>(
+            memory_area(ptr, (char*)ptr + n * size), memory_track(tag)));
        }
-    }
+      }

-    void track_deallocate(void* ptr, std::size_t n, std::size_t size, int tag,
+      void track_deallocate(void* ptr, std::size_t n, std::size_t size, int tag,
        bool check_tag_ = true)
-    {
+      {
        allocated_memory_type::iterator pos =
-            allocated_memory.find(memory_area(ptr, (char*)ptr + n * size));
+          allocated_memory.find(memory_area(ptr, (char*)ptr + n * size));
        if (pos == allocated_memory.end()) {
-            BOOST_ERROR("Deallocating unknown pointer.");
+          BOOST_ERROR("Deallocating unknown pointer.");
        } else {
-            BOOST_TEST(pos->first.start == ptr);
-            BOOST_TEST(pos->first.end == (char*)ptr + n * size);
-            if (check_tag_)
-                BOOST_TEST(pos->second.tag_ == tag);
-            allocated_memory.erase(pos);
+          BOOST_TEST(pos->first.start == ptr);
+          BOOST_TEST(pos->first.end == (char*)ptr + n * size);
+          if (check_tag_)
+            BOOST_TEST(pos->second.tag_ == tag);
+          allocated_memory.erase(pos);
        }
        BOOST_TEST(count_allocations > 0);
        if (count_allocations > 0)
-            --count_allocations;
-    }
+          --count_allocations;
+      }

-    void track_construct(void* /*ptr*/, std::size_t /*size*/, int /*tag*/)
-    {
-        ++count_constructions;
-    }
+      void track_construct(void* /*ptr*/, std::size_t /*size*/, int /*tag*/)
+      {
+        if (tracking_constructions) {
+          ++count_constructions;
+        }
+      }

-    void track_destroy(void* /*ptr*/, std::size_t /*size*/, int /*tag*/)
-    {
-        BOOST_TEST(count_constructions > 0);
-        if (count_constructions > 0)
+      void track_destroy(void* /*ptr*/, std::size_t /*size*/, int /*tag*/)
+      {
+        if (tracking_constructions) {
+          BOOST_TEST(count_constructions > 0);
+          if (count_constructions > 0)
            --count_constructions;
-    }
-};
-}
+        }
+      }
+    };
+  }

-namespace detail {
-// This won't be a problem as I'm only using a single compile unit
-// in each test (this is actually required by the minimal test
-// framework).
-//
-// boostinspect:nounnamed
-namespace {
-test::detail::memory_tracker tracker;
-}
-}
+  namespace detail {
+    // This won't be a problem as I'm only using a single compile unit
+    // in each test (this is actually required by the minimal test
+    // framework).
+    //
+    // boostinspect:nounnamed
+    namespace {
+      test::detail::memory_tracker tracker;
+    }
+  }
+
+  namespace detail {
+    struct disable_construction_tracking
+    {
+      bool old_value;
+
+      disable_construction_tracking()
+          : old_value(detail::tracker.tracking_constructions)
+      {
+        test::detail::tracker.tracking_constructions = false;
+      }
+
+      ~disable_construction_tracking()
+      {
+        test::detail::tracker.tracking_constructions = old_value;
+      }
+
+    private:
+      disable_construction_tracking(disable_construction_tracking const&);
+      disable_construction_tracking& operator=(
+        disable_construction_tracking const&);
+    };
+  }
 }

 #endif
@@ -8,27 +8,26 @@

 #include <boost/config.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/declval.hpp>

 namespace test {
-template <class Container>
-struct is_set
-    : public boost::is_same<BOOST_DEDUCED_TYPENAME Container::key_type,
-          BOOST_DEDUCED_TYPENAME Container::value_type>
-{
-};
+  template <class Container>
+  struct is_set : public boost::is_same<typename Container::key_type,
+                    typename Container::value_type>
+  {
+  };

-template <class Container> struct has_unique_keys
-{
-    static char flip(BOOST_DEDUCED_TYPENAME Container::iterator const&);
-    static long flip(
-        std::pair<BOOST_DEDUCED_TYPENAME Container::iterator, bool> const&);
+  template <class Container> struct has_unique_keys
+  {
+    static char flip(typename Container::iterator const&);
+    static long flip(std::pair<typename Container::iterator, bool> const&);
    BOOST_STATIC_CONSTANT(bool,
-        value = sizeof(long) ==
-                sizeof(flip(
-                    ((Container*)0)
-                        ->insert(*(
-                            BOOST_DEDUCED_TYPENAME Container::value_type*)0))));
-};
+      value = sizeof(long) ==
+              sizeof(flip(
+                (boost::declval<Container*>())
+                  ->insert(
+                    boost::declval<typename Container::value_type const&>()))));
+  };
 }

 #endif
@@ -5,6 +5,6 @@

 // Include this after the boost headers, but before other test headers.

-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif
@@ -13,9 +13,9 @@
 #include <boost/detail/select_type.hpp>

 namespace test {
-template <class X> struct unordered_generator_set
-{
-    typedef BOOST_DEDUCED_TYPENAME X::value_type value_type;
+  template <class X> struct unordered_generator_set
+  {
+    typedef typename X::value_type value_type;

    random_generator type_;

@@ -23,26 +23,26 @@ template <class X> struct unordered_generator_set

    template <class T> void fill(T& x, std::size_t len)
    {
-        value_type* value_ptr = 0;
-        len += x.size();
+      value_type* value_ptr = 0;
+      len += x.size();

-        for (std::size_t i = 0; i < len; ++i) {
-            value_type value = generate(value_ptr, type_);
+      for (std::size_t i = 0; i < len; ++i) {
+        value_type value = generate(value_ptr, type_);

-            std::size_t count =
-                type_ == generate_collisions ? random_value(5) + 1 : 1;
+        std::size_t count =
+          type_ == generate_collisions ? random_value(5) + 1 : 1;

-            for (std::size_t j = 0; j < count; ++j) {
-                x.push_back(value);
-            }
+        for (std::size_t j = 0; j < count; ++j) {
+          x.push_back(value);
        }
+      }
    }
-};
+  };

-template <class X> struct unordered_generator_map
-{
-    typedef BOOST_DEDUCED_TYPENAME X::key_type key_type;
-    typedef BOOST_DEDUCED_TYPENAME X::mapped_type mapped_type;
+  template <class X> struct unordered_generator_map
+  {
+    typedef typename X::key_type key_type;
+    typedef typename X::mapped_type mapped_type;

    random_generator type_;

@@ -50,60 +50,60 @@ template <class X> struct unordered_generator_map

    template <class T> void fill(T& x, std::size_t len)
    {
-        key_type* key_ptr = 0;
-        mapped_type* mapped_ptr = 0;
+      key_type* key_ptr = 0;
+      mapped_type* mapped_ptr = 0;

-        for (std::size_t i = 0; i < len; ++i) {
-            key_type key = generate(key_ptr, type_);
+      for (std::size_t i = 0; i < len; ++i) {
+        key_type key = generate(key_ptr, type_);

-            std::size_t count =
-                type_ == generate_collisions ? random_value(5) + 1 : 1;
+        std::size_t count =
+          type_ == generate_collisions ? random_value(5) + 1 : 1;

-            for (std::size_t j = 0; j < count; ++j) {
-                x.push_back(std::pair<key_type const, mapped_type>(
-                    key, generate(mapped_ptr, type_)));
-            }
+        for (std::size_t j = 0; j < count; ++j) {
+          x.push_back(std::pair<key_type const, mapped_type>(
+            key, generate(mapped_ptr, type_)));
        }
+      }
    }
-};
+  };

-template <class X>
-struct unordered_generator_base
+  template <class X>
+  struct unordered_generator_base
    : public boost::detail::if_true<test::is_set<X>::value>::
-          BOOST_NESTED_TEMPLATE then<test::unordered_generator_set<X>,
-              test::unordered_generator_map<X> >
-{
-};
+        BOOST_NESTED_TEMPLATE then<test::unordered_generator_set<X>,
+          test::unordered_generator_map<X> >
+  {
+  };

-template <class X>
-struct unordered_generator : public unordered_generator_base<X>::type
-{
-    typedef BOOST_DEDUCED_TYPENAME unordered_generator_base<X>::type base;
+  template <class X>
+  struct unordered_generator : public unordered_generator_base<X>::type
+  {
+    typedef typename unordered_generator_base<X>::type base;

    unordered_generator(random_generator const& type = default_generator)
        : base(type)
    {
    }
-};
+  };

-template <class X>
-struct random_values : public test::list<BOOST_DEDUCED_TYPENAME X::value_type>
-{
+  template <class X>
+  struct random_values : public test::list<typename X::value_type>
+  {
    random_values() {}

    explicit random_values(std::size_t count,
-        test::random_generator const& generator = test::default_generator)
+      test::random_generator const& generator = test::default_generator)
    {
-        fill(count, generator);
+      fill(count, generator);
    }

    void fill(std::size_t count,
-        test::random_generator const& generator = test::default_generator)
+      test::random_generator const& generator = test::default_generator)
    {
-        test::unordered_generator<X> gen(generator);
-        gen.fill(*this, count);
+      test::unordered_generator<X> gen(generator);
+      gen.fill(*this, count);
    }
-};
+  };
 }

 #endif
@@ -13,31 +13,30 @@
 #include <iterator>

 namespace test {
-template <class X> class strong
-{
-    typedef test::list<BOOST_DEDUCED_TYPENAME X::value_type> values_type;
+  template <class X> class strong
+  {
+    typedef test::list<typename X::value_type> values_type;
    values_type values_;
    unsigned int allocations_;

  public:
    void store(X const& x, unsigned int allocations = 0)
    {
-        DISABLE_EXCEPTIONS;
-        values_.clear();
-        values_.insert(x.cbegin(), x.cend());
-        allocations_ = allocations;
+      DISABLE_EXCEPTIONS;
+      values_.clear();
+      values_.insert(x.cbegin(), x.cend());
+      allocations_ = allocations;
    }

    void test(X const& x, unsigned int allocations = 0) const
    {
-        if (!(x.size() == values_.size() &&
-                test::equal(
-                    x.cbegin(), x.cend(), values_.begin(), test::equivalent)))
-            BOOST_ERROR("Strong exception safety failure.");
-        if (allocations != allocations_)
-            BOOST_ERROR("Strong exception failure: extra allocations.");
+      if (!(x.size() == values_.size() && test::equal(x.cbegin(), x.cend(),
+                                            values_.begin(), test::equivalent)))
+        BOOST_ERROR("Strong exception safety failure.");
+      if (allocations != allocations_)
+        BOOST_ERROR("Strong exception failure: extra allocations.");
    }
-};
+  };
 }

 #endif
@@ -6,92 +6,141 @@
 #if !defined(BOOST_UNORDERED_TEST_TEST_HEADER)
 #define BOOST_UNORDERED_TEST_TEST_HEADER

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/stringize.hpp>
-#include <iostream>

 #define UNORDERED_AUTO_TEST(x)                                                 \
-    struct BOOST_PP_CAT(x, _type) : public ::test::registered_test_base        \
+  struct BOOST_PP_CAT(x, _type) : public ::test::registered_test_base          \
+  {                                                                            \
+    BOOST_PP_CAT(x, _type)                                                     \
+    () : ::test::registered_test_base(BOOST_PP_STRINGIZE(x))                   \
    {                                                                          \
-        BOOST_PP_CAT(x, _type)                                                 \
-        () : ::test::registered_test_base(BOOST_PP_STRINGIZE(x))               \
-        {                                                                      \
-            ::test::test_list::add_test(this);                                 \
-        }                                                                      \
-        void run();                                                            \
-    };                                                                         \
-    BOOST_PP_CAT(x, _type) x;                                                  \
-    void BOOST_PP_CAT(x, _type)::run()
+      ::test::get_state().add_test(this);                                      \
+    }                                                                          \
+    void run();                                                                \
+  };                                                                           \
+  BOOST_PP_CAT(x, _type) x;                                                    \
+  void BOOST_PP_CAT(x, _type)::run()

 #define RUN_TESTS()                                                            \
-    int main(int, char**)                                                      \
-    {                                                                          \
-        ::test::write_compiler_info();                                         \
-        ::test::test_list::run_tests();                                        \
-        return boost::report_errors();                                         \
-    }
+  int main(int, char**)                                                        \
+  {                                                                            \
+    BOOST_UNORDERED_TEST_COMPILER_INFO()                                       \
+    ::test::get_state().run_tests();                                           \
+    return boost::report_errors();                                             \
+  }
+
+#define RUN_TESTS_QUIET()                                                      \
+  int main(int, char**)                                                        \
+  {                                                                            \
+    BOOST_UNORDERED_TEST_COMPILER_INFO()                                       \
+    ::test::get_state().run_tests(true);                                       \
+    return boost::report_errors();                                             \
+  }
+
+#define UNORDERED_SUB_TEST(x)                                                  \
+  for (int UNORDERED_SUB_TEST_VALUE = ::test::get_state().start_sub_test(x);   \
+       UNORDERED_SUB_TEST_VALUE;                                               \
+       UNORDERED_SUB_TEST_VALUE =                                              \
+         ::test::get_state().end_sub_test(x, UNORDERED_SUB_TEST_VALUE))

 namespace test {
-struct registered_test_base
-{
+
+  struct registered_test_base
+  {
    registered_test_base* next;
    char const* name;
    explicit registered_test_base(char const* n) : name(n) {}
    virtual void run() = 0;
    virtual ~registered_test_base() {}
-};
+  };

-namespace test_list {
-static inline registered_test_base*& first()
-{
-    static registered_test_base* ptr = 0;
-    return ptr;
-}
+  struct state
+  {
+    bool is_quiet;
+    registered_test_base* first_test;
+    registered_test_base* last_test;

-static inline registered_test_base*& last()
-{
-    static registered_test_base* ptr = 0;
-    return ptr;
-}
+    state() : is_quiet(false), first_test(0), last_test(0) {}

-static inline void add_test(registered_test_base* test)
-{
-    if (last()) {
-        last()->next = test;
-    } else {
-        first() = test;
+    void add_test(registered_test_base* test)
+    {
+      if (last_test) {
+        last_test->next = test;
+      } else {
+        first_test = test;
+      }
+      last_test = test;
    }

-    last() = test;
-}
+    void run_tests(bool quiet = false)
+    {
+      is_quiet = quiet;

-static inline void run_tests()
-{
-    for (registered_test_base* i = first(); i; i = i->next) {
-        std::cout << "Running " << i->name << "\n" << std::flush;
+      for (registered_test_base* i = first_test; i; i = i->next) {
+        int error_count = boost::detail::test_errors();
+        if (!quiet) {
+          BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Running " << i->name << "\n"
+                                         << std::flush;
+        }
        i->run();
-        std::cerr << std::flush;
-        std::cout << std::flush;
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM << std::flush;
+        if (quiet && error_count != boost::detail::test_errors()) {
+          BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Error in: " << i->name << "\n"
+                                         << std::flush;
+        }
+      }
    }
-}
+
+    int start_sub_test(char const* name)
+    {
+      if (!is_quiet) {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Sub-test: " << name << "\n"
+                                       << std::flush;
+      }
+      // Add one because it's used as a loop condition.
+      return boost::detail::test_errors() + 1;
+    }
+
+    int end_sub_test(char const* name, int value)
+    {
+      if (is_quiet && value != boost::detail::test_errors() + 1) {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Error in sub-test: " << name << "\n"
+                                       << std::flush;
+      }
+      return 0;
+    }
+  };
+
+  // Get the currnet translation unit's test state.
+  static inline state& get_state()
+  {
+    static state instance;
+    return instance;
+  }
 }

-inline void write_compiler_info()
-{
-#if defined(BOOST_GCC_CXX11)
-    char const* cpp11 = "true";
+#if defined(__cplusplus)
+#define BOOST_UNORDERED_CPLUSPLUS __cplusplus
 #else
-    char const* cpp11 = "false";
+#define BOOST_UNORDERED_CPLUSPLUS "(not defined)"
 #endif

-    std::cout << "Compiler: " << BOOST_COMPILER << "\n"
-              << "Library: " << BOOST_STDLIB << "\n"
-              << "C++11: " << cpp11 << "\n"
-              << "\n"
-              << std::flush;
-}
-}
+#define BOOST_UNORDERED_TEST_COMPILER_INFO()                                   \
+  {                                                                            \
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM                                             \
+      << "Compiler: " << BOOST_COMPILER << "\n"                                \
+      << "Library: " << BOOST_STDLIB << "\n"                                   \
+      << "__cplusplus: " << BOOST_UNORDERED_CPLUSPLUS << "\n\n"                \
+      << "BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT: "                          \
+      << BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT << "\n"                      \
+      << "BOOST_UNORDERED_EMPLACE_LIMIT: " << BOOST_UNORDERED_EMPLACE_LIMIT    \
+      << "\n"                                                                  \
+      << "BOOST_UNORDERED_CXX11_CONSTRUCTION: "                                \
+      << BOOST_UNORDERED_CXX11_CONSTRUCTION << "\n\n"                          \
+      << std::flush;                                                           \
+  }

 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/seq/fold_left.hpp>
@@ -101,25 +150,50 @@ inline void write_compiler_info()

 // Run test with every combination of the parameters (a sequence of sequences)
 #define UNORDERED_TEST(name, parameters)                                       \
-    BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name))((1))parameters)
+  BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name))((1))parameters)

 #define UNORDERED_TEST_REPEAT(name, n, parameters)                             \
-    BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name))((n))parameters)
+  BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name))((n))parameters)

 #define UNORDERED_TEST_OP(r, product)                                          \
-    UNORDERED_TEST_OP2(BOOST_PP_SEQ_ELEM(0, product),                          \
-        BOOST_PP_SEQ_ELEM(1, product),                                         \
-        BOOST_PP_SEQ_TAIL(BOOST_PP_SEQ_TAIL(product)))
+  UNORDERED_TEST_OP2(BOOST_PP_SEQ_ELEM(0, product),                            \
+    BOOST_PP_SEQ_ELEM(1, product),                                             \
+    BOOST_PP_SEQ_TAIL(BOOST_PP_SEQ_TAIL(product)))

 #define UNORDERED_TEST_OP2(name, n, params)                                    \
-    UNORDERED_AUTO_TEST(                                                       \
-        BOOST_PP_SEQ_FOLD_LEFT(UNORDERED_TEST_OP_JOIN, name, params))          \
-    {                                                                          \
-        for (int i = 0; i < n; ++i)                                            \
-            name BOOST_PP_SEQ_TO_TUPLE(params);                                \
-    }
+  UNORDERED_AUTO_TEST (                                                        \
+    BOOST_PP_SEQ_FOLD_LEFT(UNORDERED_TEST_OP_JOIN, name, params)) {            \
+    for (int i = 0; i < n; ++i)                                                \
+      name BOOST_PP_SEQ_TO_TUPLE(params);                                      \
+  }

 #define UNORDERED_TEST_OP_JOIN(s, state, elem)                                 \
-    BOOST_PP_CAT(state, BOOST_PP_CAT(_, elem))
+  BOOST_PP_CAT(state, BOOST_PP_CAT(_, elem))
+
+#define UNORDERED_MULTI_TEST(name, impl, parameters)                           \
+  UNORDERED_MULTI_TEST_REPEAT(name, impl, 1, parameters)
+
+#define UNORDERED_MULTI_TEST_REPEAT(name, impl, n, parameters)                 \
+  UNORDERED_AUTO_TEST (name) {                                                 \
+    BOOST_PP_SEQ_FOR_EACH_PRODUCT(                                             \
+      UNORDERED_MULTI_TEST_OP, ((impl))((n))parameters)                        \
+  }
+
+#define UNORDERED_MULTI_TEST_OP(r, product)                                    \
+  UNORDERED_MULTI_TEST_OP2(BOOST_PP_SEQ_ELEM(0, product),                      \
+    BOOST_PP_SEQ_ELEM(1, product),                                             \
+    BOOST_PP_SEQ_TAIL(BOOST_PP_SEQ_TAIL(product)))
+
+// Need to wrap UNORDERED_SUB_TEST in a block to avoid an msvc bug.
+// https://support.microsoft.com/en-gb/help/315481/bug-too-many-unnested-loops-incorrectly-causes-a-c1061-compiler-error-in-visual-c
+#define UNORDERED_MULTI_TEST_OP2(name, n, params)                              \
+  {                                                                            \
+    UNORDERED_SUB_TEST(BOOST_PP_STRINGIZE(                                     \
+      BOOST_PP_SEQ_FOLD_LEFT(UNORDERED_TEST_OP_JOIN, name, params)))           \
+    {                                                                          \
+      for (int i = 0; i < n; ++i)                                              \
+        name BOOST_PP_SEQ_TO_TUPLE(params);                                    \
+    }                                                                          \
+  }

 #endif
@@ -20,84 +20,83 @@
 #include <set>

 namespace test {
-template <typename X> struct equals_to_compare
-{
-    typedef std::less<BOOST_DEDUCED_TYPENAME X::first_argument_type> type;
-};
+  template <typename X> struct equals_to_compare
+  {
+    typedef std::less<typename X::first_argument_type> type;
+  };

-template <> struct equals_to_compare<test::equal_to>
-{
+  template <> struct equals_to_compare<test::equal_to>
+  {
    typedef test::less type;
-};
+  };

-template <class X1, class X2> void compare_range(X1 const& x1, X2 const& x2)
-{
-    typedef test::list<BOOST_DEDUCED_TYPENAME X1::value_type> value_list;
+  template<class T> struct equals_to_compare< std::equal_to<T> >
+  {
+    typedef std::less<T> type;
+  };
+
+  template <class X1, class X2> void compare_range(X1 const& x1, X2 const& x2)
+  {
+    typedef test::list<typename X1::value_type> value_list;
    value_list values1(x1.begin(), x1.end());
    value_list values2(x2.begin(), x2.end());
    values1.sort();
    values2.sort();
    BOOST_TEST(values1.size() == values2.size() &&
               test::equal(values1.begin(), values1.end(), values2.begin(),
-                   test::equivalent));
-}
+                 test::equivalent));
+  }

-template <class X1, class X2, class T>
-void compare_pairs(X1 const& x1, X2 const& x2, T*)
-{
+  template <class X1, class X2, class T>
+  void compare_pairs(X1 const& x1, X2 const& x2, T*)
+  {
    test::list<T> values1(x1.first, x1.second);
    test::list<T> values2(x2.first, x2.second);
    values1.sort();
    values2.sort();
    BOOST_TEST(values1.size() == values2.size() &&
               test::equal(values1.begin(), values1.end(), values2.begin(),
-                   test::equivalent));
-}
+                 test::equivalent));
+  }

-template <typename X, bool is_set = test::is_set<X>::value,
+  template <typename X, bool is_set = test::is_set<X>::value,
    bool has_unique_keys = test::has_unique_keys<X>::value>
-struct ordered_base;
+  struct ordered_base;

-template <typename X> struct ordered_base<X, true, true>
-{
-    typedef std::set<BOOST_DEDUCED_TYPENAME X::value_type,
-        BOOST_DEDUCED_TYPENAME
-            equals_to_compare<BOOST_DEDUCED_TYPENAME X::key_equal>::type>
-        type;
-};
+  template <typename X> struct ordered_base<X, true, true>
+  {
+    typedef std::set<typename X::value_type,
+      typename equals_to_compare<typename X::key_equal>::type>
+      type;
+  };

-template <typename X> struct ordered_base<X, true, false>
-{
-    typedef std::multiset<BOOST_DEDUCED_TYPENAME X::value_type,
-        BOOST_DEDUCED_TYPENAME
-            equals_to_compare<BOOST_DEDUCED_TYPENAME X::key_equal>::type>
-        type;
-};
+  template <typename X> struct ordered_base<X, true, false>
+  {
+    typedef std::multiset<typename X::value_type,
+      typename equals_to_compare<typename X::key_equal>::type>
+      type;
+  };

-template <typename X> struct ordered_base<X, false, true>
-{
-    typedef std::map<BOOST_DEDUCED_TYPENAME X::key_type,
-        BOOST_DEDUCED_TYPENAME X::mapped_type,
-        BOOST_DEDUCED_TYPENAME
-            equals_to_compare<BOOST_DEDUCED_TYPENAME X::key_equal>::type>
-        type;
-};
+  template <typename X> struct ordered_base<X, false, true>
+  {
+    typedef std::map<typename X::key_type, typename X::mapped_type,
+      typename equals_to_compare<typename X::key_equal>::type>
+      type;
+  };

-template <typename X> struct ordered_base<X, false, false>
-{
-    typedef std::multimap<BOOST_DEDUCED_TYPENAME X::key_type,
-        BOOST_DEDUCED_TYPENAME X::mapped_type,
-        BOOST_DEDUCED_TYPENAME
-            equals_to_compare<BOOST_DEDUCED_TYPENAME X::key_equal>::type>
-        type;
-};
+  template <typename X> struct ordered_base<X, false, false>
+  {
+    typedef std::multimap<typename X::key_type, typename X::mapped_type,
+      typename equals_to_compare<typename X::key_equal>::type>
+      type;
+  };

-template <class X> class ordered : public ordered_base<X>::type
-{
-    typedef BOOST_DEDUCED_TYPENAME ordered_base<X>::type base;
+  template <class X> class ordered : public ordered_base<X>::type
+  {
+    typedef typename ordered_base<X>::type base;

  public:
-    typedef BOOST_DEDUCED_TYPENAME base::key_compare key_compare;
+    typedef typename base::key_compare key_compare;

    ordered() : base() {}

@@ -105,43 +104,40 @@ template <class X> class ordered : public ordered_base<X>::type

    void compare(X const& x) { compare_range(x, *this); }

-    void compare_key(
-        X const& x, BOOST_DEDUCED_TYPENAME X::value_type const& val)
+    void compare_key(X const& x, typename X::value_type const& val)
    {
-        compare_pairs(x.equal_range(get_key<X>(val)),
-            this->equal_range(get_key<X>(val)),
-            (BOOST_DEDUCED_TYPENAME X::value_type*)0);
+      compare_pairs(x.equal_range(get_key<X>(val)),
+        this->equal_range(get_key<X>(val)), (typename X::value_type*)0);
    }

    template <class It> void insert_range(It b, It e)
    {
-        while (b != e) {
-            this->insert(*b);
-            ++b;
-        }
+      while (b != e) {
+        this->insert(*b);
+        ++b;
+      }
    }
-};
+  };

-template <class Equals>
-BOOST_DEDUCED_TYPENAME equals_to_compare<Equals>::type create_compare(
-    Equals const&)
-{
-    BOOST_DEDUCED_TYPENAME equals_to_compare<Equals>::type x;
+  template <class Equals>
+  typename equals_to_compare<Equals>::type create_compare(Equals const&)
+  {
+    typename equals_to_compare<Equals>::type x;
    return x;
-}
+  }

-template <class X> ordered<X> create_ordered(X const& container)
-{
+  template <class X> ordered<X> create_ordered(X const& container)
+  {
    return ordered<X>(create_compare(container.key_eq()));
-}
+  }

-template <class X1, class X2>
-void check_container(X1 const& container, X2 const& values)
-{
+  template <class X1, class X2>
+  void check_container(X1 const& container, X2 const& values)
+  {
    ordered<X1> tracker = create_ordered(container);
    tracker.insert_range(values.begin(), values.end());
    tracker.compare(container);
-}
+  }
 }

 #endif
@@ -13,142 +13,143 @@
 #include "../helpers/fwd.hpp"
 #include "../helpers/memory.hpp"

-namespace test {
-struct allocator_false
+namespace test
 {
+  struct allocator_false
+  {
    enum
    {
-        is_select_on_copy = 0,
-        is_propagate_on_swap = 0,
-        is_propagate_on_assign = 0,
-        is_propagate_on_move = 0,
-        cxx11_construct = 0
+      is_select_on_copy = 0,
+      is_propagate_on_swap = 0,
+      is_propagate_on_assign = 0,
+      is_propagate_on_move = 0,
+      cxx11_construct = 0
    };
-};
+  };

-struct allocator_flags_all
-{
+  struct allocator_flags_all
+  {
    enum
    {
-        is_select_on_copy = 1,
-        is_propagate_on_swap = 1,
-        is_propagate_on_assign = 1,
-        is_propagate_on_move = 1,
-        cxx11_construct = 1
+      is_select_on_copy = 1,
+      is_propagate_on_swap = 1,
+      is_propagate_on_assign = 1,
+      is_propagate_on_move = 1,
+      cxx11_construct = 1
    };
-};
+  };

-struct select_copy : allocator_false
-{
+  struct select_copy : allocator_false
+  {
    enum
    {
-        is_select_on_copy = 1
+      is_select_on_copy = 1
    };
-};
-struct propagate_swap : allocator_false
-{
+  };
+  struct propagate_swap : allocator_false
+  {
    enum
    {
-        is_propagate_on_swap = 1
+      is_propagate_on_swap = 1
    };
-};
-struct propagate_assign : allocator_false
-{
+  };
+  struct propagate_assign : allocator_false
+  {
    enum
    {
-        is_propagate_on_assign = 1
+      is_propagate_on_assign = 1
    };
-};
-struct propagate_move : allocator_false
-{
+  };
+  struct propagate_move : allocator_false
+  {
    enum
    {
-        is_propagate_on_move = 1
+      is_propagate_on_move = 1
    };
-};
+  };

-struct no_select_copy : allocator_flags_all
-{
+  struct no_select_copy : allocator_flags_all
+  {
    enum
    {
-        is_select_on_copy = 0
+      is_select_on_copy = 0
    };
-};
-struct no_propagate_swap : allocator_flags_all
-{
+  };
+  struct no_propagate_swap : allocator_flags_all
+  {
    enum
    {
-        is_propagate_on_swap = 0
+      is_propagate_on_swap = 0
    };
-};
-struct no_propagate_assign : allocator_flags_all
-{
+  };
+  struct no_propagate_assign : allocator_flags_all
+  {
    enum
    {
-        is_propagate_on_assign = 0
+      is_propagate_on_assign = 0
    };
-};
-struct no_propagate_move : allocator_flags_all
-{
+  };
+  struct no_propagate_move : allocator_flags_all
+  {
    enum
    {
-        is_propagate_on_move = 0
+      is_propagate_on_move = 0
    };
-};
+  };

-template <typename Flag> struct swap_allocator_base
-{
+  template <typename Flag> struct swap_allocator_base
+  {
    struct propagate_on_container_swap
    {
-        enum
-        {
-            value = Flag::is_propagate_on_swap
-        };
+      enum
+      {
+        value = Flag::is_propagate_on_swap
+      };
    };
-};
+  };

-template <typename Flag> struct assign_allocator_base
-{
+  template <typename Flag> struct assign_allocator_base
+  {
    struct propagate_on_container_copy_assignment
    {
-        enum
-        {
-            value = Flag::is_propagate_on_assign
-        };
+      enum
+      {
+        value = Flag::is_propagate_on_assign
+      };
    };
-};
+  };

-template <typename Flag> struct move_allocator_base
-{
+  template <typename Flag> struct move_allocator_base
+  {
    struct propagate_on_container_move_assignment
    {
-        enum
-        {
-            value = Flag::is_propagate_on_move
-        };
+      enum
+      {
+        value = Flag::is_propagate_on_move
+      };
    };
-};
+  };

-namespace {
-// boostinspect:nounnamed
-bool force_equal_allocator_value = false;
-}
+  namespace {
+    // boostinspect:nounnamed
+    bool force_equal_allocator_value = false;
+  }

-struct force_equal_allocator
-{
+  struct force_equal_allocator
+  {
    bool old_value_;

    explicit force_equal_allocator(bool value)
        : old_value_(force_equal_allocator_value)
    {
-        force_equal_allocator_value = value;
+      force_equal_allocator_value = value;
    }

    ~force_equal_allocator() { force_equal_allocator_value = old_value_; }
-};
+  };

-template <typename T> struct cxx11_allocator_base
-{
+  template <typename T> struct cxx11_allocator_base
+  {
    int tag_;
    int selected_;

@@ -162,95 +163,99 @@ template <typename T> struct cxx11_allocator_base

    explicit cxx11_allocator_base(int t) : tag_(t), selected_(0)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    template <typename Y>
    cxx11_allocator_base(cxx11_allocator_base<Y> const& x)
        : tag_(x.tag_), selected_(x.selected_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    cxx11_allocator_base(cxx11_allocator_base const& x)
        : tag_(x.tag_), selected_(x.selected_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    ~cxx11_allocator_base() { detail::tracker.allocator_unref(); }

+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+    cxx11_allocator_base& operator=(cxx11_allocator_base const& x) = default;
+#endif
+
    pointer address(reference r) { return pointer(&r); }

    const_pointer address(const_reference r) { return const_pointer(&r); }

    pointer allocate(size_type n)
    {
-        pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
-        return ptr;
+      pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
+      return ptr;
    }

    pointer allocate(size_type n, void const*)
    {
-        pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
-        return ptr;
+      pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
+      return ptr;
    }

    void deallocate(pointer p, size_type n)
    {
-        // Only checking tags when propagating swap.
-        // Note that tags will be tested
-        // properly in the normal allocator.
-        detail::tracker.track_deallocate(
-            (void*)p, n, sizeof(T), tag_, !force_equal_allocator_value);
-        ::operator delete((void*)p);
+      // Only checking tags when propagating swap.
+      // Note that tags will be tested
+      // properly in the normal allocator.
+      detail::tracker.track_deallocate(
+        (void*)p, n, sizeof(T), tag_, !force_equal_allocator_value);
+      ::operator delete((void*)p);
    }

    void construct(T* p, T const& t)
    {
-        detail::tracker.track_construct((void*)p, sizeof(T), tag_);
-        new (p) T(t);
+      detail::tracker.track_construct((void*)p, sizeof(T), tag_);
+      new (p) T(t);
    }

 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
    template <typename... Args>
    void construct(T* p, BOOST_FWD_REF(Args)... args)
    {
-        detail::tracker.track_construct((void*)p, sizeof(T), tag_);
-        new (p) T(boost::forward<Args>(args)...);
+      detail::tracker.track_construct((void*)p, sizeof(T), tag_);
+      new (p) T(boost::forward<Args>(args)...);
    }
 #endif

    void destroy(T* p)
    {
-        detail::tracker.track_destroy((void*)p, sizeof(T), tag_);
-        p->~T();
+      detail::tracker.track_destroy((void*)p, sizeof(T), tag_);
+      p->~T();
    }

    size_type max_size() const
    {
-        return (std::numeric_limits<size_type>::max)();
+      return (std::numeric_limits<size_type>::max)();
    }
-};
+  };

-template <typename T, typename Flags = propagate_swap, typename Enable = void>
-struct cxx11_allocator;
+  template <typename T, typename Flags = propagate_swap, typename Enable = void>
+  struct cxx11_allocator;

-template <typename T, typename Flags>
-struct cxx11_allocator<T, Flags,
+  template <typename T, typename Flags>
+  struct cxx11_allocator<T, Flags,
    typename boost::disable_if_c<Flags::is_select_on_copy>::type>
    : public cxx11_allocator_base<T>,
      public swap_allocator_base<Flags>,
      public assign_allocator_base<Flags>,
      public move_allocator_base<Flags>,
      Flags
-{
+  {
 #if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 402000)
    template <typename U> struct rebind
    {
-        typedef cxx11_allocator<U, Flags> other;
+      typedef cxx11_allocator<U, Flags> other;
    };
 #endif

@@ -264,36 +269,40 @@ struct cxx11_allocator<T, Flags,

    cxx11_allocator(cxx11_allocator const& x) : cxx11_allocator_base<T>(x) {}

+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+    cxx11_allocator& operator=(cxx11_allocator const& x) = default;
+#endif 
+
    // When not propagating swap, allocators are always equal
    // to avoid undefined behaviour.
    bool operator==(cxx11_allocator const& x) const
    {
-        return force_equal_allocator_value || (this->tag_ == x.tag_);
+      return force_equal_allocator_value || (this->tag_ == x.tag_);
    }

    bool operator!=(cxx11_allocator const& x) const { return !(*this == x); }
-};
+  };

-template <typename T, typename Flags>
-struct cxx11_allocator<T, Flags,
+  template <typename T, typename Flags>
+  struct cxx11_allocator<T, Flags,
    typename boost::enable_if_c<Flags::is_select_on_copy>::type>
    : public cxx11_allocator_base<T>,
      public swap_allocator_base<Flags>,
      public assign_allocator_base<Flags>,
      public move_allocator_base<Flags>,
      Flags
-{
+  {
    cxx11_allocator select_on_container_copy_construction() const
    {
-        cxx11_allocator tmp(*this);
-        ++tmp.selected_;
-        return tmp;
+      cxx11_allocator tmp(*this);
+      ++tmp.selected_;
+      return tmp;
    }

 #if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 402000)
    template <typename U> struct rebind
    {
-        typedef cxx11_allocator<U, Flags> other;
+      typedef cxx11_allocator<U, Flags> other;
    };
 #endif

@@ -307,38 +316,42 @@ struct cxx11_allocator<T, Flags,

    cxx11_allocator(cxx11_allocator const& x) : cxx11_allocator_base<T>(x) {}

+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS)
+    cxx11_allocator& operator=(cxx11_allocator const& x) = default;
+#endif
+
    // When not propagating swap, allocators are always equal
    // to avoid undefined behaviour.
    bool operator==(cxx11_allocator const& x) const
    {
-        return force_equal_allocator_value || (this->tag_ == x.tag_);
+      return force_equal_allocator_value || (this->tag_ == x.tag_);
    }

    bool operator!=(cxx11_allocator const& x) const { return !(*this == x); }
-};
+  };

-template <typename T, typename Flags>
-bool equivalent_impl(cxx11_allocator<T, Flags> const& x,
+  template <typename T, typename Flags>
+  bool equivalent_impl(cxx11_allocator<T, Flags> const& x,
    cxx11_allocator<T, Flags> const& y, test::derived_type)
-{
+  {
    return x.tag_ == y.tag_;
-}
+  }

-// Function to check how many times an allocator has been selected,
-// return 0 for other allocators.
+  // Function to check how many times an allocator has been selected,
+  // return 0 for other allocators.

-struct convert_from_anything
-{
+  struct convert_from_anything
+  {
    template <typename T> convert_from_anything(T const&) {}
-};
+  };

-inline int selected_count(convert_from_anything) { return 0; }
+  inline int selected_count(convert_from_anything) { return 0; }

-template <typename T, typename Flags>
-int selected_count(cxx11_allocator<T, Flags> const& x)
-{
+  template <typename T, typename Flags>
+  int selected_count(cxx11_allocator<T, Flags> const& x)
+  {
    return x.selected_;
-}
+  }
 }

 #endif
@@ -7,11 +7,11 @@
 #define BOOST_UNORDERED_TEST_OBJECTS_FWD_HEADER

 namespace test {
-class object;
-class hash;
-class less;
-class equal_to;
-template <class T> class allocator;
+  class object;
+  class hash;
+  class less;
+  class equal_to;
+  template <class T> class allocator;
 }

 #endif
@@ -14,25 +14,25 @@
 #include <cstddef>

 namespace test {
-// Note that the default hash function will work for any equal_to (but not
-// very well).
-class object;
-class movable;
-class implicitly_convertible;
-class hash;
-class less;
-class equal_to;
-template <class T> class allocator1;
-template <class T> class allocator2;
-object generate(object const*, random_generator);
-movable generate(movable const*, random_generator);
-implicitly_convertible generate(
+  // Note that the default hash function will work for any equal_to (but not
+  // very well).
+  class object;
+  class movable;
+  class implicitly_convertible;
+  class hash;
+  class less;
+  class equal_to;
+  template <class T> class allocator1;
+  template <class T> class allocator2;
+  object generate(object const*, random_generator);
+  movable generate(movable const*, random_generator);
+  implicitly_convertible generate(
    implicitly_convertible const*, random_generator);

-inline void ignore_variable(void const*) {}
+  inline void ignore_variable(void const*) {}

-class object : private counted_object
-{
+  class object : private counted_object
+  {
    friend class hash;
    friend class equal_to;
    friend class less;
@@ -43,40 +43,40 @@ class object : private counted_object

    ~object()
    {
-        tag1_ = -1;
-        tag2_ = -1;
+      tag1_ = -1;
+      tag2_ = -1;
    }

    friend bool operator==(object const& x1, object const& x2)
    {
-        return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
+      return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
    }

    friend bool operator!=(object const& x1, object const& x2)
    {
-        return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_;
+      return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_;
    }

    friend bool operator<(object const& x1, object const& x2)
    {
-        return x1.tag1_ < x2.tag1_ ||
-               (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_);
+      return x1.tag1_ < x2.tag1_ ||
+             (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_);
    }

    friend object generate(object const*, random_generator g)
    {
-        int* x = 0;
-        return object(generate(x, g), generate(x, g));
+      int* x = 0;
+      return object(generate(x, g), generate(x, g));
    }

    friend std::ostream& operator<<(std::ostream& out, object const& o)
    {
-        return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
+      return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
    }
-};
+  };

-class movable : private counted_object
-{
+  class movable : private counted_object
+  {
    friend class hash;
    friend class equal_to;
    friend class less;
@@ -89,74 +89,74 @@ class movable : private counted_object
    movable(movable const& x)
        : counted_object(x), tag1_(x.tag1_), tag2_(x.tag2_)
    {
-        BOOST_TEST(x.tag1_ != -1);
+      BOOST_TEST(x.tag1_ != -1);
    }

    movable(BOOST_RV_REF(movable) x)
        : counted_object(x), tag1_(x.tag1_), tag2_(x.tag2_)
    {
-        BOOST_TEST(x.tag1_ != -1);
-        x.tag1_ = -1;
-        x.tag2_ = -1;
+      BOOST_TEST(x.tag1_ != -1);
+      x.tag1_ = -1;
+      x.tag2_ = -1;
    }

    movable& operator=(BOOST_COPY_ASSIGN_REF(movable) x) // Copy assignment
    {
-        BOOST_TEST(x.tag1_ != -1);
-        tag1_ = x.tag1_;
-        tag2_ = x.tag2_;
-        return *this;
+      BOOST_TEST(x.tag1_ != -1);
+      tag1_ = x.tag1_;
+      tag2_ = x.tag2_;
+      return *this;
    }

    movable& operator=(BOOST_RV_REF(movable) x) // Move assignment
    {
-        BOOST_TEST(x.tag1_ != -1);
-        tag1_ = x.tag1_;
-        tag2_ = x.tag2_;
-        x.tag1_ = -1;
-        x.tag2_ = -1;
-        return *this;
+      BOOST_TEST(x.tag1_ != -1);
+      tag1_ = x.tag1_;
+      tag2_ = x.tag2_;
+      x.tag1_ = -1;
+      x.tag2_ = -1;
+      return *this;
    }

    ~movable()
    {
-        tag1_ = -1;
-        tag2_ = -1;
+      tag1_ = -1;
+      tag2_ = -1;
    }

    friend bool operator==(movable const& x1, movable const& x2)
    {
-        BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
-        return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
+      BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+      return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
    }

    friend bool operator!=(movable const& x1, movable const& x2)
    {
-        BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
-        return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_;
+      BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+      return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_;
    }

    friend bool operator<(movable const& x1, movable const& x2)
    {
-        BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
-        return x1.tag1_ < x2.tag1_ ||
-               (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_);
+      BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+      return x1.tag1_ < x2.tag1_ ||
+             (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_);
    }

    friend movable generate(movable const*, random_generator g)
    {
-        int* x = 0;
-        return movable(generate(x, g), generate(x, g));
+      int* x = 0;
+      return movable(generate(x, g), generate(x, g));
    }

    friend std::ostream& operator<<(std::ostream& out, movable const& o)
    {
-        return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
+      return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
    }
-};
+  };

-class implicitly_convertible : private counted_object
-{
+  class implicitly_convertible : private counted_object
+  {
    int tag1_, tag2_;

  public:
@@ -170,92 +170,96 @@ class implicitly_convertible : private counted_object
    operator movable() const { return movable(tag1_, tag2_); }

    friend implicitly_convertible generate(
-        implicitly_convertible const*, random_generator g)
+      implicitly_convertible const*, random_generator g)
    {
-        int* x = 0;
-        return implicitly_convertible(generate(x, g), generate(x, g));
+      int* x = 0;
+      return implicitly_convertible(generate(x, g), generate(x, g));
    }

    friend std::ostream& operator<<(
-        std::ostream& out, implicitly_convertible const& o)
+      std::ostream& out, implicitly_convertible const& o)
    {
-        return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
+      return out << "(" << o.tag1_ << "," << o.tag2_ << ")";
    }
-};
+  };

-// Note: This is a deliberately bad hash function.
-class hash
-{
+  // Note: This is a deliberately bad hash function.
+  class hash
+  {
    int type_;

  public:
-    explicit hash(int t = 0) : type_(t) {}
+    hash() : type_(0) {}
+
+    explicit hash(int t) : type_(t) {}

    std::size_t operator()(object const& x) const
    {
-        int result;
-        switch (type_) {
-        case 1:
-            result = x.tag1_;
-            break;
-        case 2:
-            result = x.tag2_;
-            break;
-        default:
-            result = x.tag1_ + x.tag2_;
-        }
-        return static_cast<std::size_t>(result);
+      unsigned result;
+      switch (type_) {
+      case 1:
+        result = static_cast<unsigned>(x.tag1_);
+        break;
+      case 2:
+        result = static_cast<unsigned>(x.tag2_);
+        break;
+      default:
+        result =
+          static_cast<unsigned>(x.tag1_) + static_cast<unsigned>(x.tag2_);
+      }
+      return result;
    }

    std::size_t operator()(movable const& x) const
    {
-        int result;
-        switch (type_) {
-        case 1:
-            result = x.tag1_;
-            break;
-        case 2:
-            result = x.tag2_;
-            break;
-        default:
-            result = x.tag1_ + x.tag2_;
-        }
-        return static_cast<std::size_t>(result);
+      unsigned result;
+      switch (type_) {
+      case 1:
+        result = static_cast<unsigned>(x.tag1_);
+        break;
+      case 2:
+        result = static_cast<unsigned>(x.tag2_);
+        break;
+      default:
+        result =
+          static_cast<unsigned>(x.tag1_) + static_cast<unsigned>(x.tag2_);
+      }
+      return result;
    }

    std::size_t operator()(int x) const
    {
-        int result;
-        switch (type_) {
-        case 1:
-            result = x;
-            break;
-        case 2:
-            result = x * 7;
-            break;
-        default:
-            result = x * 256;
-        }
-        return static_cast<std::size_t>(result);
+      int result;
+      switch (type_) {
+      case 1:
+        result = x;
+        break;
+      case 2:
+        result = x * 7;
+        break;
+      default:
+        result = x * 256;
+      }
+      return static_cast<std::size_t>(result);
    }

    friend bool operator==(hash const& x1, hash const& x2)
    {
-        return x1.type_ == x2.type_;
+      return x1.type_ == x2.type_;
    }

    friend bool operator!=(hash const& x1, hash const& x2)
    {
-        return x1.type_ != x2.type_;
+      return x1.type_ != x2.type_;
    }
-};
+  };

-std::size_t hash_value(test::object const& x) { return hash()(x); }
+  std::size_t hash_value(test::object const& x) { return hash()(x); }

-std::size_t hash_value(test::movable const& x) { return hash()(x); }
+  std::size_t hash_value(test::movable const& x) { return hash()(x); }

-class less
-{
+  class less
+  {
    int type_;

  public:
@@ -263,87 +267,89 @@ class less

    bool operator()(object const& x1, object const& x2) const
    {
-        switch (type_) {
-        case 1:
-            return x1.tag1_ < x2.tag1_;
-        case 2:
-            return x1.tag2_ < x2.tag2_;
-        default:
-            return x1 < x2;
-        }
+      switch (type_) {
+      case 1:
+        return x1.tag1_ < x2.tag1_;
+      case 2:
+        return x1.tag2_ < x2.tag2_;
+      default:
+        return x1 < x2;
+      }
    }

    bool operator()(movable const& x1, movable const& x2) const
    {
-        switch (type_) {
-        case 1:
-            return x1.tag1_ < x2.tag1_;
-        case 2:
-            return x1.tag2_ < x2.tag2_;
-        default:
-            return x1 < x2;
-        }
+      switch (type_) {
+      case 1:
+        return x1.tag1_ < x2.tag1_;
+      case 2:
+        return x1.tag2_ < x2.tag2_;
+      default:
+        return x1 < x2;
+      }
    }

    std::size_t operator()(int x1, int x2) const { return x1 < x2; }

    friend bool operator==(less const& x1, less const& x2)
    {
-        return x1.type_ == x2.type_;
+      return x1.type_ == x2.type_;
    }
-};
+  };

-class equal_to
-{
+  class equal_to
+  {
    int type_;

  public:
-    explicit equal_to(int t = 0) : type_(t) {}
+    equal_to() : type_(0) {}
+
+    explicit equal_to(int t) : type_(t) {}

    bool operator()(object const& x1, object const& x2) const
    {
-        switch (type_) {
-        case 1:
-            return x1.tag1_ == x2.tag1_;
-        case 2:
-            return x1.tag2_ == x2.tag2_;
-        default:
-            return x1 == x2;
-        }
+      switch (type_) {
+      case 1:
+        return x1.tag1_ == x2.tag1_;
+      case 2:
+        return x1.tag2_ == x2.tag2_;
+      default:
+        return x1 == x2;
+      }
    }

    bool operator()(movable const& x1, movable const& x2) const
    {
-        switch (type_) {
-        case 1:
-            return x1.tag1_ == x2.tag1_;
-        case 2:
-            return x1.tag2_ == x2.tag2_;
-        default:
-            return x1 == x2;
-        }
+      switch (type_) {
+      case 1:
+        return x1.tag1_ == x2.tag1_;
+      case 2:
+        return x1.tag2_ == x2.tag2_;
+      default:
+        return x1 == x2;
+      }
    }

    std::size_t operator()(int x1, int x2) const { return x1 == x2; }

    friend bool operator==(equal_to const& x1, equal_to const& x2)
    {
-        return x1.type_ == x2.type_;
+      return x1.type_ == x2.type_;
    }

    friend bool operator!=(equal_to const& x1, equal_to const& x2)
    {
-        return x1.type_ != x2.type_;
+      return x1.type_ != x2.type_;
    }

    friend less create_compare(equal_to x) { return less(x.type_); }
-};
+  };

-// allocator1 only has the old fashioned 'construct' method and has
-// a few less typedefs. allocator2 uses a custom pointer class.
+  // allocator1 only has the old fashioned 'construct' method and has
+  // a few less typedefs. allocator2 uses a custom pointer class.

-template <class T> class allocator1
-{
+  template <class T> class allocator1
+  {
  public:
    int tag_;

@@ -351,61 +357,76 @@ template <class T> class allocator1

    template <class U> struct rebind
    {
-        typedef allocator1<U> other;
+      typedef allocator1<U> other;
    };

-    explicit allocator1(int t = 0) : tag_(t)
-    {
-        detail::tracker.allocator_ref();
-    }
+    allocator1() : tag_(0) { detail::tracker.allocator_ref(); }
+
+    explicit allocator1(int t) : tag_(t) { detail::tracker.allocator_ref(); }

    template <class Y> allocator1(allocator1<Y> const& x) : tag_(x.tag_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    allocator1(allocator1 const& x) : tag_(x.tag_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    ~allocator1() { detail::tracker.allocator_unref(); }

    T* allocate(std::size_t n)
    {
-        T* ptr(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
-        return ptr;
+      T* ptr(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
+      return ptr;
    }

    T* allocate(std::size_t n, void const*)
    {
-        T* ptr(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
-        return ptr;
+      T* ptr(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
+      return ptr;
    }

    void deallocate(T* p, std::size_t n)
    {
-        detail::tracker.track_deallocate((void*)p, n, sizeof(T), tag_);
-        ::operator delete((void*)p);
+      detail::tracker.track_deallocate((void*)p, n, sizeof(T), tag_);
+      ::operator delete((void*)p);
    }

-    void construct(T* p, T const& t)
+#if BOOST_UNORDERED_CXX11_CONSTRUCTION
+    template <typename U, typename... Args> void construct(U* p, Args&&... args)
    {
-        // Don't count constructions here as it isn't always called.
-        // detail::tracker.track_construct((void*) p, sizeof(T), tag_);
-        new (p) T(t);
+      detail::tracker.track_construct((void*)p, sizeof(U), tag_);
+      new (p) U(boost::forward<Args>(args)...);
    }

-    void destroy(T* p)
+    template <typename U> void destroy(U* p)
    {
-        // detail::tracker.track_destroy((void*) p, sizeof(T), tag_);
-        p->~T();
+      detail::tracker.track_destroy((void*)p, sizeof(U), tag_);
+      p->~U();

-        // Work around MSVC buggy unused parameter warning.
-        ignore_variable(&p);
+      // Work around MSVC buggy unused parameter warning.
+      ignore_variable(&p);
    }
+#else
+  private:
+    // I'm going to claim in the documentation that construct/destroy
+    // is never used when C++11 support isn't available, so might as
+    // well check that in the text.
+    // TODO: Or maybe just disallow them for values?
+    template <typename U> void construct(U* p);
+    template <typename U, typename A0> void construct(U* p, A0 const&);
+    template <typename U, typename A0, typename A1>
+    void construct(U* p, A0 const&, A1 const&);
+    template <typename U, typename A0, typename A1, typename A2>
+    void construct(U* p, A0 const&, A1 const&, A2 const&);
+    template <typename U> void destroy(U* p);
+
+  public:
+#endif

    bool operator==(allocator1 const& x) const { return tag_ == x.tag_; }

@@ -413,18 +434,18 @@ template <class T> class allocator1

    enum
    {
-        is_select_on_copy = false,
-        is_propagate_on_swap = false,
-        is_propagate_on_assign = false,
-        is_propagate_on_move = false
+      is_select_on_copy = false,
+      is_propagate_on_swap = false,
+      is_propagate_on_assign = false,
+      is_propagate_on_move = false
    };
-};
+  };

-template <class T> class ptr;
-template <class T> class const_ptr;
+  template <class T> class ptr;
+  template <class T> class const_ptr;

-struct void_ptr
-{
+  struct void_ptr
+  {
 #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
    template <typename T> friend class ptr;

@@ -444,10 +465,10 @@ struct void_ptr

    bool operator==(void_ptr const& x) const { return ptr_ == x.ptr_; }
    bool operator!=(void_ptr const& x) const { return ptr_ != x.ptr_; }
-};
+  };

-class void_const_ptr
-{
+  class void_const_ptr
+  {
 #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
    template <typename T> friend class const_ptr;

@@ -470,10 +491,10 @@ class void_const_ptr

    bool operator==(void_const_ptr const& x) const { return ptr_ == x.ptr_; }
    bool operator!=(void_const_ptr const& x) const { return ptr_ != x.ptr_; }
-};
+  };

-template <class T> class ptr
-{
+  template <class T> class ptr
+  {
    friend class allocator2<T>;
    friend class const_ptr<T>;
    friend struct void_ptr;
@@ -481,6 +502,7 @@ template <class T> class ptr
    T* ptr_;

    ptr(T* x) : ptr_(x) {}
+
  public:
    ptr() : ptr_(0) {}
    explicit ptr(void_ptr const& x) : ptr_((T*)x.ptr_) {}
@@ -489,14 +511,14 @@ template <class T> class ptr
    T* operator->() const { return ptr_; }
    ptr& operator++()
    {
-        ++ptr_;
-        return *this;
+      ++ptr_;
+      return *this;
    }
    ptr operator++(int)
    {
-        ptr tmp(*this);
-        ++ptr_;
-        return tmp;
+      ptr tmp(*this);
+      ++ptr_;
+      return tmp;
    }
    ptr operator+(std::ptrdiff_t s) const { return ptr<T>(ptr_ + s); }
    friend ptr operator+(std::ptrdiff_t s, ptr p) { return ptr<T>(s + p.ptr_); }
@@ -513,16 +535,17 @@ template <class T> class ptr
    bool operator>(ptr const& x) const { return ptr_ > x.ptr_; }
    bool operator<=(ptr const& x) const { return ptr_ <= x.ptr_; }
    bool operator>=(ptr const& x) const { return ptr_ >= x.ptr_; }
-};
+  };

-template <class T> class const_ptr
-{
+  template <class T> class const_ptr
+  {
    friend class allocator2<T>;
    friend struct const_void_ptr;

    T const* ptr_;

    const_ptr(T const* ptr) : ptr_(ptr) {}
+
  public:
    const_ptr() : ptr_(0) {}
    const_ptr(ptr<T> const& x) : ptr_(x.ptr_) {}
@@ -532,19 +555,19 @@ template <class T> class const_ptr
    T const* operator->() const { return ptr_; }
    const_ptr& operator++()
    {
-        ++ptr_;
-        return *this;
+      ++ptr_;
+      return *this;
    }
    const_ptr operator++(int)
    {
-        const_ptr tmp(*this);
-        ++ptr_;
-        return tmp;
+      const_ptr tmp(*this);
+      ++ptr_;
+      return tmp;
    }
    const_ptr operator+(std::ptrdiff_t s) const { return const_ptr(ptr_ + s); }
    friend const_ptr operator+(std::ptrdiff_t s, const_ptr p)
    {
-        return ptr<T>(s + p.ptr_);
+      return ptr<T>(s + p.ptr_);
    }
    T const& operator[](int s) const { return ptr_[s]; }
    bool operator!() const { return !ptr_; }
@@ -556,10 +579,10 @@ template <class T> class const_ptr
    bool operator>(const_ptr const& x) const { return ptr_ > x.ptr_; }
    bool operator<=(const_ptr const& x) const { return ptr_ <= x.ptr_; }
    bool operator>=(const_ptr const& x) const { return ptr_ >= x.ptr_; }
-};
+  };

-template <class T> class allocator2
-{
+  template <class T> class allocator2
+  {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
  public:
 #else
@@ -580,22 +603,21 @@ template <class T> class allocator2

    template <class U> struct rebind
    {
-        typedef allocator2<U> other;
+      typedef allocator2<U> other;
    };

-    explicit allocator2(int t = 0) : tag_(t)
-    {
-        detail::tracker.allocator_ref();
-    }
+    allocator2() : tag_(0) { detail::tracker.allocator_ref(); }
+
+    explicit allocator2(int t) : tag_(t) { detail::tracker.allocator_ref(); }

    template <class Y> allocator2(allocator2<Y> const& x) : tag_(x.tag_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    allocator2(allocator2 const& x) : tag_(x.tag_)
    {
-        detail::tracker.allocator_ref();
+      detail::tracker.allocator_ref();
    }

    ~allocator2() { detail::tracker.allocator_unref(); }
@@ -606,47 +628,47 @@ template <class T> class allocator2

    pointer allocate(size_type n)
    {
-        pointer p(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)p.ptr_, n, sizeof(T), tag_);
-        return p;
+      pointer p(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)p.ptr_, n, sizeof(T), tag_);
+      return p;
    }

    pointer allocate(size_type n, void const*)
    {
-        pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
-        detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
-        return ptr;
+      pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
+      detail::tracker.track_allocate((void*)ptr, n, sizeof(T), tag_);
+      return ptr;
    }

    void deallocate(pointer p, size_type n)
    {
-        detail::tracker.track_deallocate((void*)p.ptr_, n, sizeof(T), tag_);
-        ::operator delete((void*)p.ptr_);
+      detail::tracker.track_deallocate((void*)p.ptr_, n, sizeof(T), tag_);
+      ::operator delete((void*)p.ptr_);
    }

    void construct(T* p, T const& t)
    {
-        detail::tracker.track_construct((void*)p, sizeof(T), tag_);
-        new (p) T(t);
+      detail::tracker.track_construct((void*)p, sizeof(T), tag_);
+      new (p) T(t);
    }

 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
    template <class... Args> void construct(T* p, BOOST_FWD_REF(Args)... args)
    {
-        detail::tracker.track_construct((void*)p, sizeof(T), tag_);
-        new (p) T(boost::forward<Args>(args)...);
+      detail::tracker.track_construct((void*)p, sizeof(T), tag_);
+      new (p) T(boost::forward<Args>(args)...);
    }
 #endif

    void destroy(T* p)
    {
-        detail::tracker.track_destroy((void*)p, sizeof(T), tag_);
-        p->~T();
+      detail::tracker.track_destroy((void*)p, sizeof(T), tag_);
+      p->~T();
    }

    size_type max_size() const
    {
-        return (std::numeric_limits<size_type>::max)();
+      return (std::numeric_limits<size_type>::max)();
    }

    bool operator==(allocator2 const& x) const { return tag_ == x.tag_; }
@@ -655,26 +677,26 @@ template <class T> class allocator2

    enum
    {
-        is_select_on_copy = false,
-        is_propagate_on_swap = false,
-        is_propagate_on_assign = false,
-        is_propagate_on_move = false
+      is_select_on_copy = false,
+      is_propagate_on_swap = false,
+      is_propagate_on_assign = false,
+      is_propagate_on_move = false
    };
-};
+  };

-template <class T>
-bool equivalent_impl(
+  template <class T>
+  bool equivalent_impl(
    allocator1<T> const& x, allocator1<T> const& y, test::derived_type)
-{
+  {
    return x == y;
-}
+  }

-template <class T>
-bool equivalent_impl(
+  template <class T>
+  bool equivalent_impl(
    allocator2<T> const& x, allocator2<T> const& y, test::derived_type)
-{
+  {
    return x == y;
-}
+  }
 }

 #endif
@@ -3,7 +3,7 @@
 // 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)

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/limits.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
@@ -12,76 +12,76 @@
 // Boilerplate

 #define ALLOCATOR_METHODS(name)                                                \
-    template <typename U> struct rebind                                        \
-    {                                                                          \
-        typedef name<U> other;                                                 \
-    };                                                                         \
+  template <typename U> struct rebind                                          \
+  {                                                                            \
+    typedef name<U> other;                                                     \
+  };                                                                           \
                                                                               \
-    name() {}                                                                  \
-    template <typename Y> name(name<Y> const&) {}                              \
-    T* address(T& r) { return &r; }                                            \
-    T const* address(T const& r) { return &r; }                                \
-    T* allocate(std::size_t n)                                                 \
-    {                                                                          \
-        return static_cast<T*>(::operator new(n * sizeof(T)));                 \
-    }                                                                          \
-    T* allocate(std::size_t n, void const*)                                    \
-    {                                                                          \
-        return static_cast<T*>(::operator new(n * sizeof(T)));                 \
-    }                                                                          \
-    void deallocate(T* p, std::size_t) { ::operator delete((void*)p); }        \
-    void construct(T* p, T const& t) { new (p) T(t); }                         \
-    void destroy(T* p) { p->~T(); }                                            \
-    std::size_t max_size() const                                               \
-    {                                                                          \
-        return (std::numeric_limits<std::size_t>::max)();                      \
-    }                                                                          \
-    bool operator==(name<T> const&) { return true; }                           \
-    bool operator!=(name<T> const&) { return false; }                          \
+  name() {}                                                                    \
+  template <typename Y> name(name<Y> const&) {}                                \
+  T* address(T& r) { return &r; }                                              \
+  T const* address(T const& r) { return &r; }                                  \
+  T* allocate(std::size_t n)                                                   \
+  {                                                                            \
+    return static_cast<T*>(::operator new(n * sizeof(T)));                     \
+  }                                                                            \
+  T* allocate(std::size_t n, void const*)                                      \
+  {                                                                            \
+    return static_cast<T*>(::operator new(n * sizeof(T)));                     \
+  }                                                                            \
+  void deallocate(T* p, std::size_t) { ::operator delete((void*)p); }          \
+  void construct(T* p, T const& t) { new (p) T(t); }                           \
+  void destroy(T* p) { p->~T(); }                                              \
+  std::size_t max_size() const                                                 \
+  {                                                                            \
+    return (std::numeric_limits<std::size_t>::max)();                          \
+  }                                                                            \
+  bool operator==(name<T> const&) const { return true; }                       \
+  bool operator!=(name<T> const&) const { return false; }                      \
 /**/

 #define ALLOCATOR_METHODS_TYPEDEFS(name)                                       \
-    template <typename U> struct rebind                                        \
-    {                                                                          \
-        typedef name<U> other;                                                 \
-    };                                                                         \
+  template <typename U> struct rebind                                          \
+  {                                                                            \
+    typedef name<U> other;                                                     \
+  };                                                                           \
                                                                               \
-    name() {}                                                                  \
-    template <typename Y> name(name<Y> const&) {}                              \
-    pointer address(T& r) { return &r; }                                       \
-    const_pointer address(T const& r) { return &r; }                           \
-    pointer allocate(std::size_t n)                                            \
-    {                                                                          \
-        return pointer(::operator new(n * sizeof(T)));                         \
-    }                                                                          \
-    pointer allocate(std::size_t n, void const*)                               \
-    {                                                                          \
-        return pointer(::operator new(n * sizeof(T)));                         \
-    }                                                                          \
-    void deallocate(pointer p, std::size_t) { ::operator delete((void*)p); }   \
-    void construct(T* p, T const& t) { new (p) T(t); }                         \
-    void destroy(T* p) { p->~T(); }                                            \
-    size_type max_size() const                                                 \
-    {                                                                          \
-        return (std::numeric_limits<size_type>::max)();                        \
-    }                                                                          \
-    bool operator==(name<T> const&) { return true; }                           \
-    bool operator!=(name<T> const&) { return false; }                          \
-/**/
+  name() {}                                                                    \
+  template <typename Y> name(name<Y> const&) {}                                \
+  pointer address(T& r) { return &r; }                                         \
+  const_pointer address(T const& r) { return &r; }                             \
+  pointer allocate(std::size_t n)                                              \
+  {                                                                            \
+    return pointer(::operator new(n * sizeof(T)));                             \
+  }                                                                            \
+  pointer allocate(std::size_t n, void const*)                                 \
+  {                                                                            \
+    return pointer(::operator new(n * sizeof(T)));                             \
+  }                                                                            \
+  void deallocate(pointer p, std::size_t) { ::operator delete((void*)p); }     \
+  void construct(T* p, T const& t) { new (p) T(t); }                           \
+  void destroy(T* p) { p->~T(); }                                              \
+  size_type max_size() const                                                   \
+  {                                                                            \
+    return (std::numeric_limits<size_type>::max)();                            \
+  }                                                                            \
+  bool operator==(name<T> const&) const { return true; }                       \
+  bool operator!=(name<T> const&) const { return false; }                      \
+  /**/

 struct yes_type
 {
-    enum
-    {
-        value = true
-    };
+  enum
+  {
+    value = true
+  };
 };
 struct no_type
 {
-    enum
-    {
-        value = false
-    };
+  enum
+  {
+    value = false
+  };
 };

 // For tracking calls...
@@ -91,193 +91,208 @@ void reset() { selected = 0; }

 template <typename Allocator> int call_select()
 {
-    typedef boost::unordered::detail::allocator_traits<Allocator> traits;
-    Allocator a;
+  typedef boost::unordered::detail::allocator_traits<Allocator> traits;
+  Allocator a;

-    reset();
-    BOOST_TEST(traits::select_on_container_copy_construction(a) == a);
-    return selected;
+  reset();
+  BOOST_TEST(traits::select_on_container_copy_construction(a) == a);
+  return selected;
 }

 // Empty allocator test

 template <typename T> struct empty_allocator
 {
-    typedef T value_type;
-    ALLOCATOR_METHODS(empty_allocator)
+  typedef T value_type;
+  ALLOCATOR_METHODS(empty_allocator)
 };

 void test_empty_allocator()
 {
-    typedef empty_allocator<int> allocator;
-    typedef boost::unordered::detail::allocator_traits<allocator> traits;
-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1
-    BOOST_STATIC_ASSERT((boost::is_same<traits::size_type,
-        std::make_unsigned<std::ptrdiff_t>::type>::value));
+  typedef empty_allocator<int> allocator;
+  typedef boost::unordered::detail::allocator_traits<allocator> traits;
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+  BOOST_STATIC_ASSERT((boost::is_same<traits::size_type,
+    std::make_unsigned<std::ptrdiff_t>::type>::value));
 #else
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::size_type, std::size_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::size_type, std::size_t>::value));
 #endif
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::const_pointer, int const*>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
-    BOOST_TEST(!traits::propagate_on_container_copy_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_swap::value);
-    BOOST_TEST(call_select<allocator>() == 0);
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::const_pointer, int const*>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
+  BOOST_TEST(!traits::propagate_on_container_copy_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_swap::value);
+  BOOST_TEST(traits::is_always_equal::value);
+  BOOST_TEST(call_select<allocator>() == 0);
 }

 // allocator 1

 template <typename T> struct allocator1
 {
-    typedef T value_type;
-    ALLOCATOR_METHODS(allocator1)
+  typedef T value_type;
+  ALLOCATOR_METHODS(allocator1)

-    typedef yes_type propagate_on_container_copy_assignment;
-    typedef yes_type propagate_on_container_move_assignment;
-    typedef yes_type propagate_on_container_swap;
+  typedef yes_type propagate_on_container_copy_assignment;
+  typedef yes_type propagate_on_container_move_assignment;
+  typedef yes_type propagate_on_container_swap;
+  typedef yes_type is_always_equal;

-    allocator1<T> select_on_container_copy_construction() const
-    {
-        ++selected;
-        return allocator1<T>();
-    }
+  allocator1<T> select_on_container_copy_construction() const
+  {
+    ++selected;
+    return allocator1<T>();
+  }
 };

 void test_allocator1()
 {
-    typedef allocator1<int> allocator;
-    typedef boost::unordered::detail::allocator_traits<allocator> traits;
-#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1
-    BOOST_STATIC_ASSERT((boost::is_same<traits::size_type,
-        std::make_unsigned<std::ptrdiff_t>::type>::value));
+  typedef allocator1<int> allocator;
+  typedef boost::unordered::detail::allocator_traits<allocator> traits;
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+  BOOST_STATIC_ASSERT((boost::is_same<traits::size_type,
+    std::make_unsigned<std::ptrdiff_t>::type>::value));
 #else
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::size_type, std::size_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::size_type, std::size_t>::value));
 #endif
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::const_pointer, int const*>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
-    BOOST_TEST(traits::propagate_on_container_copy_assignment::value);
-    BOOST_TEST(traits::propagate_on_container_move_assignment::value);
-    BOOST_TEST(traits::propagate_on_container_swap::value);
-    BOOST_TEST(call_select<allocator>() == 1);
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::const_pointer, int const*>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
+  BOOST_TEST(traits::propagate_on_container_copy_assignment::value);
+  BOOST_TEST(traits::propagate_on_container_move_assignment::value);
+  BOOST_TEST(traits::propagate_on_container_swap::value);
+  BOOST_TEST(traits::is_always_equal::value);
+  BOOST_TEST(call_select<allocator>() == 1);
 }

 // allocator 2

 template <typename Alloc> struct allocator2_base
 {
-    Alloc select_on_container_copy_construction() const
-    {
-        ++selected;
-        return Alloc();
-    }
+  Alloc select_on_container_copy_construction() const
+  {
+    ++selected;
+    return Alloc();
+  }
 };

 template <typename T> struct allocator2 : allocator2_base<allocator2<T> >
 {
-    typedef T value_type;
-    typedef T* pointer;
-    typedef T const* const_pointer;
-    typedef std::size_t size_type;
+  typedef T value_type;
+  typedef T* pointer;
+  typedef T const* const_pointer;
+  typedef std::size_t size_type;

-    ALLOCATOR_METHODS(allocator2)
+  ALLOCATOR_METHODS(allocator2)

-    typedef no_type propagate_on_container_copy_assignment;
-    typedef no_type propagate_on_container_move_assignment;
-    typedef no_type propagate_on_container_swap;
+  typedef no_type propagate_on_container_copy_assignment;
+  typedef no_type propagate_on_container_move_assignment;
+  typedef no_type propagate_on_container_swap;
+  typedef no_type is_always_equal;
 };

 void test_allocator2()
 {
-    typedef allocator2<int> allocator;
-    typedef boost::unordered::detail::allocator_traits<allocator> traits;
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::size_type, std::size_t>::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::const_pointer, int const*>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
-    BOOST_TEST(!traits::propagate_on_container_copy_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_swap::value);
-    BOOST_TEST(call_select<allocator>() == 1);
+  typedef allocator2<int> allocator;
+  typedef boost::unordered::detail::allocator_traits<allocator> traits;
+  BOOST_STATIC_ASSERT((boost::is_same<traits::size_type, std::size_t>::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, int*>::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::const_pointer, int const*>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
+  BOOST_TEST(!traits::propagate_on_container_copy_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_swap::value);
+  BOOST_TEST(!traits::is_always_equal::value);
+
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+  // conditionally compile this assertion as all C++03 emulations of expression
+  // SFINAE are broken one way or another and the benefits of using Core's
+  // `allocator_traits` outweigh the costs of breaking this kind of code (i.e.
+  // inheriting SOCCC via a base)
+  //
+  BOOST_TEST(call_select<allocator>() == 1);
+#endif
 }

 // allocator 3

 template <typename T> struct ptr
 {
-    T* value_;
+  T* value_;

-    ptr(void* v) : value_((T*)v) {}
-    T& operator*() const { return *value_; }
+  ptr(void* v) : value_((T*)v) {}
+  T& operator*() const { return *value_; }
 };

 template <> struct ptr<void>
 {
-    void* value_;
-    ptr(void* v) : value_(v) {}
+  void* value_;
+  ptr(void* v) : value_(v) {}
 };

 template <> struct ptr<const void>
 {
-    void const* value_;
-    ptr(void const* v) : value_(v) {}
+  void const* value_;
+  ptr(void const* v) : value_(v) {}
 };

 template <typename T> struct allocator3
 {
-    typedef T value_type;
-    typedef ptr<T> pointer;
-    typedef ptr<T const> const_pointer;
-    typedef unsigned short size_type;
+  typedef T value_type;
+  typedef ptr<T> pointer;
+  typedef ptr<T const> const_pointer;
+  typedef unsigned short size_type;

-    ALLOCATOR_METHODS_TYPEDEFS(allocator3)
+  int x; // Just to make it non-empty, so that is_always_equal is false.

-    typedef yes_type propagate_on_container_copy_assignment;
-    typedef no_type propagate_on_container_move_assignment;
+  ALLOCATOR_METHODS_TYPEDEFS(allocator3)

-    allocator3<T> select_on_container_copy_construction() const
-    {
-        ++selected;
-        return allocator3<T>();
-    }
+  typedef yes_type propagate_on_container_copy_assignment;
+  typedef no_type propagate_on_container_move_assignment;
+
+  allocator3<T> select_on_container_copy_construction() const
+  {
+    ++selected;
+    allocator3<T> a;
+    a.x = 0;
+    return a;
+  }
 };

 void test_allocator3()
 {
-    typedef allocator3<int> allocator;
-    typedef boost::unordered::detail::allocator_traits<allocator> traits;
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::size_type, unsigned short>::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, ptr<int> >::value));
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<traits::const_pointer, ptr<int const> >::value));
-    BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
-    BOOST_TEST(traits::propagate_on_container_copy_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
-    BOOST_TEST(!traits::propagate_on_container_swap::value);
-    BOOST_TEST(call_select<allocator>() == 1);
+  typedef allocator3<int> allocator;
+  typedef boost::unordered::detail::allocator_traits<allocator> traits;
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::size_type, unsigned short>::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::difference_type, std::ptrdiff_t>::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::pointer, ptr<int> >::value));
+  BOOST_STATIC_ASSERT(
+    (boost::is_same<traits::const_pointer, ptr<int const> >::value));
+  BOOST_STATIC_ASSERT((boost::is_same<traits::value_type, int>::value));
+  BOOST_TEST(traits::propagate_on_container_copy_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_move_assignment::value);
+  BOOST_TEST(!traits::propagate_on_container_swap::value);
+  BOOST_TEST(!traits::is_always_equal::value);
+  BOOST_TEST(call_select<allocator>() == 1);
 }

 int main()
 {
-    test_empty_allocator();
-    test_allocator1();
-    test_allocator2();
-    test_allocator3();
-    return boost::report_errors();
+  test_empty_allocator();
+  test_allocator1();
+  test_allocator2();
+  test_allocator3();
+  return boost::report_errors();
 }
@@ -17,261 +17,263 @@
 #include "../helpers/tracker.hpp"
 #include "../helpers/equivalent.hpp"

-#include <iostream>
-
 #if defined(BOOST_MSVC)
 #pragma warning(disable : 4127) // conditional expression is constant
 #endif

+#if defined(__clang__) && defined(__has_warning)
+#if __has_warning("-Wself-assign-overloaded")
+#pragma clang diagnostic ignored "-Wself-assign-overloaded"
+#endif
+#endif
+
 namespace assign_tests {

-test::seed_t initialize_seed(96785);
+  test::seed_t initialize_seed(96785);

-template <class T> void assign_tests1(T*, test::random_generator generator)
-{
-    BOOST_DEDUCED_TYPENAME T::hasher hf;
-    BOOST_DEDUCED_TYPENAME T::key_equal eq;
+  template <class T> void assign_tests1(T*, test::random_generator generator)
+  {
+    typename T::hasher hf;
+    typename T::key_equal eq;

-    std::cerr << "assign_tests1.1\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests1.1\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x;
-        x = x;
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      T x;
+      x = x;
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
    }

-    std::cerr << "assign_tests1.2\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests1.2\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
-        T x(v.begin(), v.end());
+      test::random_values<T> v(1000, generator);
+      T x(v.begin(), v.end());

-        test::ordered<T> tracker = test::create_ordered(x);
-        tracker.insert_range(v.begin(), v.end());
+      test::ordered<T> tracker = test::create_ordered(x);
+      tracker.insert_range(v.begin(), v.end());

-        x = x;
-        tracker.compare(x);
+      x = x;
+      tracker.compare(x);

-        T y;
-        y.max_load_factor(x.max_load_factor() / 20);
-        float mlf = x.max_load_factor();
-        y = x;
-        tracker.compare(x);
-        tracker.compare(y);
-        BOOST_TEST(x.max_load_factor() == mlf);
-        BOOST_TEST(y.max_load_factor() == mlf);
-        BOOST_TEST(y.load_factor() <= y.max_load_factor());
+      T y;
+      y.max_load_factor(x.max_load_factor() / 20);
+      float mlf = x.max_load_factor();
+      y = x;
+      tracker.compare(x);
+      tracker.compare(y);
+      BOOST_TEST(x.max_load_factor() == mlf);
+      BOOST_TEST(y.max_load_factor() == mlf);
+      BOOST_TEST(y.load_factor() <= y.max_load_factor());
    }
-}
+  }

-template <class T> void assign_tests2(T*, test::random_generator generator)
-{
-    BOOST_DEDUCED_TYPENAME T::hasher hf1(1);
-    BOOST_DEDUCED_TYPENAME T::hasher hf2(2);
-    BOOST_DEDUCED_TYPENAME T::key_equal eq1(1);
-    BOOST_DEDUCED_TYPENAME T::key_equal eq2(2);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al1(1);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
+  template <class T> void assign_tests2(T*, test::random_generator generator)
+  {
+    typename T::hasher hf1(1);
+    typename T::hasher hf2(2);
+    typename T::key_equal eq1(1);
+    typename T::key_equal eq2(2);
+    typename T::allocator_type al1(1);
+    typename T::allocator_type al2(2);

-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+    typedef typename T::allocator_type allocator_type;

-    std::cerr << "assign_tests2.0 - empty container\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.0 - empty container\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x1(0, hf1, eq1);
-        T x2(0, hf2, eq2);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x1.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x1.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
-        test::check_container(x1, x2);
+      T x1(0, hf1, eq1);
+      T x2(0, hf2, eq2);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x1.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x1.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
+      test::check_container(x1, x2);
    }

-    std::cerr << "assign_tests2.1\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.1\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
-        T x1(v.begin(), v.end(), 0, hf1, eq1);
-        T x2(0, hf2, eq2);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x1.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x1.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
-        test::check_container(x1, v);
-        test::check_container(x2, v);
-        BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
+      test::random_values<T> v(1000, generator);
+      T x1(v.begin(), v.end(), 0, hf1, eq1);
+      T x2(0, hf2, eq2);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x1.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x1.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
+      test::check_container(x1, v);
+      test::check_container(x2, v);
+      BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
    }

-    std::cerr << "assign_tests2.1a\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.1a\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v1(0, generator);
-        test::random_values<T> v2(1000, generator);
-        T x1(0, hf2, eq2);
-        T x2(v2.begin(), v2.end(), 0, hf1, eq1);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x1.hash_function(), hf2));
-        BOOST_TEST(test::equivalent(x1.key_eq(), eq2));
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf2));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq2));
-        test::check_container(x1, v1);
-        test::check_container(x2, v1);
-        BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
+      test::random_values<T> v1(0, generator);
+      test::random_values<T> v2(1000, generator);
+      T x1(0, hf2, eq2);
+      T x2(v2.begin(), v2.end(), 0, hf1, eq1);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x1.hash_function(), hf2));
+      BOOST_TEST(test::equivalent(x1.key_eq(), eq2));
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf2));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq2));
+      test::check_container(x1, v1);
+      test::check_container(x2, v1);
+      BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
    }

-    std::cerr << "assign_tests2.2\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.2\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v1(100, generator), v2(100, generator);
-        T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
-        T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
-        if (allocator_type::is_propagate_on_assign) {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
-        } else {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
-        }
-        test::check_container(x1, v1);
-        test::check_container(x2, v1);
-        BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
+      test::random_values<T> v1(100, generator), v2(100, generator);
+      T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
+      T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
+      if (allocator_type::is_propagate_on_assign) {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
+      } else {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
+      }
+      test::check_container(x1, v1);
+      test::check_container(x2, v1);
+      BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
    }

-    std::cerr << "assign_tests2.3\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.3\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v1(100, generator), v2(1000, generator);
-        T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
-        T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
-        if (allocator_type::is_propagate_on_assign) {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
-        } else {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
-        }
-        test::check_container(x1, v1);
-        test::check_container(x2, v1);
-        BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
+      test::random_values<T> v1(100, generator), v2(1000, generator);
+      T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
+      T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
+      if (allocator_type::is_propagate_on_assign) {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
+      } else {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
+      }
+      test::check_container(x1, v1);
+      test::check_container(x2, v1);
+      BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
    }

-    std::cerr << "assign_tests2.4\n";
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "assign_tests2.4\n";
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v1(1000, generator), v2(100, generator);
-        T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
-        T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
-        x2 = x1;
-        BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
-        if (allocator_type::is_propagate_on_assign) {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
-        } else {
-            BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
-            BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
-        }
-        test::check_container(x1, v1);
-        test::check_container(x2, v1);
-        BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
+      test::random_values<T> v1(1000, generator), v2(100, generator);
+      T x1(v1.begin(), v1.end(), 0, hf1, eq1, al1);
+      T x2(v2.begin(), v2.end(), 0, hf2, eq2, al2);
+      x2 = x1;
+      BOOST_TEST(test::equivalent(x2.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x2.key_eq(), eq1));
+      if (allocator_type::is_propagate_on_assign) {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al1));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al2));
+      } else {
+        BOOST_TEST(test::equivalent(x2.get_allocator(), al2));
+        BOOST_TEST(!test::equivalent(x2.get_allocator(), al1));
+      }
+      test::check_container(x1, v1);
+      test::check_container(x2, v1);
+      BOOST_TEST(x2.load_factor() <= x2.max_load_factor());
    }
-}
+  }

-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    std::allocator<test::object> >* test_map_std_alloc;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_set;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_multiset;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_map;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::allocator1<test::object> >* test_multimap;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::propagate_assign> >*
    test_set_prop_assign;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::propagate_assign> >*
    test_multiset_prop_assign;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::propagate_assign> >*
    test_map_prop_assign;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to,
    test::cxx11_allocator<test::object, test::propagate_assign> >*
    test_multimap_prop_assign;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_propagate_assign> >*
    test_set_no_prop_assign;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_propagate_assign> >*
    test_multiset_no_prop_assign;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_propagate_assign> >*
    test_map_no_prop_assign;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to,
    test::cxx11_allocator<test::object, test::no_propagate_assign> >*
    test_multimap_no_prop_assign;

-using test::default_generator;
-using test::generate_collisions;
-using test::limited_range;
+  using test::default_generator;
+  using test::generate_collisions;
+  using test::limited_range;

-template <typename T> bool is_propagate(T*)
-{
+  template <typename T> bool is_propagate(T*)
+  {
    return T::allocator_type::is_propagate_on_assign;
-}
+  }

-UNORDERED_AUTO_TEST(check_traits)
-{
+  UNORDERED_AUTO_TEST (check_traits) {
    BOOST_TEST(!is_propagate(test_set));
    BOOST_TEST(is_propagate(test_set_prop_assign));
    BOOST_TEST(!is_propagate(test_set_no_prop_assign));
-}
+  }

-UNORDERED_TEST(assign_tests1,
+  UNORDERED_TEST(assign_tests1,
    ((test_map_std_alloc)(test_set)(test_multiset)(test_map)(test_multimap)(
-        test_set_prop_assign)(test_multiset_prop_assign)(test_map_prop_assign)(
-        test_multimap_prop_assign)(test_set_no_prop_assign)(
-        test_multiset_no_prop_assign)(test_map_no_prop_assign)(
-        test_multimap_no_prop_assign))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      test_set_prop_assign)(test_multiset_prop_assign)(test_map_prop_assign)(
+      test_multimap_prop_assign)(test_set_no_prop_assign)(
+      test_multiset_no_prop_assign)(test_map_no_prop_assign)(
+      test_multimap_no_prop_assign))(
+      (default_generator)(generate_collisions)(limited_range)))

-UNORDERED_TEST(
+  UNORDERED_TEST(
    assign_tests2, ((test_set)(test_multiset)(test_map)(test_multimap)(
-                       test_set_prop_assign)(test_multiset_prop_assign)(
-                       test_map_prop_assign)(test_multimap_prop_assign)(
-                       test_set_no_prop_assign)(test_multiset_no_prop_assign)(
-                       test_map_no_prop_assign)(test_multimap_no_prop_assign))(
-                       (default_generator)(generate_collisions)(limited_range)))
+                     test_set_prop_assign)(test_multiset_prop_assign)(
+                     test_map_prop_assign)(test_multimap_prop_assign)(
+                     test_set_no_prop_assign)(test_multiset_no_prop_assign)(
+                     test_map_no_prop_assign)(test_multimap_no_prop_assign))(
+                     (default_generator)(generate_collisions)(limited_range)))

 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)

-UNORDERED_AUTO_TEST(assign_default_initializer_list)
-{
-    std::cerr << "Initializer List Tests\n";
+  UNORDERED_AUTO_TEST (assign_default_initializer_list) {
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Initializer List Tests\n";
    std::initializer_list<std::pair<int const, int> > init;
    boost::unordered_map<int, int> x1;
    x1[25] = 3;
@@ -279,14 +281,13 @@ UNORDERED_AUTO_TEST(assign_default_initializer_list)
    BOOST_TEST(!x1.empty());
    x1 = init;
    BOOST_TEST(x1.empty());
-}
+  }

 #endif

 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
-UNORDERED_AUTO_TEST(assign_initializer_list)
-{
-    std::cerr << "Initializer List Tests\n";
+  UNORDERED_AUTO_TEST (assign_initializer_list) {
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Initializer List Tests\n";

    boost::unordered_set<int> x;
    x.insert(10);
@@ -294,7 +295,7 @@ UNORDERED_AUTO_TEST(assign_initializer_list)
    x = {1, 2, -10};
    BOOST_TEST(x.find(10) == x.end());
    BOOST_TEST(x.find(-10) != x.end());
-}
+  }

 #endif
 }
@@ -14,11 +14,25 @@

 namespace at_tests {

-UNORDERED_AUTO_TEST(at_tests)
-{
+  UNORDERED_AUTO_TEST (at_tests) {
    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Create Map" << std::endl;

    boost::unordered_map<std::string, int> x;
+    boost::unordered_map<std::string, int> const& x_const(x);
+
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Check empty container" << std::endl;
+
+    try {
+      x.at("one");
+      BOOST_ERROR("Should have thrown.");
+    } catch (std::out_of_range&) {
+    }
+
+    try {
+      x_const.at("one");
+      BOOST_ERROR("Should have thrown.");
+    } catch (std::out_of_range&) {
+    }

    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Add elements" << std::endl;

@@ -29,17 +43,25 @@ UNORDERED_AUTO_TEST(at_tests)

    BOOST_TEST(x.at("one") == 1);
    BOOST_TEST(x.at("two") == 2);
+    BOOST_TEST(x_const.at("one") == 1);
+    BOOST_TEST(x_const.at("two") == 2);

    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Check missing element" << std::endl;

    try {
-        x.at("three");
-        BOOST_ERROR("Should have thrown.");
-    } catch (std::out_of_range) {
+      x.at("three");
+      BOOST_ERROR("Should have thrown.");
+    } catch (std::out_of_range&) {
+    }
+
+    try {
+      x_const.at("three");
+      BOOST_ERROR("Should have thrown.");
+    } catch (std::out_of_range&) {
    }

    BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Finished" << std::endl;
-}
+  }
 }

 RUN_TESTS()
@@ -23,73 +23,72 @@

 namespace bucket_tests {

-test::seed_t initialize_seed(54635);
+  test::seed_t initialize_seed(54635);

-template <class X> void tests(X*, test::random_generator generator)
-{
+  template <class X> void tests(X*, test::random_generator generator)
+  {
    test::check_instances check_;

-    typedef BOOST_DEDUCED_TYPENAME X::size_type size_type;
-    typedef BOOST_DEDUCED_TYPENAME X::const_local_iterator const_local_iterator;
+    typedef typename X::size_type size_type;
+    typedef typename X::const_local_iterator const_local_iterator;
    test::random_values<X> v(1000, generator);

    X x(v.begin(), v.end());

    BOOST_TEST(x.bucket_count() <= x.max_bucket_count());
    if (!(x.bucket_count() <= x.max_bucket_count())) {
-        std::cerr << x.bucket_count() << "<=" << x.max_bucket_count() << "\n";
+      BOOST_LIGHTWEIGHT_TEST_OSTREAM << x.bucket_count()
+                                     << "<=" << x.max_bucket_count() << "\n";
    }

-    for (BOOST_DEDUCED_TYPENAME test::random_values<X>::const_iterator
-             it = v.begin(),
-             end = v.end();
+    for (typename test::random_values<X>::const_iterator it = v.begin(),
+                                                         end = v.end();
         it != end; ++it) {
-        size_type bucket = x.bucket(test::get_key<X>(*it));
+      size_type bucket = x.bucket(test::get_key<X>(*it));

-        BOOST_TEST(bucket < x.bucket_count());
-        if (bucket < x.bucket_count()) {
-            // lit? lend?? I need a new naming scheme.
-            const_local_iterator lit = x.begin(bucket), lend = x.end(bucket);
-            while (lit != lend &&
-                   test::get_key<X>(*it) != test::get_key<X>(*lit)) {
-                ++lit;
-            }
-            BOOST_TEST(lit != lend);
+      BOOST_TEST(bucket < x.bucket_count());
+      if (bucket < x.bucket_count()) {
+        // lit? lend?? I need a new naming scheme.
+        const_local_iterator lit = x.begin(bucket), lend = x.end(bucket);
+        while (lit != lend && test::get_key<X>(*it) != test::get_key<X>(*lit)) {
+          ++lit;
        }
+        BOOST_TEST(lit != lend);
+      }
    }

    for (size_type i = 0; i < x.bucket_count(); ++i) {
-        BOOST_TEST(x.bucket_size(i) ==
-                   static_cast<size_type>(std::distance(x.begin(i), x.end(i))));
-        BOOST_TEST(x.bucket_size(i) == static_cast<size_type>(std::distance(
-                                           x.cbegin(i), x.cend(i))));
-        X const& x_ref = x;
-        BOOST_TEST(x.bucket_size(i) == static_cast<size_type>(std::distance(
-                                           x_ref.begin(i), x_ref.end(i))));
-        BOOST_TEST(x.bucket_size(i) == static_cast<size_type>(std::distance(
-                                           x_ref.cbegin(i), x_ref.cend(i))));
+      BOOST_TEST(x.bucket_size(i) ==
+                 static_cast<size_type>(std::distance(x.begin(i), x.end(i))));
+      BOOST_TEST(x.bucket_size(i) ==
+                 static_cast<size_type>(std::distance(x.cbegin(i), x.cend(i))));
+      X const& x_ref = x;
+      BOOST_TEST(x.bucket_size(i) == static_cast<size_type>(std::distance(
+                                       x_ref.begin(i), x_ref.end(i))));
+      BOOST_TEST(x.bucket_size(i) == static_cast<size_type>(std::distance(
+                                       x_ref.cbegin(i), x_ref.cend(i))));
    }
-}
+  }

-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, std::allocator<test::object> >* test_multimap_std_alloc;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_set;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_multiset;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_map;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::allocator2<test::object> >* test_multimap;

-using test::default_generator;
-using test::generate_collisions;
-using test::limited_range;
+  using test::default_generator;
+  using test::generate_collisions;
+  using test::limited_range;

-UNORDERED_TEST(tests, ((test_multimap_std_alloc)(test_set)(test_multiset)(
-                          test_map)(test_multimap))((default_generator)(
-                          generate_collisions)(limited_range)))
+  UNORDERED_TEST(tests,
+    ((test_multimap_std_alloc)(test_set)(test_multiset)(test_map)(
+      test_multimap))((default_generator)(generate_collisions)(limited_range)))
 }

 RUN_TESTS()
@@ -12,7 +12,6 @@
 #include "../helpers/postfix.hpp"
 // clang-format on

-#include <iostream>
 #include "../helpers/test.hpp"
 #include "../objects/minimal.hpp"
 #include "./compile_tests.hpp"
@@ -20,211 +19,230 @@
 // Explicit instantiation to catch compile-time errors

 #define INSTANTIATE(type)                                                      \
-    template class boost::unordered::detail::instantiate_##type
+  template class boost::unordered::detail::instantiate_##type

 INSTANTIATE(map)<int, int, boost::hash<int>, std::equal_to<int>,
-    test::minimal::allocator<int> >;
+  test::minimal::allocator<int> >;
 INSTANTIATE(multimap)<int const, int const, boost::hash<int>,
-    std::equal_to<int>, test::minimal::allocator<int> >;
+  std::equal_to<int>, test::minimal::allocator<int> >;

-INSTANTIATE(map)<test::minimal::assignable const,
-    test::minimal::default_assignable const,
-    test::minimal::hash<test::minimal::assignable>,
-    test::minimal::equal_to<test::minimal::assignable>,
-    test::minimal::allocator<int> >;
+INSTANTIATE(
+  map)<test::minimal::assignable const, test::minimal::default_assignable const,
+  test::minimal::hash<test::minimal::assignable>,
+  test::minimal::equal_to<test::minimal::assignable>,
+  test::minimal::allocator<int> >;
 INSTANTIATE(multimap)<test::minimal::assignable, test::minimal::assignable,
+  test::minimal::hash<test::minimal::assignable>,
+  test::minimal::equal_to<test::minimal::assignable>,
+  test::minimal::allocator<int> >;
+
+UNORDERED_AUTO_TEST (test0) {
+  test::minimal::constructor_param x;
+
+  typedef std::pair<test::minimal::assignable const, test::minimal::assignable>
+    value_type;
+  value_type value(x, x);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_map.\n";
+
+  boost::unordered_map<int, int> int_map;
+
+  boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    int_map2;
+
+  boost::unordered_map<test::minimal::assignable, test::minimal::assignable,
    test::minimal::hash<test::minimal::assignable>,
    test::minimal::equal_to<test::minimal::assignable>,
-    test::minimal::allocator<int> >;
+    test::minimal::allocator<value_type> >
+    map;

-UNORDERED_AUTO_TEST(test0)
-{
-    test::minimal::constructor_param x;
+  container_test(int_map, std::pair<int const, int>(0, 0));
+  container_test(int_map2, std::pair<int const, int>(0, 0));
+  container_test(map, value);

-    typedef std::pair<test::minimal::assignable const,
-        test::minimal::assignable>
-        value_type;
-    value_type value(x, x);
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multimap.\n";

-    std::cout << "Test unordered_map.\n";
+  boost::unordered_multimap<int, int> int_multimap;

-    boost::unordered_map<int, int> int_map;
+  boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    int_multimap2;

-    boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        int_map2;
+  boost::unordered_multimap<test::minimal::assignable,
+    test::minimal::assignable, test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<value_type> >
+    multimap;

-    boost::unordered_map<test::minimal::assignable, test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<value_type> >
-        map;
-
-    container_test(int_map, std::pair<int const, int>(0, 0));
-    container_test(int_map2, std::pair<int const, int>(0, 0));
-    container_test(map, value);
-
-    std::cout << "Test unordered_multimap.\n";
-
-    boost::unordered_multimap<int, int> int_multimap;
-
-    boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        int_multimap2;
-
-    boost::unordered_multimap<test::minimal::assignable,
-        test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<value_type> >
-        multimap;
-
-    container_test(int_multimap, std::pair<int const, int>(0, 0));
-    container_test(int_multimap2, std::pair<int const, int>(0, 0));
-    container_test(multimap, value);
+  container_test(int_multimap, std::pair<int const, int>(0, 0));
+  container_test(int_multimap2, std::pair<int const, int>(0, 0));
+  container_test(multimap, value);
 }

-UNORDERED_AUTO_TEST(equality_tests)
-{
-    typedef std::pair<
-        test::minimal::copy_constructible_equality_comparable const,
-        test::minimal::copy_constructible_equality_comparable>
-        value_type;
+UNORDERED_AUTO_TEST (equality_tests) {
+  typedef std::pair<test::minimal::copy_constructible_equality_comparable const,
+    test::minimal::copy_constructible_equality_comparable>
+    value_type;

-    boost::unordered_map<int, int> int_map;
+  boost::unordered_map<int, int> int_map;

-    boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        int_map2;
+  boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    int_map2;

-    boost::unordered_map<
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::hash<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::equal_to<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::allocator<value_type> >
-        map;
+  boost::unordered_map<test::minimal::copy_constructible_equality_comparable,
+    test::minimal::copy_constructible_equality_comparable,
+    test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::equal_to<
+      test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::allocator<value_type> >
+    map;

-    equality_test(int_map);
-    equality_test(int_map2);
-    equality_test(map);
+  equality_test(int_map);
+  equality_test(int_map2);
+  equality_test(map);

-    boost::unordered_multimap<int, int> int_multimap;
+  boost::unordered_multimap<int, int> int_multimap;

-    boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        int_multimap2;
+  boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    int_multimap2;

-    boost::unordered_multimap<
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::hash<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::equal_to<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::allocator<value_type> >
-        multimap;
+  boost::unordered_multimap<
+    test::minimal::copy_constructible_equality_comparable,
+    test::minimal::copy_constructible_equality_comparable,
+    test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::equal_to<
+      test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::allocator<value_type> >
+    multimap;

-    equality_test(int_multimap);
-    equality_test(int_multimap2);
-    equality_test(multimap);
+  equality_test(int_multimap);
+  equality_test(int_multimap2);
+  equality_test(multimap);
 }

-UNORDERED_AUTO_TEST(test1)
-{
-    boost::hash<int> hash;
-    std::equal_to<int> equal_to;
-    int value = 0;
-    std::pair<int const, int> map_value(0, 0);
+UNORDERED_AUTO_TEST (test1) {
+  boost::hash<int> hash;
+  std::equal_to<int> equal_to;
+  int value = 0;
+  std::pair<int const, int> map_value(0, 0);

-    std::cout << "Test unordered_map.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_map.\n";

-    boost::unordered_map<int, int> map;
+  boost::unordered_map<int, int> map;

-    boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        map2;
+  boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    map2;

-    unordered_unique_test(map, map_value);
-    unordered_map_test(map, value, value);
-    unordered_copyable_test(map, value, map_value, hash, equal_to);
-    unordered_map_functions(map, value, value);
+  unordered_unique_test(map, map_value);
+  unordered_map_test(map, value, value);
+  unordered_copyable_test(map, value, map_value, hash, equal_to);
+  unordered_map_functions(map, value, value);

-    unordered_unique_test(map2, map_value);
-    unordered_map_test(map2, value, value);
-    unordered_copyable_test(map2, value, map_value, hash, equal_to);
-    unordered_map_functions(map2, value, value);
+  unordered_unique_test(map2, map_value);
+  unordered_map_test(map2, value, value);
+  unordered_copyable_test(map2, value, map_value, hash, equal_to);
+  unordered_map_functions(map2, value, value);

-    std::cout << "Test unordered_multimap.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multimap.\n";

-    boost::unordered_multimap<int, int> multimap;
+  boost::unordered_multimap<int, int> multimap;

-    boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<std::pair<int const, int> > >
-        multimap2;
+  boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<std::pair<int const, int> > >
+    multimap2;

-    unordered_equivalent_test(multimap, map_value);
-    unordered_map_test(multimap, value, value);
-    unordered_copyable_test(multimap, value, map_value, hash, equal_to);
+  unordered_equivalent_test(multimap, map_value);
+  unordered_map_test(multimap, value, value);
+  unordered_copyable_test(multimap, value, map_value, hash, equal_to);

-    unordered_equivalent_test(multimap2, map_value);
-    unordered_map_test(multimap2, value, value);
-    unordered_copyable_test(multimap2, value, map_value, hash, equal_to);
+  unordered_equivalent_test(multimap2, map_value);
+  unordered_map_test(multimap2, value, value);
+  unordered_copyable_test(multimap2, value, map_value, hash, equal_to);
 }

-UNORDERED_AUTO_TEST(test2)
+UNORDERED_AUTO_TEST (test2) {
+  test::minimal::constructor_param x;
+
+  test::minimal::assignable assignable(x);
+  test::minimal::copy_constructible copy_constructible(x);
+  test::minimal::hash<test::minimal::assignable> hash(x);
+  test::minimal::equal_to<test::minimal::assignable> equal_to(x);
+
+  typedef std::pair<test::minimal::assignable const, test::minimal::assignable>
+    map_value_type;
+  map_value_type map_value(assignable, assignable);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_map.\n";
+
+  boost::unordered_map<test::minimal::assignable, test::minimal::assignable,
+    test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<map_value_type> >
+    map;
+
+  unordered_unique_test(map, map_value);
+  unordered_map_test(map, assignable, assignable);
+  unordered_copyable_test(map, assignable, map_value, hash, equal_to);
+  unordered_map_member_test(map, map_value);
+
+  boost::unordered_map<test::minimal::assignable,
+    test::minimal::default_assignable,
+    test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<map_value_type> >
+    map2;
+
+  test::minimal::default_assignable default_assignable;
+
+  unordered_map_functions(map2, assignable, default_assignable);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multimap.\n";
+
+  boost::unordered_multimap<test::minimal::assignable,
+    test::minimal::assignable, test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<map_value_type> >
+    multimap;
+
+  unordered_equivalent_test(multimap, map_value);
+  unordered_map_test(multimap, assignable, assignable);
+  unordered_copyable_test(multimap, assignable, map_value, hash, equal_to);
+  unordered_map_member_test(multimap, map_value);
+}
+
+// Test for ambiguity when using key convertible from iterator
+// See LWG2059
+
+struct lwg2059_key
 {
-    test::minimal::constructor_param x;
+  int value;

-    test::minimal::assignable assignable(x);
-    test::minimal::copy_constructible copy_constructible(x);
-    test::minimal::hash<test::minimal::assignable> hash(x);
-    test::minimal::equal_to<test::minimal::assignable> equal_to(x);
+  template <typename T> lwg2059_key(T v) : value(v) {}
+};

-    typedef std::pair<test::minimal::assignable const,
-        test::minimal::assignable>
-        map_value_type;
-    map_value_type map_value(assignable, assignable);
+std::size_t hash_value(lwg2059_key x)
+{
+  return static_cast<std::size_t>(x.value);
+}

-    std::cout << "Test unordered_map.\n";
+bool operator==(lwg2059_key x, lwg2059_key y) { return x.value == y.value; }

-    boost::unordered_map<test::minimal::assignable, test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<map_value_type> >
-        map;
+UNORDERED_AUTO_TEST (lwg2059) {
+  {
+    boost::unordered_map<lwg2059_key, int> x;
+    x.emplace(lwg2059_key(10), 5);
+    x.erase(x.begin());
+  }

-    unordered_unique_test(map, map_value);
-    unordered_map_test(map, assignable, assignable);
-    unordered_copyable_test(map, assignable, map_value, hash, equal_to);
-    unordered_map_member_test(map, map_value);
-
-    boost::unordered_map<test::minimal::assignable,
-        test::minimal::default_assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<map_value_type> >
-        map2;
-
-    test::minimal::default_assignable default_assignable;
-
-    unordered_map_functions(map2, assignable, default_assignable);
-
-    std::cout << "Test unordered_multimap.\n";
-
-    boost::unordered_multimap<test::minimal::assignable,
-        test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<map_value_type> >
-        multimap;
-
-    unordered_equivalent_test(multimap, map_value);
-    unordered_map_test(multimap, assignable, assignable);
-    unordered_copyable_test(multimap, assignable, map_value, hash, equal_to);
-    unordered_map_member_test(multimap, map_value);
+  {
+    boost::unordered_multimap<lwg2059_key, int> x;
+    x.emplace(lwg2059_key(10), 5);
+    x.erase(x.begin());
+  }
 }

 RUN_TESTS()
@@ -12,7 +12,6 @@
 #include "../helpers/postfix.hpp"
 // clang-format on

-#include <iostream>
 #include "../helpers/test.hpp"
 #include "../objects/minimal.hpp"
 #include "./compile_tests.hpp"
@@ -20,274 +19,295 @@
 // Explicit instantiation to catch compile-time errors

 #define INSTANTIATE(type)                                                      \
-    template class boost::unordered::detail::instantiate_##type
+  template class boost::unordered::detail::instantiate_##type

 INSTANTIATE(set)<int, boost::hash<int>, std::equal_to<int>,
-    test::minimal::allocator<int> >;
+  test::minimal::allocator<int> >;
 INSTANTIATE(multiset)<int const, boost::hash<int>, std::equal_to<int>,
-    test::minimal::allocator<int> >;
+  test::minimal::allocator<int> >;

 INSTANTIATE(set)<test::minimal::assignable const,
-    test::minimal::hash<test::minimal::assignable>,
-    test::minimal::equal_to<test::minimal::assignable>,
-    test::minimal::allocator<int> >;
+  test::minimal::hash<test::minimal::assignable>,
+  test::minimal::equal_to<test::minimal::assignable>,
+  test::minimal::allocator<int> >;
 INSTANTIATE(multiset)<test::minimal::assignable,
+  test::minimal::hash<test::minimal::assignable>,
+  test::minimal::equal_to<test::minimal::assignable>,
+  test::minimal::allocator<int> >;
+
+UNORDERED_AUTO_TEST (test0) {
+  test::minimal::constructor_param x;
+
+  test::minimal::assignable assignable(x);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set.\n";
+
+  boost::unordered_set<int> int_set;
+
+  boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    int_set2;
+
+  boost::unordered_set<test::minimal::assignable,
    test::minimal::hash<test::minimal::assignable>,
    test::minimal::equal_to<test::minimal::assignable>,
-    test::minimal::allocator<int> >;
+    test::minimal::allocator<test::minimal::assignable> >
+    set;

-UNORDERED_AUTO_TEST(test0)
-{
-    test::minimal::constructor_param x;
+  container_test(int_set, 0);
+  container_test(int_set2, 0);
+  container_test(set, assignable);

-    test::minimal::assignable assignable(x);
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset.\n";

-    std::cout << "Test unordered_set.\n";
+  boost::unordered_multiset<int> int_multiset;

-    boost::unordered_set<int> int_set;
+  boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    int_multiset2;

-    boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        int_set2;
+  boost::unordered_multiset<test::minimal::assignable,
+    test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<test::minimal::assignable> >
+    multiset;

-    boost::unordered_set<test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<test::minimal::assignable> >
-        set;
-
-    container_test(int_set, 0);
-    container_test(int_set2, 0);
-    container_test(set, assignable);
-
-    std::cout << "Test unordered_multiset.\n";
-
-    boost::unordered_multiset<int> int_multiset;
-
-    boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        int_multiset2;
-
-    boost::unordered_multiset<test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<test::minimal::assignable> >
-        multiset;
-
-    container_test(int_multiset, 0);
-    container_test(int_multiset2, 0);
-    container_test(multiset, assignable);
+  container_test(int_multiset, 0);
+  container_test(int_multiset2, 0);
+  container_test(multiset, assignable);
 }

-UNORDERED_AUTO_TEST(equality_tests)
-{
-    typedef test::minimal::copy_constructible_equality_comparable value_type;
+UNORDERED_AUTO_TEST (equality_tests) {
+  typedef test::minimal::copy_constructible_equality_comparable value_type;

-    boost::unordered_set<int> int_set;
+  boost::unordered_set<int> int_set;

-    boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        int_set2;
+  boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    int_set2;

-    boost::unordered_set<
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::hash<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::equal_to<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::allocator<value_type> >
-        set;
+  boost::unordered_set<test::minimal::copy_constructible_equality_comparable,
+    test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::equal_to<
+      test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::allocator<value_type> >
+    set;

-    equality_test(int_set);
-    equality_test(int_set2);
-    equality_test(set);
+  equality_test(int_set);
+  equality_test(int_set2);
+  equality_test(set);

-    boost::unordered_multiset<int> int_multiset;
+  boost::unordered_multiset<int> int_multiset;

-    boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        int_multiset2;
+  boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    int_multiset2;

-    boost::unordered_multiset<
-        test::minimal::copy_constructible_equality_comparable,
-        test::minimal::hash<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::equal_to<
-            test::minimal::copy_constructible_equality_comparable>,
-        test::minimal::allocator<value_type> >
-        multiset;
+  boost::unordered_multiset<
+    test::minimal::copy_constructible_equality_comparable,
+    test::minimal::hash<test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::equal_to<
+      test::minimal::copy_constructible_equality_comparable>,
+    test::minimal::allocator<value_type> >
+    multiset;

-    equality_test(int_multiset);
-    equality_test(int_multiset2);
-    equality_test(multiset);
+  equality_test(int_multiset);
+  equality_test(int_multiset2);
+  equality_test(multiset);
 }

-UNORDERED_AUTO_TEST(test1)
-{
-    boost::hash<int> hash;
-    std::equal_to<int> equal_to;
-    int value = 0;
+UNORDERED_AUTO_TEST (test1) {
+  boost::hash<int> hash;
+  std::equal_to<int> equal_to;
+  int value = 0;

-    std::cout << "Test unordered_set." << std::endl;
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set." << std::endl;

-    boost::unordered_set<int> set;
+  boost::unordered_set<int> set;

-    boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        set2;
+  boost::unordered_set<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    set2;

-    unordered_unique_test(set, value);
-    unordered_set_test(set, value);
-    unordered_copyable_test(set, value, value, hash, equal_to);
+  unordered_unique_test(set, value);
+  unordered_set_test(set, value);
+  unordered_copyable_test(set, value, value, hash, equal_to);

-    unordered_unique_test(set2, value);
-    unordered_set_test(set2, value);
-    unordered_copyable_test(set2, value, value, hash, equal_to);
+  unordered_unique_test(set2, value);
+  unordered_set_test(set2, value);
+  unordered_copyable_test(set2, value, value, hash, equal_to);

-    std::cout << "Test unordered_multiset." << std::endl;
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset." << std::endl;

-    boost::unordered_multiset<int> multiset;
+  boost::unordered_multiset<int> multiset;

-    boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
-        test::minimal::cxx11_allocator<int> >
-        multiset2;
+  boost::unordered_multiset<int, boost::hash<int>, std::equal_to<int>,
+    test::minimal::cxx11_allocator<int> >
+    multiset2;

-    unordered_equivalent_test(multiset, value);
-    unordered_set_test(multiset, value);
-    unordered_copyable_test(multiset, value, value, hash, equal_to);
+  unordered_equivalent_test(multiset, value);
+  unordered_set_test(multiset, value);
+  unordered_copyable_test(multiset, value, value, hash, equal_to);

-    unordered_equivalent_test(multiset2, value);
-    unordered_set_test(multiset2, value);
-    unordered_copyable_test(multiset2, value, value, hash, equal_to);
+  unordered_equivalent_test(multiset2, value);
+  unordered_set_test(multiset2, value);
+  unordered_copyable_test(multiset2, value, value, hash, equal_to);
 }

-UNORDERED_AUTO_TEST(test2)
-{
-    test::minimal::constructor_param x;
+UNORDERED_AUTO_TEST (test2) {
+  test::minimal::constructor_param x;

-    test::minimal::assignable assignable(x);
-    test::minimal::copy_constructible copy_constructible(x);
-    test::minimal::hash<test::minimal::assignable> hash(x);
-    test::minimal::equal_to<test::minimal::assignable> equal_to(x);
+  test::minimal::assignable assignable(x);
+  test::minimal::copy_constructible copy_constructible(x);
+  test::minimal::hash<test::minimal::assignable> hash(x);
+  test::minimal::equal_to<test::minimal::assignable> equal_to(x);

-    std::cout << "Test unordered_set.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set.\n";

-    boost::unordered_set<test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<test::minimal::assignable> >
-        set;
+  boost::unordered_set<test::minimal::assignable,
+    test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<test::minimal::assignable> >
+    set;

-    unordered_unique_test(set, assignable);
-    unordered_set_test(set, assignable);
-    unordered_copyable_test(set, assignable, assignable, hash, equal_to);
-    unordered_set_member_test(set, assignable);
+  unordered_unique_test(set, assignable);
+  unordered_set_test(set, assignable);
+  unordered_copyable_test(set, assignable, assignable, hash, equal_to);
+  unordered_set_member_test(set, assignable);

-    std::cout << "Test unordered_multiset.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset.\n";

-    boost::unordered_multiset<test::minimal::assignable,
-        test::minimal::hash<test::minimal::assignable>,
-        test::minimal::equal_to<test::minimal::assignable>,
-        test::minimal::allocator<test::minimal::assignable> >
-        multiset;
+  boost::unordered_multiset<test::minimal::assignable,
+    test::minimal::hash<test::minimal::assignable>,
+    test::minimal::equal_to<test::minimal::assignable>,
+    test::minimal::allocator<test::minimal::assignable> >
+    multiset;

-    unordered_equivalent_test(multiset, assignable);
-    unordered_set_test(multiset, assignable);
-    unordered_copyable_test(multiset, assignable, assignable, hash, equal_to);
-    unordered_set_member_test(multiset, assignable);
+  unordered_equivalent_test(multiset, assignable);
+  unordered_set_test(multiset, assignable);
+  unordered_copyable_test(multiset, assignable, assignable, hash, equal_to);
+  unordered_set_member_test(multiset, assignable);
 }

-UNORDERED_AUTO_TEST(movable1_tests)
-{
-    test::minimal::constructor_param x;
+UNORDERED_AUTO_TEST (movable1_tests) {
+  test::minimal::constructor_param x;

-    test::minimal::movable1 movable1(x);
-    test::minimal::hash<test::minimal::movable1> hash(x);
-    test::minimal::equal_to<test::minimal::movable1> equal_to(x);
+  test::minimal::movable1 movable1(x);
+  test::minimal::hash<test::minimal::movable1> hash(x);
+  test::minimal::equal_to<test::minimal::movable1> equal_to(x);

-    std::cout << "Test unordered_set.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set.\n";

-    boost::unordered_set<test::minimal::movable1,
-        test::minimal::hash<test::minimal::movable1>,
-        test::minimal::equal_to<test::minimal::movable1>,
-        test::minimal::allocator<test::minimal::movable1> >
-        set;
+  boost::unordered_set<test::minimal::movable1,
+    test::minimal::hash<test::minimal::movable1>,
+    test::minimal::equal_to<test::minimal::movable1>,
+    test::minimal::allocator<test::minimal::movable1> >
+    set;

-    // unordered_unique_test(set, movable1);
-    unordered_set_test(set, movable1);
-    unordered_movable_test(set, movable1, movable1, hash, equal_to);
+  // unordered_unique_test(set, movable1);
+  unordered_set_test(set, movable1);
+  unordered_movable_test(set, movable1, movable1, hash, equal_to);

-    std::cout << "Test unordered_multiset.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset.\n";

-    boost::unordered_multiset<test::minimal::movable1,
-        test::minimal::hash<test::minimal::movable1>,
-        test::minimal::equal_to<test::minimal::movable1>,
-        test::minimal::allocator<test::minimal::movable1> >
-        multiset;
+  boost::unordered_multiset<test::minimal::movable1,
+    test::minimal::hash<test::minimal::movable1>,
+    test::minimal::equal_to<test::minimal::movable1>,
+    test::minimal::allocator<test::minimal::movable1> >
+    multiset;

-    // unordered_equivalent_test(multiset, movable1);
-    unordered_set_test(multiset, movable1);
-    unordered_movable_test(multiset, movable1, movable1, hash, equal_to);
+  // unordered_equivalent_test(multiset, movable1);
+  unordered_set_test(multiset, movable1);
+  unordered_movable_test(multiset, movable1, movable1, hash, equal_to);
 }

-UNORDERED_AUTO_TEST(movable2_tests)
-{
-    test::minimal::constructor_param x;
+UNORDERED_AUTO_TEST (movable2_tests) {
+  test::minimal::constructor_param x;

-    test::minimal::movable2 movable2(x);
-    test::minimal::hash<test::minimal::movable2> hash(x);
-    test::minimal::equal_to<test::minimal::movable2> equal_to(x);
+  test::minimal::movable2 movable2(x);
+  test::minimal::hash<test::minimal::movable2> hash(x);
+  test::minimal::equal_to<test::minimal::movable2> equal_to(x);

-    std::cout << "Test unordered_set.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set.\n";

-    boost::unordered_set<test::minimal::movable2,
-        test::minimal::hash<test::minimal::movable2>,
-        test::minimal::equal_to<test::minimal::movable2>,
-        test::minimal::allocator<test::minimal::movable2> >
-        set;
+  boost::unordered_set<test::minimal::movable2,
+    test::minimal::hash<test::minimal::movable2>,
+    test::minimal::equal_to<test::minimal::movable2>,
+    test::minimal::allocator<test::minimal::movable2> >
+    set;

-    // unordered_unique_test(set, movable2);
-    unordered_set_test(set, movable2);
-    unordered_movable_test(set, movable2, movable2, hash, equal_to);
+  // unordered_unique_test(set, movable2);
+  unordered_set_test(set, movable2);
+  unordered_movable_test(set, movable2, movable2, hash, equal_to);

-    std::cout << "Test unordered_multiset.\n";
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset.\n";

-    boost::unordered_multiset<test::minimal::movable2,
-        test::minimal::hash<test::minimal::movable2>,
-        test::minimal::equal_to<test::minimal::movable2>,
-        test::minimal::allocator<test::minimal::movable2> >
-        multiset;
+  boost::unordered_multiset<test::minimal::movable2,
+    test::minimal::hash<test::minimal::movable2>,
+    test::minimal::equal_to<test::minimal::movable2>,
+    test::minimal::allocator<test::minimal::movable2> >
+    multiset;

-    // unordered_equivalent_test(multiset, movable2);
-    unordered_set_test(multiset, movable2);
-    unordered_movable_test(multiset, movable2, movable2, hash, equal_to);
+  // unordered_equivalent_test(multiset, movable2);
+  unordered_set_test(multiset, movable2);
+  unordered_movable_test(multiset, movable2, movable2, hash, equal_to);
 }

-UNORDERED_AUTO_TEST(destructible_tests)
+UNORDERED_AUTO_TEST (destructible_tests) {
+  test::minimal::constructor_param x;
+
+  test::minimal::destructible destructible(x);
+  test::minimal::hash<test::minimal::destructible> hash(x);
+  test::minimal::equal_to<test::minimal::destructible> equal_to(x);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_set.\n";
+
+  boost::unordered_set<test::minimal::destructible,
+    test::minimal::hash<test::minimal::destructible>,
+    test::minimal::equal_to<test::minimal::destructible> >
+    set;
+
+  unordered_destructible_test(set);
+
+  BOOST_LIGHTWEIGHT_TEST_OSTREAM << "Test unordered_multiset.\n";
+
+  boost::unordered_multiset<test::minimal::destructible,
+    test::minimal::hash<test::minimal::destructible>,
+    test::minimal::equal_to<test::minimal::destructible> >
+    multiset;
+
+  unordered_destructible_test(multiset);
+}
+
+// Test for ambiguity when using key convertible from iterator
+// See LWG2059
+
+struct lwg2059_key
 {
-    test::minimal::constructor_param x;
+  int value;

-    test::minimal::destructible destructible(x);
-    test::minimal::hash<test::minimal::destructible> hash(x);
-    test::minimal::equal_to<test::minimal::destructible> equal_to(x);
+  template <typename T> lwg2059_key(T v) : value(v) {}
+};

-    std::cout << "Test unordered_set.\n";
+std::size_t hash_value(lwg2059_key x)
+{
+  return static_cast<std::size_t>(x.value);
+}

-    boost::unordered_set<test::minimal::destructible,
-        test::minimal::hash<test::minimal::destructible>,
-        test::minimal::equal_to<test::minimal::destructible> >
-        set;
+bool operator==(lwg2059_key x, lwg2059_key y) { return x.value == y.value; }

-    unordered_destructible_test(set);
+UNORDERED_AUTO_TEST (lwg2059) {
+  {
+    boost::unordered_set<lwg2059_key> x;
+    x.emplace(lwg2059_key(10));
+    x.erase(x.begin());
+  }

-    std::cout << "Test unordered_multiset.\n";
-
-    boost::unordered_multiset<test::minimal::destructible,
-        test::minimal::hash<test::minimal::destructible>,
-        test::minimal::equal_to<test::minimal::destructible> >
-        multiset;
-
-    unordered_destructible_test(multiset);
+  {
+    boost::unordered_multiset<lwg2059_key> x;
+    x.emplace(lwg2059_key(10));
+    x.erase(x.begin());
+  }
 }

 RUN_TESTS()
@@ -20,434 +20,427 @@

 namespace constructor_tests {

-test::seed_t initialize_seed(356730);
+  test::seed_t initialize_seed(356730);

-template <class T> void constructor_tests1(T*, test::random_generator generator)
-{
-    BOOST_DEDUCED_TYPENAME T::hasher hf;
-    BOOST_DEDUCED_TYPENAME T::key_equal eq;
-    BOOST_DEDUCED_TYPENAME T::allocator_type al;
+  template <class T>
+  void constructor_tests1(T*, test::random_generator generator)
+  {
+    typename T::hasher hf;
+    typename T::key_equal eq;
+    typename T::allocator_type al;

-    std::cerr << "Construct 1\n";
+    UNORDERED_SUB_TEST("Construct 1")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(0, hf, eq);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x(0, hf, eq);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 2\n";
+    UNORDERED_SUB_TEST("Construct 2")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(100, hf);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 100);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x(100, hf);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 100);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 3\n";
+    UNORDERED_SUB_TEST("Construct 3")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(2000);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 2000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x(2000);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 2000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 4\n";
+    UNORDERED_SUB_TEST("Construct 4")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x;
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x;
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 5\n";
+    UNORDERED_SUB_TEST("Construct 5")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
-        T x(v.begin(), v.end(), 10000, hf, eq);
-        BOOST_TEST(x.bucket_count() >= 10000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(1000, generator);
+      T x(v.begin(), v.end(), 10000, hf, eq);
+      BOOST_TEST(x.bucket_count() >= 10000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 6\n";
+    UNORDERED_SUB_TEST("Construct 6")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(10, generator);
-        T x(v.begin(), v.end(), 10000, hf);
-        BOOST_TEST(x.bucket_count() >= 10000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(10, generator);
+      T x(v.begin(), v.end(), 10000, hf);
+      BOOST_TEST(x.bucket_count() >= 10000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 7\n";
+    UNORDERED_SUB_TEST("Construct 7")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(100, generator);
-        T x(v.begin(), v.end(), 100);
-        BOOST_TEST(x.bucket_count() >= 100);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(100, generator);
+      T x(v.begin(), v.end(), 100);
+      BOOST_TEST(x.bucket_count() >= 100);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 8\n";
+    UNORDERED_SUB_TEST("Construct 8")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1, generator);
-        T x(v.begin(), v.end());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(1, generator);
+      T x(v.begin(), v.end());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 9\n";
+    UNORDERED_SUB_TEST("Construct 9")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(0, hf, eq, al);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x(0, hf, eq, al);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 10\n";
+    UNORDERED_SUB_TEST("Construct 10")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
-        T x(v.begin(), v.end(), 10000, hf, eq, al);
-        BOOST_TEST(x.bucket_count() >= 10000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(1000, generator);
+      T x(v.begin(), v.end(), 10000, hf, eq, al);
+      BOOST_TEST(x.bucket_count() >= 10000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 11\n";
+    UNORDERED_SUB_TEST("Construct 11")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(al);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      T x(al);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }
-}
+  }

-template <class T>
-void constructor_tests2(T*, test::random_generator const& generator)
-{
-    BOOST_DEDUCED_TYPENAME T::hasher hf;
-    BOOST_DEDUCED_TYPENAME T::hasher hf1(1);
-    BOOST_DEDUCED_TYPENAME T::hasher hf2(2);
-    BOOST_DEDUCED_TYPENAME T::key_equal eq;
-    BOOST_DEDUCED_TYPENAME T::key_equal eq1(1);
-    BOOST_DEDUCED_TYPENAME T::key_equal eq2(2);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al;
-    BOOST_DEDUCED_TYPENAME T::allocator_type al1(1);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
+  template <class T>
+  void constructor_tests2(T*, test::random_generator const& generator)
+  {
+    typename T::hasher hf;
+    typename T::hasher hf1(1);
+    typename T::hasher hf2(2);
+    typename T::key_equal eq;
+    typename T::key_equal eq1(1);
+    typename T::key_equal eq2(2);
+    typename T::allocator_type al;
+    typename T::allocator_type al1(1);
+    typename T::allocator_type al2(2);

-    std::cerr << "Construct 1\n";
+    UNORDERED_SUB_TEST("Construct 1")
    {
-        test::check_instances check_;
-        T x(10000, hf1, eq1);
-        BOOST_TEST(x.bucket_count() >= 10000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      test::check_instances check_;
+      T x(10000, hf1, eq1);
+      BOOST_TEST(x.bucket_count() >= 10000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 2\n";
+    UNORDERED_SUB_TEST("Construct 2")
    {
-        test::check_instances check_;
-        T x(100, hf1);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 100);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_equivalent_keys(x);
+      test::check_instances check_;
+      T x(100, hf1);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 100);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 3\n";
+    UNORDERED_SUB_TEST("Construct 3")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        T x(v.begin(), v.end(), 0, hf1, eq1);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      T x(v.begin(), v.end(), 0, hf1, eq1);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 4\n";
+    UNORDERED_SUB_TEST("Construct 4")
    {
-        test::check_instances check_;
-        test::random_values<T> v(5, generator);
-        T x(v.begin(), v.end(), 1000, hf1);
-        BOOST_TEST(x.bucket_count() >= 1000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::check_instances check_;
+      test::random_values<T> v(5, generator);
+      T x(v.begin(), v.end(), 1000, hf1);
+      BOOST_TEST(x.bucket_count() >= 1000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

-    std::cerr << "Construct 5\n";
+    UNORDERED_SUB_TEST("Construct 5")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        T x(v.begin(), v.end(), 0, hf, eq, al1);
-        T y(x.begin(), x.end(), 0, hf1, eq1, al2);
-        test::check_container(x, v);
-        test::check_container(y, x);
-        test::check_equivalent_keys(x);
-        test::check_equivalent_keys(y);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      T x(v.begin(), v.end(), 0, hf, eq, al1);
+      T y(x.begin(), x.end(), 0, hf1, eq1, al2);
+      test::check_container(x, v);
+      test::check_container(y, x);
+      test::check_equivalent_keys(x);
+      test::check_equivalent_keys(y);
    }

-    std::cerr << "Construct 6\n";
+    UNORDERED_SUB_TEST("Construct 6")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        T x(v.begin(), v.end(), 0, hf1, eq1);
-        T y(x.begin(), x.end(), 0, hf, eq);
-        test::check_container(x, v);
-        test::check_container(y, x);
-        test::check_equivalent_keys(x);
-        test::check_equivalent_keys(y);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      T x(v.begin(), v.end(), 0, hf1, eq1);
+      T y(x.begin(), x.end(), 0, hf, eq);
+      test::check_container(x, v);
+      test::check_container(y, x);
+      test::check_equivalent_keys(x);
+      test::check_equivalent_keys(y);
    }

-    std::cerr << "Construct 7\n";
+    UNORDERED_SUB_TEST("Construct 7")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        T x(v.begin(), v.end(), 0, hf1, eq1);
-        T y(x.begin(), x.end(), 0, hf2, eq2);
-        test::check_container(x, v);
-        test::check_container(y, x);
-        test::check_equivalent_keys(x);
-        test::check_equivalent_keys(y);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      T x(v.begin(), v.end(), 0, hf1, eq1);
+      T y(x.begin(), x.end(), 0, hf2, eq2);
+      test::check_container(x, v);
+      test::check_container(y, x);
+      test::check_equivalent_keys(x);
+      test::check_equivalent_keys(y);
    }

-    std::cerr << "Construct 8 - from input iterator\n";
+    UNORDERED_SUB_TEST("Construct 8 - from input iterator")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
-            v_begin = v.begin(),
-            v_end = v.end();
-        T x(test::input_iterator(v_begin), test::input_iterator(v_end), 0, hf1,
-            eq1);
-        BOOST_DEDUCED_TYPENAME T::const_iterator x_begin = x.begin(),
-                                                 x_end = x.end();
-        T y(test::input_iterator(x_begin), test::input_iterator(x_end), 0, hf2,
-            eq2);
-        test::check_container(x, v);
-        test::check_container(y, x);
-        test::check_equivalent_keys(x);
-        test::check_equivalent_keys(y);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      typename test::random_values<T>::const_iterator v_begin = v.begin(),
+                                                      v_end = v.end();
+      T x(test::input_iterator(v_begin), test::input_iterator(v_end), 0, hf1,
+        eq1);
+      typename T::const_iterator x_begin = x.begin(), x_end = x.end();
+      T y(test::input_iterator(x_begin), test::input_iterator(x_end), 0, hf2,
+        eq2);
+      test::check_container(x, v);
+      test::check_container(y, x);
+      test::check_equivalent_keys(x);
+      test::check_equivalent_keys(y);
    }

-    std::cerr << "Construct 8.5 - from copy iterator\n";
+    UNORDERED_SUB_TEST("Construct 8.5 - from copy iterator")
    {
-        test::check_instances check_;
-        test::random_values<T> v(100, generator);
-        T x(test::copy_iterator(v.begin()), test::copy_iterator(v.end()), 0,
-            hf1, eq1);
-        T y(test::copy_iterator(x.begin()), test::copy_iterator(x.end()), 0,
-            hf2, eq2);
-        test::check_container(x, v);
-        test::check_container(y, x);
-        test::check_equivalent_keys(x);
-        test::check_equivalent_keys(y);
+      test::check_instances check_;
+      test::random_values<T> v(100, generator);
+      T x(test::copy_iterator(v.begin()), test::copy_iterator(v.end()), 0, hf1,
+        eq1);
+      T y(test::copy_iterator(x.begin()), test::copy_iterator(x.end()), 0, hf2,
+        eq2);
+      test::check_container(x, v);
+      test::check_container(y, x);
+      test::check_equivalent_keys(x);
+      test::check_equivalent_keys(y);
    }

-    std::cerr << "Construct 9\n";
+    UNORDERED_SUB_TEST("Construct 9")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(100, generator);
-        T x(50);
-        BOOST_TEST(x.bucket_count() >= 50);
-        x.max_load_factor(10);
-        BOOST_TEST(x.bucket_count() >= 50);
-        x.insert(v.begin(), v.end());
-        BOOST_TEST(x.bucket_count() >= 50);
-        test::check_container(x, v);
-        test::check_equivalent_keys(x);
+      test::random_values<T> v(100, generator);
+      T x(50);
+      BOOST_TEST(x.bucket_count() >= 50);
+      x.max_load_factor(10);
+      BOOST_TEST(x.bucket_count() >= 50);
+      x.insert(v.begin(), v.end());
+      BOOST_TEST(x.bucket_count() >= 50);
+      test::check_container(x, v);
+      test::check_equivalent_keys(x);
    }

 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
-    std::initializer_list<BOOST_DEDUCED_TYPENAME T::value_type> list;
+    std::initializer_list<typename T::value_type> list;

-    std::cerr << "Initializer list construct 1\n";
+    UNORDERED_SUB_TEST("Initializer list construct 1")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(list);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      T x(list);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
    }

-    std::cerr << "Initializer list construct 2\n";
+    UNORDERED_SUB_TEST("Initializer list construct 2")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(list, 1000);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 1000);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      T x(list, 1000);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 1000);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
    }

-    std::cerr << "Initializer list construct 3\n";
+    UNORDERED_SUB_TEST("Initializer list construct 3")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(list, 10, hf1);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 10);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      T x(list, 10, hf1);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 10);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
    }

-    std::cerr << "Initializer list construct 4\n";
+    UNORDERED_SUB_TEST("Initializer list construct 4")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(list, 10, hf1, eq1);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 10);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al));
+      T x(list, 10, hf1, eq1);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 10);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al));
    }

-    std::cerr << "Initializer list construct 5\n";
+    UNORDERED_SUB_TEST("Initializer list construct 5")
    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(list, 10, hf1, eq1, al1);
-        BOOST_TEST(x.empty());
-        BOOST_TEST(x.bucket_count() >= 10);
-        BOOST_TEST(test::equivalent(x.hash_function(), hf1));
-        BOOST_TEST(test::equivalent(x.key_eq(), eq1));
-        BOOST_TEST(test::equivalent(x.get_allocator(), al1));
+      T x(list, 10, hf1, eq1, al1);
+      BOOST_TEST(x.empty());
+      BOOST_TEST(x.bucket_count() >= 10);
+      BOOST_TEST(test::equivalent(x.hash_function(), hf1));
+      BOOST_TEST(test::equivalent(x.key_eq(), eq1));
+      BOOST_TEST(test::equivalent(x.get_allocator(), al1));
    }
 #endif
-}
+  }

-template <class T>
-void map_constructor_test(T*, test::random_generator const& generator)
-{
-    std::cerr << "map_constructor_test\n";
-
-    typedef test::list<std::pair<BOOST_DEDUCED_TYPENAME T::key_type,
-        BOOST_DEDUCED_TYPENAME T::mapped_type> >
-        list;
+  template <class T>
+  void map_constructor_test(T*, test::random_generator const& generator)
+  {
+    typedef test::list<
+      std::pair<typename T::key_type, typename T::mapped_type> >
+      list;
    test::random_values<T> v(1000, generator);
    list l(v.begin(), v.end());
    T x(l.begin(), l.end());

    test::check_container(x, v);
    test::check_equivalent_keys(x);
-}
+  }

-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    std::allocator<test::object> >* test_map_std_alloc;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_set;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_multiset;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_map;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::allocator1<test::object> >* test_multimap;

-using test::default_generator;
-using test::generate_collisions;
-using test::limited_range;
+  using test::default_generator;
+  using test::generate_collisions;
+  using test::limited_range;

-UNORDERED_TEST(constructor_tests1,
+  UNORDERED_TEST(constructor_tests1,
    ((test_map_std_alloc)(test_set)(test_multiset)(test_map)(test_multimap))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      (default_generator)(generate_collisions)(limited_range)))

-UNORDERED_TEST(constructor_tests2,
+  UNORDERED_TEST(constructor_tests2,
    ((test_set)(test_multiset)(test_map)(test_multimap))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      (default_generator)(generate_collisions)(limited_range)))

-UNORDERED_TEST(map_constructor_test,
+  UNORDERED_TEST(map_constructor_test,
    ((test_map_std_alloc)(test_map)(test_multimap))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      (default_generator)(generate_collisions)(limited_range)))

 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)

-UNORDERED_AUTO_TEST(test_default_initializer_list)
-{
-    std::cerr << "Initializer List Tests\n";
+  UNORDERED_AUTO_TEST (test_default_initializer_list) {
    std::initializer_list<int> init;
    boost::unordered_set<int> x1 = init;
    BOOST_TEST(x1.empty());
-}
+  }

 #endif

 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)

-UNORDERED_AUTO_TEST(test_initializer_list)
-{
-    std::cerr << "Initializer List Tests\n";
+  UNORDERED_AUTO_TEST (test_initializer_list) {
    boost::unordered_set<int> x1 = {2, 10, 45, -5};
    BOOST_TEST(x1.find(10) != x1.end());
    BOOST_TEST(x1.find(46) == x1.end());
-}
+  }

 #endif
 }

-RUN_TESTS()
+RUN_TESTS_QUIET()
@@ -0,0 +1,274 @@
+// Copyright 2021 Christian Mazakas.
+// 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)
+
+// clang-format off
+#include "../helpers/prefix.hpp"
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
+#include "../helpers/postfix.hpp"
+// clang-format on
+
+#include "../helpers/test.hpp"
+
+struct key
+{
+  int x_;
+  static int count_;
+
+  key(int x) : x_(x) { ++count_; }
+  key(key const& k) : x_(k.x_) { ++count_; }
+};
+
+int key::count_;
+
+std::ostream& operator<<(std::ostream& os, key const& k)
+{
+  os << "key { x_: " << k.x_ << " }";
+  return os;
+}
+
+bool operator==(key const& k, int const x) { return k.x_ == x; }
+bool operator==(int const x, key const& k) { return k.x_ == x; }
+
+struct transparent_hasher
+{
+  typedef void is_transparent;
+
+  std::size_t operator()(key const& k) const
+  {
+    return boost::hash<int>()(k.x_);
+  }
+
+  std::size_t operator()(int const k) const { return boost::hash<int>()(k); }
+};
+
+struct transparent_key_equal
+{
+  typedef void is_transparent;
+
+  bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; }
+  bool operator()(int const x, key const& k1) const { return k1 == x; }
+  bool operator()(key const& k1, int const x) const { return k1 == x; }
+};
+
+struct hasher
+{
+  std::size_t operator()(key const& k) const
+  {
+    return boost::hash<int>()(k.x_);
+  }
+};
+
+struct key_equal
+{
+  bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; }
+};
+
+void count_reset() { key::count_ = 0; }
+
+template <class UnorderedMap> void test_map_transparent_contains()
+{
+  count_reset();
+
+  UnorderedMap map;
+  bool contains = map.contains(0);
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, 0);
+
+  map.insert(std::make_pair(0, 1337));
+  map.insert(std::make_pair(0, 1338));
+  map.insert(std::make_pair(0, 1339));
+  map.insert(std::make_pair(1, 1340));
+
+  int const expected_key_count = key::count_;
+
+  contains = map.contains(0);
+  BOOST_TEST(contains);
+
+  contains = map.contains(1);
+  BOOST_TEST(contains);
+
+  contains = map.contains(2);
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, expected_key_count);
+}
+
+template <class UnorderedMap> void test_map_non_transparent_contains()
+{
+  count_reset();
+
+  UnorderedMap map;
+  bool contains = map.contains(0);
+  BOOST_TEST(!contains);
+  BOOST_TEST_EQ(key::count_, 1);
+
+  map.insert(std::make_pair(0, 1337));
+  map.insert(std::make_pair(0, 1338));
+  map.insert(std::make_pair(0, 1339));
+  map.insert(std::make_pair(1, 1340));
+
+  int key_count = key::count_;
+
+  contains = map.contains(0);
+  ++key_count;
+  BOOST_TEST(contains);
+
+  contains = map.contains(1);
+  ++key_count;
+  BOOST_TEST(contains);
+
+  contains = map.contains(2);
+  ++key_count;
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, key_count);
+}
+
+void test_map()
+{
+  typedef boost::unordered_map<key, int, transparent_hasher,
+    transparent_key_equal>
+    transparent_map;
+
+  typedef boost::unordered_map<key, int, transparent_hasher, key_equal>
+    non_transparent_map1;
+
+  typedef boost::unordered_map<key, int, hasher, transparent_key_equal>
+    non_transparent_map2;
+
+  typedef boost::unordered_map<key, int, hasher, key_equal>
+    non_transparent_map3;
+
+  test_map_transparent_contains<transparent_map>();
+  test_map_non_transparent_contains<non_transparent_map1>();
+  test_map_non_transparent_contains<non_transparent_map2>();
+  test_map_non_transparent_contains<non_transparent_map3>();
+}
+
+void test_multimap()
+{
+  typedef boost::unordered_multimap<key, int, transparent_hasher,
+    transparent_key_equal>
+    transparent_multimap;
+
+  typedef boost::unordered_multimap<key, int, transparent_hasher, key_equal>
+    non_transparent_multimap1;
+
+  typedef boost::unordered_multimap<key, int, hasher, transparent_key_equal>
+    non_transparent_multimap2;
+
+  typedef boost::unordered_multimap<key, int, hasher, key_equal>
+    non_transparent_multimap3;
+
+  test_map_transparent_contains<transparent_multimap>();
+  test_map_non_transparent_contains<non_transparent_multimap1>();
+  test_map_non_transparent_contains<non_transparent_multimap2>();
+  test_map_non_transparent_contains<non_transparent_multimap3>();
+}
+
+template <class UnorderedSet> void test_set_transparent_contains()
+{
+  count_reset();
+
+  UnorderedSet set;
+  bool contains = set.contains(0);
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, 0);
+
+  set.insert(0);
+  set.insert(0);
+  set.insert(0);
+  set.insert(1);
+
+  int const expected_key_count = key::count_;
+
+  contains = set.contains(0);
+  BOOST_TEST(contains);
+
+  contains = set.contains(1);
+  BOOST_TEST(contains);
+
+  contains = set.contains(2);
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, expected_key_count);
+}
+
+template <class UnorderedSet> void test_set_non_transparent_contains()
+{
+  count_reset();
+
+  UnorderedSet set;
+  bool contains = set.contains(0);
+  BOOST_TEST(!contains);
+  BOOST_TEST_EQ(key::count_, 1);
+
+  set.insert(0);
+  set.insert(0);
+  set.insert(0);
+  set.insert(1);
+
+  int key_count = key::count_;
+
+  contains = set.contains(0);
+  ++key_count;
+  BOOST_TEST(contains);
+
+  contains = set.contains(1);
+  ++key_count;
+  BOOST_TEST(contains);
+
+  contains = set.contains(2);
+  ++key_count;
+  BOOST_TEST(!contains);
+
+  BOOST_TEST_EQ(key::count_, key_count);
+}
+
+void test_set()
+{
+  typedef boost::unordered_set<key, transparent_hasher, transparent_key_equal>
+    transparent_set;
+
+  typedef boost::unordered_set<key, transparent_hasher, key_equal>
+    non_transparent_set1;
+  typedef boost::unordered_set<key, hasher, transparent_key_equal>
+    non_transparent_set2;
+  typedef boost::unordered_set<key, hasher, key_equal> non_transparent_set3;
+
+  test_set_transparent_contains<transparent_set>();
+  test_set_non_transparent_contains<non_transparent_set1>();
+  test_set_non_transparent_contains<non_transparent_set2>();
+  test_set_non_transparent_contains<non_transparent_set3>();
+}
+
+void test_multiset()
+{
+  typedef boost::unordered_multiset<key, transparent_hasher,
+    transparent_key_equal>
+    transparent_multiset;
+
+  typedef boost::unordered_multiset<key, transparent_hasher, key_equal>
+    non_transparent_multiset1;
+  typedef boost::unordered_multiset<key, hasher, transparent_key_equal>
+    non_transparent_multiset2;
+  typedef boost::unordered_multiset<key, hasher, key_equal>
+    non_transparent_multiset3;
+
+  test_set_transparent_contains<transparent_multiset>();
+  test_set_non_transparent_contains<non_transparent_multiset1>();
+  test_set_non_transparent_contains<non_transparent_multiset2>();
+  test_set_non_transparent_contains<non_transparent_multiset3>();
+}
+
+UNORDERED_AUTO_TEST (contains_) { // avoid -Wshadow warning with `bool contains`
+  test_map();
+  test_multimap();
+  test_set();
+}
+
+RUN_TESTS()
@@ -22,188 +22,188 @@ test::seed_t initialize_seed(9063);

 namespace copy_tests {

-template <class T>
-void copy_construct_tests1(T*, test::random_generator const& generator)
-{
-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+  template <class T>
+  void copy_construct_tests1(T*, test::random_generator const& generator)
+  {
+    typedef typename T::allocator_type allocator_type;

-    BOOST_DEDUCED_TYPENAME T::hasher hf;
-    BOOST_DEDUCED_TYPENAME T::key_equal eq;
-    BOOST_DEDUCED_TYPENAME T::allocator_type al;
+    typename T::hasher hf;
+    typename T::key_equal eq;
+    typename T::allocator_type al;

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x;
-        T y(x);
-        BOOST_TEST(y.empty());
-        BOOST_TEST(test::equivalent(y.hash_function(), hf));
-        BOOST_TEST(test::equivalent(y.key_eq(), eq));
-        BOOST_TEST(test::equivalent(y.get_allocator(), al));
-        BOOST_TEST(x.max_load_factor() == y.max_load_factor());
-        BOOST_TEST(test::selected_count(y.get_allocator()) ==
-                   (allocator_type::is_select_on_copy));
-        test::check_equivalent_keys(y);
+      T x;
+      T y(x);
+      BOOST_TEST(y.empty());
+      BOOST_TEST(test::equivalent(y.hash_function(), hf));
+      BOOST_TEST(test::equivalent(y.key_eq(), eq));
+      BOOST_TEST(test::equivalent(y.get_allocator(), al));
+      BOOST_TEST(x.max_load_factor() == y.max_load_factor());
+      BOOST_TEST(test::selected_count(y.get_allocator()) ==
+                 (allocator_type::is_select_on_copy));
+      test::check_equivalent_keys(y);
    }

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
+      test::random_values<T> v(1000, generator);

-        T x(v.begin(), v.end());
-        T y(x);
-        test::unordered_equivalence_tester<T> equivalent(x);
-        BOOST_TEST(equivalent(y));
-        BOOST_TEST(test::selected_count(y.get_allocator()) ==
-                   (allocator_type::is_select_on_copy));
-        test::check_equivalent_keys(y);
+      T x(v.begin(), v.end());
+      T y(x);
+      test::unordered_equivalence_tester<T> equivalent(x);
+      BOOST_TEST(equivalent(y));
+      BOOST_TEST(test::selected_count(y.get_allocator()) ==
+                 (allocator_type::is_select_on_copy));
+      test::check_equivalent_keys(y);
    }

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        // In this test I drop the original containers max load factor, so it
-        // is much lower than the load factor. The hash table is not allowed
-        // to rehash, but the destination container should probably allocate
-        // enough buckets to decrease the load factor appropriately.
-        test::random_values<T> v(1000, generator);
-        T x(v.begin(), v.end());
-        x.max_load_factor(x.load_factor() / 4);
-        T y(x);
-        test::unordered_equivalence_tester<T> equivalent(x);
-        BOOST_TEST(equivalent(y));
-        // This isn't guaranteed:
-        BOOST_TEST(y.load_factor() < y.max_load_factor());
-        BOOST_TEST(test::selected_count(y.get_allocator()) ==
-                   (allocator_type::is_select_on_copy));
-        test::check_equivalent_keys(y);
+      // In this test I drop the original containers max load factor, so it
+      // is much lower than the load factor. The hash table is not allowed
+      // to rehash, but the destination container should probably allocate
+      // enough buckets to decrease the load factor appropriately.
+      test::random_values<T> v(1000, generator);
+      T x(v.begin(), v.end());
+      x.max_load_factor(x.load_factor() / 4);
+      T y(x);
+      test::unordered_equivalence_tester<T> equivalent(x);
+      BOOST_TEST(equivalent(y));
+      // This isn't guaranteed:
+      BOOST_TEST(y.load_factor() < y.max_load_factor());
+      BOOST_TEST(test::selected_count(y.get_allocator()) ==
+                 (allocator_type::is_select_on_copy));
+      test::check_equivalent_keys(y);
    }
-}
+  }

-template <class T>
-void copy_construct_tests2(T*, test::random_generator const& generator)
-{
-    BOOST_DEDUCED_TYPENAME T::hasher hf(1);
-    BOOST_DEDUCED_TYPENAME T::key_equal eq(1);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al(1);
-    BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
+  template <class T>
+  void copy_construct_tests2(T*, test::random_generator const& generator)
+  {
+    typename T::hasher hf(1);
+    typename T::key_equal eq(1);
+    typename T::allocator_type al(1);
+    typename T::allocator_type al2(2);

-    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+    typedef typename T::allocator_type allocator_type;

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(10000, hf, eq, al);
-        T y(x);
-        BOOST_TEST(y.empty());
-        BOOST_TEST(test::equivalent(y.hash_function(), hf));
-        BOOST_TEST(test::equivalent(y.key_eq(), eq));
-        BOOST_TEST(test::equivalent(y.get_allocator(), al));
-        BOOST_TEST(x.max_load_factor() == y.max_load_factor());
-        BOOST_TEST(test::selected_count(y.get_allocator()) ==
-                   (allocator_type::is_select_on_copy));
-        test::check_equivalent_keys(y);
+      T x(10000, hf, eq, al);
+      T y(x);
+      BOOST_TEST(y.empty());
+      BOOST_TEST(test::equivalent(y.hash_function(), hf));
+      BOOST_TEST(test::equivalent(y.key_eq(), eq));
+      BOOST_TEST(test::equivalent(y.get_allocator(), al));
+      BOOST_TEST(x.max_load_factor() == y.max_load_factor());
+      BOOST_TEST(test::selected_count(y.get_allocator()) ==
+                 (allocator_type::is_select_on_copy));
+      test::check_equivalent_keys(y);
    }

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        T x(1000, hf, eq, al);
-        T y(x, al2);
-        BOOST_TEST(y.empty());
-        BOOST_TEST(test::equivalent(y.hash_function(), hf));
-        BOOST_TEST(test::equivalent(y.key_eq(), eq));
-        BOOST_TEST(test::equivalent(y.get_allocator(), al2));
-        BOOST_TEST(x.max_load_factor() == y.max_load_factor());
-        BOOST_TEST(test::selected_count(y.get_allocator()) == 0);
-        test::check_equivalent_keys(y);
+      T x(1000, hf, eq, al);
+      T y(x, al2);
+      BOOST_TEST(y.empty());
+      BOOST_TEST(test::equivalent(y.hash_function(), hf));
+      BOOST_TEST(test::equivalent(y.key_eq(), eq));
+      BOOST_TEST(test::equivalent(y.get_allocator(), al2));
+      BOOST_TEST(x.max_load_factor() == y.max_load_factor());
+      BOOST_TEST(test::selected_count(y.get_allocator()) == 0);
+      test::check_equivalent_keys(y);
    }

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(1000, generator);
+      test::random_values<T> v(1000, generator);

-        T x(v.begin(), v.end(), 0, hf, eq, al);
-        T y(x);
-        test::unordered_equivalence_tester<T> equivalent(x);
-        BOOST_TEST(equivalent(y));
-        test::check_equivalent_keys(y);
-        BOOST_TEST(test::selected_count(y.get_allocator()) ==
-                   (allocator_type::is_select_on_copy));
-        BOOST_TEST(test::equivalent(y.get_allocator(), al));
+      T x(v.begin(), v.end(), 0, hf, eq, al);
+      T y(x);
+      test::unordered_equivalence_tester<T> equivalent(x);
+      BOOST_TEST(equivalent(y));
+      test::check_equivalent_keys(y);
+      BOOST_TEST(test::selected_count(y.get_allocator()) ==
+                 (allocator_type::is_select_on_copy));
+      BOOST_TEST(test::equivalent(y.get_allocator(), al));
    }

    {
-        test::check_instances check_;
+      test::check_instances check_;

-        test::random_values<T> v(500, generator);
+      test::random_values<T> v(500, generator);

-        T x(v.begin(), v.end(), 0, hf, eq, al);
-        T y(x, al2);
-        test::unordered_equivalence_tester<T> equivalent(x);
-        BOOST_TEST(equivalent(y));
-        test::check_equivalent_keys(y);
-        BOOST_TEST(test::selected_count(y.get_allocator()) == 0);
-        BOOST_TEST(test::equivalent(y.get_allocator(), al2));
+      T x(v.begin(), v.end(), 0, hf, eq, al);
+      T y(x, al2);
+      test::unordered_equivalence_tester<T> equivalent(x);
+      BOOST_TEST(equivalent(y));
+      test::check_equivalent_keys(y);
+      BOOST_TEST(test::selected_count(y.get_allocator()) == 0);
+      BOOST_TEST(test::equivalent(y.get_allocator(), al2));
    }
-}
+  }

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_set;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::allocator2<test::object> >* test_multiset;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::allocator1<test::object> >* test_map;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::allocator2<test::object> >* test_multimap;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::select_copy> >*
    test_set_select_copy;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::select_copy> >*
    test_multiset_select_copy;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::select_copy> >*
    test_map_select_copy;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::cxx11_allocator<test::object, test::select_copy> >*
    test_multimap_select_copy;

-boost::unordered_set<test::object, test::hash, test::equal_to,
+  boost::unordered_set<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_select_copy> >*
    test_set_no_select_copy;
-boost::unordered_multiset<test::object, test::hash, test::equal_to,
+  boost::unordered_multiset<test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_select_copy> >*
    test_multiset_no_select_copy;
-boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
+  boost::unordered_map<test::object, test::object, test::hash, test::equal_to,
    test::cxx11_allocator<test::object, test::no_select_copy> >*
    test_map_no_select_copy;
-boost::unordered_multimap<test::object, test::object, test::hash,
+  boost::unordered_multimap<test::object, test::object, test::hash,
    test::equal_to, test::cxx11_allocator<test::object, test::no_select_copy> >*
    test_multimap_no_select_copy;

-using test::default_generator;
-using test::generate_collisions;
-using test::limited_range;
+  using test::default_generator;
+  using test::generate_collisions;
+  using test::limited_range;

-UNORDERED_TEST(copy_construct_tests1,
+  UNORDERED_TEST(copy_construct_tests1,
    ((test_set)(test_multiset)(test_map)(test_multimap)(test_set_select_copy)(
-        test_multiset_select_copy)(test_map_select_copy)(
-        test_multimap_select_copy)(test_set_no_select_copy)(
-        test_multiset_no_select_copy)(test_map_no_select_copy)(
-        test_multimap_no_select_copy))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      test_multiset_select_copy)(test_map_select_copy)(
+      test_multimap_select_copy)(test_set_no_select_copy)(
+      test_multiset_no_select_copy)(test_map_no_select_copy)(
+      test_multimap_no_select_copy))(
+      (default_generator)(generate_collisions)(limited_range)))

-UNORDERED_TEST(copy_construct_tests2,
+  UNORDERED_TEST(copy_construct_tests2,
    ((test_set)(test_multiset)(test_map)(test_multimap)(test_set_select_copy)(
-        test_multiset_select_copy)(test_map_select_copy)(
-        test_multimap_select_copy)(test_set_no_select_copy)(
-        test_multiset_no_select_copy)(test_map_no_select_copy)(
-        test_multimap_no_select_copy))(
-                   (default_generator)(generate_collisions)(limited_range)))
+      test_multiset_select_copy)(test_map_select_copy)(
+      test_multimap_select_copy)(test_set_no_select_copy)(
+      test_multiset_no_select_copy)(test_map_no_select_copy)(
+      test_multimap_no_select_copy))(
+      (default_generator)(generate_collisions)(limited_range)))
 }

 RUN_TESTS()
@@ -0,0 +1,352 @@
+
+// Copyright 2017-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)
+
+#include <boost/unordered_map.hpp>
+#include <iostream>
+#include <vector>
+
+#if BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES
+struct hash_equals
+{
+  template <typename T> bool operator()(T const& x) const
+  {
+    boost::hash<T> hf;
+    return hf(x);
+  }
+
+  template <typename T> bool operator()(T const& x, T const& y) const
+  {
+    std::equal_to<T> eq;
+    return eq(x, y);
+  }
+};
+
+template <typename T> struct test_allocator
+{
+  typedef T value_type;
+  test_allocator() = default;
+  template <typename T2> test_allocator(test_allocator<T2> const&) {}
+  T* allocate(std::size_t n) const { return (T*)malloc(sizeof(T) * n); }
+  void deallocate(T* ptr, std::size_t) const { free(ptr); }
+  bool operator==(test_allocator const&) const { return true; }
+  bool operator!=(test_allocator const&) const { return false; }
+};
+#endif
+
+int main()
+{
+  std::cout << "BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES: "
+            << BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES << std::endl;
+
+#if BOOST_UNORDERED_TEMPLATE_DEDUCTION_GUIDES
+  std::vector<std::pair<int, int> > x;
+  x.push_back(std::make_pair(1, 3));
+  x.push_back(std::make_pair(5, 10));
+  test_allocator<std::pair<const int, int> > pair_allocator;
+  hash_equals f;
+
+  // unordered_map
+
+  /*
+   template<class InputIterator,
+           class Hash = hash<iter_key_t<InputIterator>>,
+           class Pred = equal_to<iter_key_t<InputIterator>>,
+           class Allocator = allocator<iter_to_alloc_t<InputIterator>>>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type =
+   see below,
+                  Hash = Hash(), Pred = Pred(), Allocator = Allocator())
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+   Hash, Pred,
+                       Allocator>;
+  */
+
+  {
+    boost::unordered_map m(x.begin(), x.end());
+    static_assert(
+      std::is_same<decltype(m), boost::unordered_map<int, int> >::value);
+  }
+
+  /* Ambiguous:
+  {
+    boost::unordered_map m(x.begin(), x.end(), 0, std::hash<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  std::hash<int>>>::value);
+  }
+
+  {
+    boost::unordered_map m(x.begin(), x.end(), 0, std::hash<int>(),
+  std::equal_to<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  std::hash<int>, std::equal_to<int>>>::value);
+  }
+  */
+
+  {
+    boost::unordered_map m(x.begin(), x.end(), 0, std::hash<int>(),
+      std::equal_to<int>(), pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_map<int, int, std::hash<int>, std::equal_to<int>,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+  /*
+  template<class Key, class T, class Hash = hash<Key>,
+           class Pred = equal_to<Key>, class Allocator = allocator<pair<const
+  Key, T>>>
+    unordered_map(initializer_list<pair<const Key, T>>,
+                  typename see below::size_type = see below, Hash = Hash(),
+                  Pred = Pred(), Allocator = Allocator())
+      -> unordered_map<Key, T, Hash, Pred, Allocator>;
+  */
+
+  {
+    boost::unordered_map m({std::pair<int const, int>(1, 2)});
+    static_assert(
+      std::is_same<decltype(m), boost::unordered_map<int, int> >::value);
+  }
+
+  /* Ambiguous
+  {
+    boost::unordered_map m({std::pair<int const, int>(1,2)}, 0,
+  std::hash<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  std::hash<int>>>::value);
+  }
+
+  {
+    boost::unordered_map m({std::pair<int const, int>(1,2)}, 0,
+  std::hash<int>(), std::equal_to<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  std::hash<int>, std::equal_to<int>>>::value);
+  }
+  */
+
+  {
+    boost::unordered_map m(
+      {std::pair<int const, int>(1, 2)}, 0, f, f, pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_map<int, int, hash_equals, hash_equals,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+  /*
+  template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type,
+  Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                       hash<iter_key_t<InputIterator>>,
+  equal_to<iter_key_t<InputIterator>>,
+                       Allocator>;
+  */
+
+  /* Ambiguous
+  {
+    boost::unordered_map m(x.begin(), x.end(), 0u, pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_map<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /*
+    template<class InputIterator, class Allocator>
+    unordered_map(InputIterator, InputIterator, Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+                       hash<iter_key_t<InputIterator>>,
+    equal_to<iter_key_t<InputIterator>>,
+                       Allocator>;
+  */
+
+  /* No constructor:
+  {
+    boost::unordered_map m(x.begin(), x.end(), pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_map<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /*
+  template<class InputIterator, class Hash, class Allocator>
+    unordered_map(InputIterator, InputIterator, typename see below::size_type,
+  Hash, Allocator)
+      -> unordered_map<iter_key_t<InputIterator>, iter_val_t<InputIterator>,
+  Hash,
+                       equal_to<iter_key_t<InputIterator>>, Allocator>;
+  */
+
+  /* Ambiguous
+  {
+    boost::unordered_map m(x.begin(), x.end(), 0u, f, pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_map<int, int,
+  hash_equals, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /*
+    template<class Key, class T, typename Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, typename see
+    below::size_type,
+                  Allocator)
+      -> unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  */
+
+  /* Ambiguous
+  {
+    boost::unordered_map m({std::pair<int const, int>(1,2)}, 0, pair_allocator);
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /*
+  template<class Key, class T, typename Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, Allocator)
+      -> unordered_map<Key, T, hash<Key>, equal_to<Key>, Allocator>;
+  */
+
+  {
+    boost::unordered_map m({std::pair<int const, int>(1, 2)}, pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_map<int, int, boost::hash<int>, std::equal_to<int>,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+  /*
+  template<class Key, class T, class Hash, class Allocator>
+    unordered_map(initializer_list<pair<const Key, T>>, typename see
+  below::size_type, Hash,
+                  Allocator)
+      -> unordered_map<Key, T, Hash, equal_to<Key>, Allocator>;
+  */
+
+  /* Ambiguous
+  {
+    boost::unordered_map m({std::pair<int const, int>(1,2)}, 0, f,
+  pair_allocator);
+    static_assert(std::is_same<decltype(m),boost::unordered_map<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  // unordered_multimap
+
+  {
+    boost::unordered_multimap m(x.begin(), x.end());
+    static_assert(
+      std::is_same<decltype(m), boost::unordered_multimap<int, int> >::value);
+  }
+
+  /* Ambiguous:
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), 0, std::hash<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+  std::hash<int>>>::value);
+  }
+
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), 0, std::hash<int>(),
+  std::equal_to<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+  std::hash<int>, std::equal_to<int>>>::value);
+  }
+  */
+
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), 0, std::hash<int>(),
+      std::equal_to<int>(), pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_multimap<int, int, std::hash<int>, std::equal_to<int>,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+  {
+    boost::unordered_multimap m({std::pair<int const, int>(1, 2)});
+    static_assert(
+      std::is_same<decltype(m), boost::unordered_multimap<int, int> >::value);
+  }
+
+  /* Ambiguous
+  {
+    boost::unordered_multimap m({std::pair<int const, int>(1,2)}, 0,
+  std::hash<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+  std::hash<int>>>::value);
+  }
+
+  {
+    boost::unordered_multimap m({std::pair<int const, int>(1,2)}, 0,
+  std::hash<int>(), std::equal_to<int>());
+    static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+  std::hash<int>, std::equal_to<int>>>::value);
+  }
+  */
+
+  {
+    boost::unordered_multimap m(
+      {std::pair<int const, int>(1, 2)}, 0, f, f, pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_multimap<int, int, hash_equals, hash_equals,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+  /* Ambiguous
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), 0u, pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_multimap<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /* No constructor:
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_multimap<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  /* Ambiguous
+  {
+    boost::unordered_multimap m(x.begin(), x.end(), 0u, f, pair_allocator);
+    static_assert(std::is_same<decltype(m), boost::unordered_multimap<int, int,
+  hash_equals, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+
+  {
+    boost::unordered_multimap m({std::pair<int const, int>(1,2)}, 0,
+  pair_allocator);
+    static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+  boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+  int>>>>::value);
+  }
+  */
+
+  {
+    boost::unordered_multimap m(
+      {std::pair<int const, int>(1, 2)}, pair_allocator);
+    static_assert(std::is_same<decltype(m),
+      boost::unordered_multimap<int, int, boost::hash<int>, std::equal_to<int>,
+        test_allocator<std::pair<const int, int> > > >::value);
+  }
+
+/* Ambiguous
+{
+  boost::unordered_multimap m({std::pair<int const, int>(1,2)}, 0, f,
+pair_allocator);
+  static_assert(std::is_same<decltype(m),boost::unordered_multimap<int, int,
+boost::hash<int>, std::equal_to<int>, test_allocator<std::pair<const int,
+int>>>>::value);
+}
+*/
+
+#endif
+}
@@ -0,0 +1,101 @@
+
+// Copyright 2017 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)
+
+// clang-format off
+#include "../helpers/prefix.hpp"
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
+#include "../helpers/postfix.hpp"
+// clang-format on
+
+#include "../helpers/test.hpp"
+#include <map>
+
+// Pretty inefficient, but the test is fast enough.
+// Might be too slow if we had larger primes?
+bool is_prime(std::size_t x)
+{
+  if (x == 2) {
+    return true;
+  } else if (x == 1 || x % 2 == 0) {
+    return false;
+  } else {
+    // y*y <= x had rounding errors, so instead use y <= (x/y).
+    for (std::size_t y = 3; y <= (x / y); y += 2) {
+      if (x % y == 0) {
+        return false;
+        break;
+      }
+    }
+
+    return true;
+  }
+}
+
+void test_next_prime(std::size_t value)
+{
+  std::size_t x = boost::unordered::detail::next_prime(value);
+  BOOST_TEST(is_prime(x));
+  BOOST_TEST(x >= value);
+}
+
+void test_prev_prime(std::size_t value)
+{
+  std::size_t x = boost::unordered::detail::prev_prime(value);
+  BOOST_TEST(is_prime(x));
+  BOOST_TEST(x <= value);
+  if (x > value) {
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM << x << "," << value << std::endl;
+  }
+}
+
+UNORDERED_AUTO_TEST (next_prime_test) {
+  BOOST_TEST(!is_prime(0));
+  BOOST_TEST(!is_prime(1));
+  BOOST_TEST(is_prime(2));
+  BOOST_TEST(is_prime(3));
+  BOOST_TEST(is_prime(13));
+  BOOST_TEST(!is_prime(4));
+  BOOST_TEST(!is_prime(100));
+
+  BOOST_TEST(boost::unordered::detail::next_prime(0) > 0);
+
+  // test_prev_prime doesn't work for values less than 17.
+  // Which should be okay, unless an allocator has a really tiny
+  // max_size?
+  const std::size_t min_prime = 17;
+
+  // test_next_prime doesn't work for values greater than this,
+  // which might be a problem if you've got terrabytes of memory?
+  // I seriously doubt the container would work well at such sizes
+  // regardless.
+  const std::size_t max_prime = 4294967291ul;
+
+  std::size_t i;
+
+  BOOST_TEST(is_prime(min_prime));
+  BOOST_TEST(is_prime(max_prime));
+
+  for (i = 0; i < 10000; ++i) {
+    if (i < min_prime) {
+      BOOST_TEST(boost::unordered::detail::prev_prime(i) == min_prime);
+    } else {
+      test_prev_prime(i);
+    }
+    test_next_prime(i);
+  }
+
+  std::size_t last = i - 1;
+  for (; i > last; last = i, i += i / 5) {
+    if (i > max_prime) {
+      BOOST_TEST(boost::unordered::detail::next_prime(i) == max_prime);
+    } else {
+      test_next_prime(i);
+    }
+    test_prev_prime(i);
+  }
+}
+
+RUN_TESTS()
@@ -19,9 +19,9 @@
 // arguments.

 namespace emplace_tests {
-// Constructible with 2 to 10 arguments
-struct emplace_value : private test::counted_object
-{
+  // Constructible with 2 to 10 arguments
+  struct emplace_value : private test::counted_object
+  {
    typedef int A0;
    typedef std::string A1;
    typedef char A2;
@@ -59,40 +59,40 @@ struct emplace_value : private test::counted_object
    }

    emplace_value(
-        A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3, A4 const& b4)
+      A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3, A4 const& b4)
        : arg_count(5), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4)
    {
    }

    emplace_value(A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3,
-        A4 const& b4, A5 const& b5)
+      A4 const& b4, A5 const& b5)
        : arg_count(6), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4), a5(b5)
    {
    }

    emplace_value(A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3,
-        A4 const& b4, A5 const& b5, A6 const& b6)
+      A4 const& b4, A5 const& b5, A6 const& b6)
        : arg_count(7), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4), a5(b5), a6(b6)
    {
    }

    emplace_value(A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3,
-        A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7)
+      A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7)
        : arg_count(8), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4), a5(b5), a6(b6),
          a7(b7)
    {
    }

    emplace_value(A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3,
-        A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7, A8 const& b8)
+      A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7, A8 const& b8)
        : arg_count(9), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4), a5(b5), a6(b6),
          a7(b7), a8(b8)
    {
    }

    emplace_value(A0 const& b0, A1 const& b1, A2 const& b2, A3 const& b3,
-        A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7, A8 const& b8,
-        A9 const& b9)
+      A4 const& b4, A5 const& b5, A6 const& b6, A7 const& b7, A8 const& b8,
+      A9 const& b9)
        : arg_count(10), a0(b0), a1(b1), a2(b2), a3(b3), a4(b4), a5(b5), a6(b6),
          a7(b7), a8(b8), a9(b9)
    {
@@ -100,79 +100,78 @@ struct emplace_value : private test::counted_object

    friend std::size_t hash_value(emplace_value const& x)
    {
-        std::size_t r1 = 23894278u;
-        if (x.arg_count >= 1)
-            boost::hash_combine(r1, x.a0);
-        if (x.arg_count >= 2)
-            boost::hash_combine(r1, x.a1);
-        if (x.arg_count >= 3)
-            boost::hash_combine(r1, x.a2);
-        if (x.arg_count >= 4)
-            boost::hash_combine(r1, x.a3);
-        if (x.arg_count >= 5)
-            boost::hash_combine(r1, x.a4);
-        if (x.arg_count >= 6)
-            boost::hash_combine(r1, x.a5);
-        if (x.arg_count >= 7)
-            boost::hash_combine(r1, x.a6);
-        if (x.arg_count >= 8)
-            boost::hash_combine(r1, x.a7);
-        if (x.arg_count >= 9)
-            boost::hash_combine(r1, x.a8);
-        if (x.arg_count >= 10)
-            boost::hash_combine(r1, x.a9);
-        return r1;
+      std::size_t r1 = 23894278u;
+      if (x.arg_count >= 1)
+        boost::hash_combine(r1, x.a0);
+      if (x.arg_count >= 2)
+        boost::hash_combine(r1, x.a1);
+      if (x.arg_count >= 3)
+        boost::hash_combine(r1, x.a2);
+      if (x.arg_count >= 4)
+        boost::hash_combine(r1, x.a3);
+      if (x.arg_count >= 5)
+        boost::hash_combine(r1, x.a4);
+      if (x.arg_count >= 6)
+        boost::hash_combine(r1, x.a5);
+      if (x.arg_count >= 7)
+        boost::hash_combine(r1, x.a6);
+      if (x.arg_count >= 8)
+        boost::hash_combine(r1, x.a7);
+      if (x.arg_count >= 9)
+        boost::hash_combine(r1, x.a8);
+      if (x.arg_count >= 10)
+        boost::hash_combine(r1, x.a9);
+      return r1;
    }

    friend bool operator==(emplace_value const& x, emplace_value const& y)
    {
-        if (x.arg_count != y.arg_count) {
-            return false;
-        }
-        if (x.arg_count >= 1 && x.a0 != y.a0) {
-            return false;
-        }
-        if (x.arg_count >= 2 && x.a1 != y.a1) {
-            return false;
-        }
-        if (x.arg_count >= 3 && x.a2 != y.a2) {
-            return false;
-        }
-        if (x.arg_count >= 4 && x.a3 != y.a3) {
-            return false;
-        }
-        if (x.arg_count >= 5 && x.a4 != y.a4) {
-            return false;
-        }
-        if (x.arg_count >= 6 && x.a5 != y.a5) {
-            return false;
-        }
-        if (x.arg_count >= 7 && x.a6 != y.a6) {
-            return false;
-        }
-        if (x.arg_count >= 8 && x.a7 != y.a7) {
-            return false;
-        }
-        if (x.arg_count >= 9 && x.a8 != y.a8) {
-            return false;
-        }
-        if (x.arg_count >= 10 && x.a9 != y.a9) {
-            return false;
-        }
-        return true;
+      if (x.arg_count != y.arg_count) {
+        return false;
+      }
+      if (x.arg_count >= 1 && x.a0 != y.a0) {
+        return false;
+      }
+      if (x.arg_count >= 2 && x.a1 != y.a1) {
+        return false;
+      }
+      if (x.arg_count >= 3 && x.a2 != y.a2) {
+        return false;
+      }
+      if (x.arg_count >= 4 && x.a3 != y.a3) {
+        return false;
+      }
+      if (x.arg_count >= 5 && x.a4 != y.a4) {
+        return false;
+      }
+      if (x.arg_count >= 6 && x.a5 != y.a5) {
+        return false;
+      }
+      if (x.arg_count >= 7 && x.a6 != y.a6) {
+        return false;
+      }
+      if (x.arg_count >= 8 && x.a7 != y.a7) {
+        return false;
+      }
+      if (x.arg_count >= 9 && x.a8 != y.a8) {
+        return false;
+      }
+      if (x.arg_count >= 10 && x.a9 != y.a9) {
+        return false;
+      }
+      return true;
    }

  private:
    emplace_value();
    emplace_value(emplace_value const&);
-};
+  };

-UNORDERED_AUTO_TEST(emplace_set)
-{
+  UNORDERED_AUTO_TEST (emplace_set) {
    test::check_instances check_;

    typedef boost::unordered_set<emplace_value, boost::hash<emplace_value> >
-        container;
+      container;
    typedef container::iterator iterator;
    typedef std::pair<iterator, bool> return_type;
    container x(10);
@@ -216,7 +215,7 @@ UNORDERED_AUTO_TEST(emplace_set)
    BOOST_TEST(!r2.second);
    BOOST_TEST(i1 == r2.first);
    // The container has to construct an object in order to check
-    // whether it can emplace, so there's an extra cosntruction
+    // whether it can emplace, so there's an extra construction
    // here.
    BOOST_TEST_EQ(check_.instances(), 6);
    BOOST_TEST_EQ(check_.constructions(), 7);
@@ -233,12 +232,12 @@ UNORDERED_AUTO_TEST(emplace_set)
    BOOST_TEST_EQ(check_.instances(), 8);
    BOOST_TEST_EQ(check_.constructions(), 9);

-    BOOST_TEST(r1.first ==
-               x.emplace_hint(r1.first, 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
-    BOOST_TEST(r1.first ==
-               x.emplace_hint(r2.first, 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
    BOOST_TEST(
-        r1.first == x.emplace_hint(x.end(), 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
+      r1.first == x.emplace_hint(r1.first, 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
+    BOOST_TEST(
+      r1.first == x.emplace_hint(r2.first, 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
+    BOOST_TEST(
+      r1.first == x.emplace_hint(x.end(), 10, "", 'a', 4, 5, 6, 7, 8, 9, 10));
    BOOST_TEST_EQ(check_.instances(), 8);
    BOOST_TEST_EQ(check_.constructions(), 12);

@@ -247,15 +246,14 @@ UNORDERED_AUTO_TEST(emplace_set)
    BOOST_TEST(x.count(v2) == 1);
    BOOST_TEST(x.count(v3) == 1);
    BOOST_TEST(x.count(v4) == 1);
-}
+  }

-UNORDERED_AUTO_TEST(emplace_multiset)
-{
+  UNORDERED_AUTO_TEST (emplace_multiset) {
    test::check_instances check_;

    typedef boost::unordered_multiset<emplace_value,
-        boost::hash<emplace_value> >
-        container;
+      boost::hash<emplace_value> >
+      container;
    typedef container::iterator iterator;
    container x(10);
    iterator i1, i2;
@@ -326,15 +324,14 @@ UNORDERED_AUTO_TEST(emplace_multiset)
    BOOST_TEST_EQ(x.count(v1), 1u);
    BOOST_TEST_EQ(x.count(v2), 2u);
    BOOST_TEST_EQ(x.count(v3), 2u);
-}
+  }

-UNORDERED_AUTO_TEST(emplace_map)
-{
+  UNORDERED_AUTO_TEST (emplace_map) {
    test::check_instances check_;

    typedef boost::unordered_map<emplace_value, emplace_value,
-        boost::hash<emplace_value> >
-        container;
+      boost::hash<emplace_value> >
+      container;
    typedef container::iterator iterator;
    typedef std::pair<iterator, bool> return_type;
    container x(10);
@@ -345,8 +342,8 @@ UNORDERED_AUTO_TEST(emplace_map)
    emplace_value k1(5, "", 'b', 4, 5);
    emplace_value m1(8, "xxx", 'z', 4, 5, 6, 7, 8);
    r1 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(5, "", 'b', 4, 5),
-        boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
+      boost::make_tuple(5, "", 'b', 4, 5),
+      boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
    BOOST_TEST_EQ(x.size(), 1u);
    BOOST_TEST(r1.second);
    BOOST_TEST(x.find(k1) == r1.first);
@@ -355,8 +352,8 @@ UNORDERED_AUTO_TEST(emplace_map)
    BOOST_TEST_EQ(check_.constructions(), 4);

    r2 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(5, "", 'b', 4, 5),
-        boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
+      boost::make_tuple(5, "", 'b', 4, 5),
+      boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
    BOOST_TEST_EQ(x.size(), 1u);
    BOOST_TEST(!r2.second);
    BOOST_TEST(r1.first == r2.first);
@@ -371,8 +368,8 @@ UNORDERED_AUTO_TEST(emplace_map)
    emplace_value k2(9, "", 'b', 4, 5, 6, 7, 8, 9);
    emplace_value m2(3, "aaa", 'm');
    r1 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-        boost::make_tuple(3, "aaa", 'm'));
+      boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+      boost::make_tuple(3, "aaa", 'm'));
    BOOST_TEST_EQ(x.size(), 2u);
    BOOST_TEST(r1.second);
    BOOST_TEST(r1.first->first.arg_count == 9);
@@ -384,29 +381,28 @@ UNORDERED_AUTO_TEST(emplace_map)

    BOOST_TEST(r1.first ==
               x.emplace_hint(r1.first, boost::unordered::piecewise_construct,
-                   boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-                   boost::make_tuple(15, "jkjk")));
+                 boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+                 boost::make_tuple(15, "jkjk")));
    BOOST_TEST(r1.first ==
               x.emplace_hint(r2.first, boost::unordered::piecewise_construct,
-                   boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-                   boost::make_tuple(275, "xxx", 'm', 6)));
+                 boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+                 boost::make_tuple(275, "xxx", 'm', 6)));
    BOOST_TEST(r1.first ==
               x.emplace_hint(x.end(), boost::unordered::piecewise_construct,
-                   boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-                   boost::make_tuple(-10, "blah blah", '\0')));
+                 boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+                 boost::make_tuple(-10, "blah blah", '\0')));
    BOOST_TEST_EQ(x.size(), 2u);
    BOOST_TEST(x.find(k2)->second == m2);
    BOOST_TEST_EQ(check_.instances(), 8);
    BOOST_TEST_EQ(check_.constructions(), 16);
-}
+  }

-UNORDERED_AUTO_TEST(emplace_multimap)
-{
+  UNORDERED_AUTO_TEST (emplace_multimap) {
    test::check_instances check_;

    typedef boost::unordered_multimap<emplace_value, emplace_value,
-        boost::hash<emplace_value> >
-        container;
+      boost::hash<emplace_value> >
+      container;
    typedef container::iterator iterator;
    container x(10);
    iterator i1, i2, i3, i4;
@@ -416,8 +412,8 @@ UNORDERED_AUTO_TEST(emplace_multimap)
    emplace_value k1(5, "", 'b', 4, 5);
    emplace_value m1(8, "xxx", 'z', 4, 5, 6, 7, 8);
    i1 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(5, "", 'b', 4, 5),
-        boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
+      boost::make_tuple(5, "", 'b', 4, 5),
+      boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
    BOOST_TEST_EQ(x.size(), 1u);
    BOOST_TEST(x.find(k1) == i1);
    BOOST_TEST(x.find(k1)->second == m1);
@@ -426,8 +422,8 @@ UNORDERED_AUTO_TEST(emplace_multimap)

    emplace_value m1a(8, "xxx", 'z', 4, 5, 6, 7, 8);
    i2 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(5, "", 'b', 4, 5),
-        boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
+      boost::make_tuple(5, "", 'b', 4, 5),
+      boost::make_tuple(8, "xxx", 'z', 4, 5, 6, 7, 8));
    BOOST_TEST_EQ(x.size(), 2u);
    BOOST_TEST(i1 != i2);
    BOOST_TEST(i1->second == m1);
@@ -440,8 +436,8 @@ UNORDERED_AUTO_TEST(emplace_multimap)
    emplace_value k2(9, "", 'b', 4, 5, 6, 7, 8, 9);
    emplace_value m2(3, "aaa", 'm');
    i1 = x.emplace(boost::unordered::piecewise_construct,
-        boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-        boost::make_tuple(3, "aaa", 'm'));
+      boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+      boost::make_tuple(3, "aaa", 'm'));
    BOOST_TEST_EQ(x.size(), 3u);
    BOOST_TEST(i1->first.arg_count == 9);
    BOOST_TEST(i1->second.arg_count == 3);
@@ -450,24 +446,23 @@ UNORDERED_AUTO_TEST(emplace_multimap)

    emplace_value m2a(15, "jkjk");
    i2 = x.emplace_hint(i2, boost::unordered::piecewise_construct,
-        boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-        boost::make_tuple(15, "jkjk"));
+      boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+      boost::make_tuple(15, "jkjk"));
    emplace_value m2b(275, "xxx", 'm', 6);
    i3 = x.emplace_hint(i1, boost::unordered::piecewise_construct,
-        boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-        boost::make_tuple(275, "xxx", 'm', 6));
+      boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+      boost::make_tuple(275, "xxx", 'm', 6));
    emplace_value m2c(-10, "blah blah", '\0');
    i4 = x.emplace_hint(x.end(), boost::unordered::piecewise_construct,
-        boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
-        boost::make_tuple(-10, "blah blah", '\0'));
+      boost::make_tuple(9, "", 'b', 4, 5, 6, 7, 8, 9),
+      boost::make_tuple(-10, "blah blah", '\0'));
    BOOST_TEST_EQ(x.size(), 6u);
    BOOST_TEST(x.find(k2)->second == m2);
    BOOST_TEST_EQ(check_.instances(), 20);
    BOOST_TEST_EQ(check_.constructions(), 20);
-}
+  }

-UNORDERED_AUTO_TEST(try_emplace)
-{
+  UNORDERED_AUTO_TEST (try_emplace) {
    test::check_instances check_;

    typedef boost::unordered_map<int, emplace_value> container;
@@ -509,11 +504,11 @@ UNORDERED_AUTO_TEST(try_emplace)

    BOOST_TEST(r2.first == x.try_emplace(r2.first, k2, 808709, "what"));
    BOOST_TEST(
-        r2.first ==
-        x.try_emplace(r2.first, k2, 10, "xxx", 'a', 4, 5, 6, 7, 8, 9, 10));
+      r2.first ==
+      x.try_emplace(r2.first, k2, 10, "xxx", 'a', 4, 5, 6, 7, 8, 9, 10));
    BOOST_TEST(r2.first->second == m2);
    BOOST_TEST_EQ(x.size(), 2u);
-}
+  }
 }

 RUN_TESTS()
@@ -15,8 +15,8 @@
 #include "../helpers/test.hpp"

 namespace equality_tests {
-struct mod_compare
-{
+  struct mod_compare
+  {
    bool alt_hash_;

    explicit mod_compare(bool alt_hash = false) : alt_hash_(alt_hash) {}
@@ -25,50 +25,48 @@ struct mod_compare

    std::size_t operator()(int x) const
    {
-        return alt_hash_ ? static_cast<std::size_t>(x % 250)
-                         : static_cast<std::size_t>((x + 5) % 250);
+      return alt_hash_ ? static_cast<std::size_t>(x % 250)
+                       : static_cast<std::size_t>((x + 5) % 250);
    }
-};
+  };

 #define UNORDERED_EQUALITY_SET_TEST(seq1, op, seq2)                            \
-    {                                                                          \
-        boost::unordered_set<int, mod_compare, mod_compare> set1, set2;        \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set1, seq1)                \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set2, seq2)                \
-        BOOST_TEST(set1 op set2);                                              \
-    }
+  {                                                                            \
+    boost::unordered_set<int, mod_compare, mod_compare> set1, set2;            \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set1, seq1)                    \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set2, seq2)                    \
+    BOOST_TEST(set1 op set2);                                                  \
+  }

 #define UNORDERED_EQUALITY_MULTISET_TEST(seq1, op, seq2)                       \
-    {                                                                          \
-        boost::unordered_multiset<int, mod_compare, mod_compare> set1, set2;   \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set1, seq1)                \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set2, seq2)                \
-        BOOST_TEST(set1 op set2);                                              \
-    }
+  {                                                                            \
+    boost::unordered_multiset<int, mod_compare, mod_compare> set1, set2;       \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set1, seq1)                    \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_SET_INSERT, set2, seq2)                    \
+    BOOST_TEST(set1 op set2);                                                  \
+  }

 #define UNORDERED_EQUALITY_MAP_TEST(seq1, op, seq2)                            \
-    {                                                                          \
-        boost::unordered_map<int, int, mod_compare, mod_compare> map1, map2;   \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map1, seq1)                \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map2, seq2)                \
-        BOOST_TEST(map1 op map2);                                              \
-    }
+  {                                                                            \
+    boost::unordered_map<int, int, mod_compare, mod_compare> map1, map2;       \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map1, seq1)                    \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map2, seq2)                    \
+    BOOST_TEST(map1 op map2);                                                  \
+  }

 #define UNORDERED_EQUALITY_MULTIMAP_TEST(seq1, op, seq2)                       \
-    {                                                                          \
-        boost::unordered_multimap<int, int, mod_compare, mod_compare> map1,    \
-            map2;                                                              \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map1, seq1)                \
-        BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map2, seq2)                \
-        BOOST_TEST(map1 op map2);                                              \
-    }
+  {                                                                            \
+    boost::unordered_multimap<int, int, mod_compare, mod_compare> map1, map2;  \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map1, seq1)                    \
+    BOOST_PP_SEQ_FOR_EACH(UNORDERED_MAP_INSERT, map2, seq2)                    \
+    BOOST_TEST(map1 op map2);                                                  \
+  }

 #define UNORDERED_SET_INSERT(r, set, item) set.insert(item);
 #define UNORDERED_MAP_INSERT(r, map, item)                                     \
-    map.insert(std::pair<int const, int> BOOST_PP_SEQ_TO_TUPLE(item));
+  map.insert(std::pair<int const, int> BOOST_PP_SEQ_TO_TUPLE(item));

-UNORDERED_AUTO_TEST(equality_size_tests)
-{
+  UNORDERED_AUTO_TEST (equality_size_tests) {
    boost::unordered_set<int> x1, x2;
    BOOST_TEST(x1 == x2);
    BOOST_TEST(!(x1 != x2));
@@ -88,61 +86,54 @@ UNORDERED_AUTO_TEST(equality_size_tests)
    BOOST_TEST(!(x1 == x2));
    BOOST_TEST(x2 != x1);
    BOOST_TEST(!(x2 == x1));
-}
+  }

-UNORDERED_AUTO_TEST(equality_key_value_tests)
-{
+  UNORDERED_AUTO_TEST (equality_key_value_tests) {
    UNORDERED_EQUALITY_MULTISET_TEST((1), !=, (2))
    UNORDERED_EQUALITY_SET_TEST((2), ==, (2))
    UNORDERED_EQUALITY_MAP_TEST(((1)(1))((2)(1)), !=, ((1)(1))((3)(1)))
-}
+  }

-UNORDERED_AUTO_TEST(equality_collision_test)
-{
+  UNORDERED_AUTO_TEST (equality_collision_test) {
    UNORDERED_EQUALITY_MULTISET_TEST((1), !=, (501))
    UNORDERED_EQUALITY_MULTISET_TEST((1)(251), !=, (1)(501))
    UNORDERED_EQUALITY_MULTIMAP_TEST(((251)(1))((1)(1)), !=, ((501)(1))((1)(1)))
    UNORDERED_EQUALITY_MULTISET_TEST((1)(501), ==, (1)(501))
    UNORDERED_EQUALITY_SET_TEST((1)(501), ==, (501)(1))
-}
+  }

-UNORDERED_AUTO_TEST(equality_group_size_test)
-{
+  UNORDERED_AUTO_TEST (equality_group_size_test) {
    UNORDERED_EQUALITY_MULTISET_TEST((10)(20)(20), !=, (10)(10)(20))
    UNORDERED_EQUALITY_MULTIMAP_TEST(
-        ((10)(1))((20)(1))((20)(1)), !=, ((10)(1))((20)(1))((10)(1)))
+      ((10)(1))((20)(1))((20)(1)), !=, ((10)(1))((20)(1))((10)(1)))
    UNORDERED_EQUALITY_MULTIMAP_TEST(
-        ((20)(1))((10)(1))((10)(1)), ==, ((10)(1))((20)(1))((10)(1)))
-}
+      ((20)(1))((10)(1))((10)(1)), ==, ((10)(1))((20)(1))((10)(1)))
+  }

-UNORDERED_AUTO_TEST(equality_map_value_test)
-{
+  UNORDERED_AUTO_TEST (equality_map_value_test) {
    UNORDERED_EQUALITY_MAP_TEST(((1)(1)), !=, ((1)(2)))
    UNORDERED_EQUALITY_MAP_TEST(((1)(1)), ==, ((1)(1)))
    UNORDERED_EQUALITY_MULTIMAP_TEST(((1)(1)), !=, ((1)(2)))
    UNORDERED_EQUALITY_MULTIMAP_TEST(((1)(1))((1)(1)), !=, ((1)(1))((1)(2)))
    UNORDERED_EQUALITY_MULTIMAP_TEST(((1)(2))((1)(1)), ==, ((1)(1))((1)(2)))
    UNORDERED_EQUALITY_MULTIMAP_TEST(((1)(2))((1)(1)), !=, ((1)(1))((1)(3)))
-}
+  }

-UNORDERED_AUTO_TEST(equality_predicate_test)
-{
+  UNORDERED_AUTO_TEST (equality_predicate_test) {
    UNORDERED_EQUALITY_SET_TEST((1), !=, (1001))
    UNORDERED_EQUALITY_MAP_TEST(((1)(2))((1001)(1)), !=, ((1001)(2))((1)(1)))
-}
+  }

-UNORDERED_AUTO_TEST(equality_multiple_group_test)
-{
+  UNORDERED_AUTO_TEST (equality_multiple_group_test) {
    UNORDERED_EQUALITY_MULTISET_TEST(
-        (1)(1)(1)(1001)(2001)(2001)(2)(1002)(3)(1003)(2003), ==,
-        (3)(1003)(2003)(1002)(2)(2001)(2001)(1)(1001)(1)(1));
-}
+      (1)(1)(1)(1001)(2001)(2001)(2)(1002)(3)(1003)(2003), ==,
+      (3)(1003)(2003)(1002)(2)(2001)(2001)(1)(1001)(1)(1))
+  }

-// Test that equality still works when the two containers have
-// different hash functions but the same equality predicate.
+  // Test that equality still works when the two containers have
+  // different hash functions but the same equality predicate.

-UNORDERED_AUTO_TEST(equality_different_hash_test)
-{
+  UNORDERED_AUTO_TEST (equality_different_hash_test) {
    typedef boost::unordered_set<int, mod_compare, mod_compare> set;
    set set1(0, mod_compare(false), mod_compare(false));
    set set2(0, mod_compare(true), mod_compare(true));
@@ -159,7 +150,7 @@ UNORDERED_AUTO_TEST(equality_different_hash_test)
    set1.insert(20);
    set2.insert(10);
    BOOST_TEST(set1 == set2);
-}
+  }
 }

 RUN_TESTS()
--- a/Show More
+++ b/Show More