Revert "report_errors with expected failures (#51 )"

This reverts commit 02041f6c9f and https://github.com/boostorg/core/pull/51. Reason for revert: The change allows for incorrect result code returned from the process if the number of failures is a multiple of 256. This may result in test failures being taken as success by the parent process.
2019-06-26 19:35:02 +03:00
119 changed files with 424 additions and 2967 deletions
--- a/.github/workflows/posix.yml
+++ b/.github/workflows/posix.yml
@@ -1,84 +0,0 @@
-name: POSIX
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - develop
-      - feature/**
-
-env:
-  LIBRARY: core
-  UBSAN_OPTIONS: print_stacktrace=1
-
-jobs:
-  CI:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: gcc-4.7
-            cxxstd: "03,11"
-            os: ubuntu-16.04
-            install: g++-4.7
-          - toolset: gcc-4.8
-            cxxstd: "03,11"
-            os: ubuntu-16.04
-            install: g++-4.8
-          - toolset: gcc-4.9
-            cxxstd: "03,11"
-            os: ubuntu-16.04
-            install: g++-4.9
-          - toolset: gcc-5
-            cxxstd: "03,11,14,1z"
-            os: ubuntu-16.04
-          - toolset: gcc-6
-            cxxstd: "03,11,14,1z"
-            os: ubuntu-16.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
-          - toolset: gcc-9
-            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-          - toolset: gcc-10
-            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-10.15
-
-    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: |
-          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
-          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
-          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: Run tests
-        run: |
-          cd ../boost-root
-          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,51 +0,0 @@
-name: Windows
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - develop
-      - feature/**
-
-env:
-  LIBRARY: core
-
-jobs:
-  CI:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: msvc-14.1
-            cxxstd: "14,17,latest"
-            os: windows-2016
-          - toolset: msvc-14.2
-            cxxstd: "14,17,latest"
-            os: windows-2019
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Boost
-        shell: cmd
-        run: |
-          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
-          set BOOST_BRANCH=develop
-          if "%GITHUB_BASE_REF%" == "master" set BOOST_BRANCH=master
-          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}} variant=debug,release address-model=32,64
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
-# Copyright 2016-2019 Peter Dimov
+# Copyright 2016-2018 Peter Dimov
 # 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)

 language: cpp

-dist: xenial
+sudo: false
+
+python: "2.7"

 branches:
  only:
@@ -97,6 +99,7 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
+      dist: trusty
      compiler: g++-7
      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
      addons:
@@ -117,67 +120,27 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
+      compiler: g++-8
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
      addons:
        apt:
          packages:
-            - g++-9
+            - g++-8
          sources:
            - ubuntu-toolchain-r-test

-    - os: linux
-      dist: bionic
-      compiler: g++-10
-      env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,20
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - sourceline: "ppa:ubuntu-toolchain-r/test"
-
-    - os: linux
-      dist: bionic
-      compiler: g++-10
-      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,20 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - sourceline: "ppa:ubuntu-toolchain-r/test"
-
    - os: linux
      compiler: clang++
      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11

    - os: linux
-      dist: trusty
-      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
-      addons:
-        apt:
-          packages:
-            - clang-3.3
-
-    - os: linux
-      dist: trusty
-      compiler: /usr/bin/clang++
-      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
-      addons:
-        apt:
-          packages:
-            - clang-3.4
-
-    - os: linux
-      dist: trusty
      compiler: clang++-3.5
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.5
+            - libstdc++-4.9-dev
          sources:
            - ubuntu-toolchain-r-test

@@ -188,16 +151,7 @@ matrix:
        apt:
          packages:
            - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: clang++-3.7
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - clang-3.7
+            - libstdc++-4.9-dev
          sources:
            - ubuntu-toolchain-r-test

@@ -208,6 +162,7 @@ matrix:
        apt:
          packages:
            - clang-3.8
+            - libstdc++-4.9-dev
          sources:
            - ubuntu-toolchain-r-test

@@ -218,6 +173,7 @@ matrix:
        apt:
          packages:
            - clang-3.9
+            - libstdc++-4.9-dev
          sources:
            - ubuntu-toolchain-r-test

@@ -230,6 +186,7 @@ matrix:
            - clang-4.0
          sources:
            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0

    - os: linux
      compiler: clang++-5.0
@@ -240,6 +197,7 @@ matrix:
            - clang-5.0
          sources:
            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0

    - os: linux
      compiler: clang++-6.0
@@ -250,6 +208,7 @@ matrix:
            - clang-6.0
          sources:
            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0

    - os: linux
      compiler: clang++-7
@@ -260,57 +219,21 @@ matrix:
            - clang-7
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
+            - llvm-toolchain-trusty-7

    - os: linux
-      compiler: clang++-8
-      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
+      compiler: clang++-6.0
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
      addons:
        apt:
          packages:
-            - clang-8
+            - clang-6.0
+            - libstdc++-5-dev
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
+            - llvm-toolchain-trusty-6.0

    - os: linux
-      compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
-      addons:
-        apt:
-          packages:
-            - clang-9
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-10
-      env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,20
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      compiler: clang++-10
-      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,20 UBSAN_OPTIONS=print_stacktrace=1
-      addons:
-        apt:
-          packages:
-            - clang-10
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      dist: trusty
      compiler: clang++-libc++
      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
      addons:
@@ -320,7 +243,6 @@ matrix:
            - libc++abi-dev

    - os: linux
-      dist: trusty
      compiler: clang++-libc++
      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
      addons:
@@ -350,36 +272,14 @@ matrix:
      osx_image: xcode10.1

    - os: linux
-      env: CMAKE_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=core ..
-        - ctest --output-on-failure -R boost_core
-
-    - os: linux
+      compiler: g++
      env: CMAKE_SUBDIR_TEST=1
-      install:
-        - BOOST_BRANCH=develop
-        - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/config.git ../config
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/assert.git ../assert
      script:
-      - cd test/cmake_subdir_test && mkdir __build__ && cd __build__
+      - cd libs/core/test/cmake_subdir_test && mkdir __build__ && cd __build__
      - cmake ..
      - cmake --build .
      - cmake --build . --target check

-    - os: linux
-      env: CMAKE_INSTALL_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="assert;config;core" -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build . --target install
-        - cd ../libs/core/test/cmake_install_test && mkdir __build__ && cd __build__
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build .
-        - cmake --build . --target check
-
 install:
  - BOOST_BRANCH=develop
  - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
@@ -395,7 +295,6 @@ install:
  - git submodule init libs/type_traits
  - git submodule init tools/build
  - git submodule init tools/boost_install
-  - git submodule init tools/cmake
  - git submodule update --jobs 4
  - cp -r $TRAVIS_BUILD_DIR/* libs/core
  - ./bootstrap.sh
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,13 @@
-# Copyright 2018, 2019 Peter Dimov
+# Copyright 2018 Peter Dimov
 # 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

-cmake_minimum_required(VERSION 3.5...3.16)
+# Partial (add_subdirectory only) and experimental CMake support
+# Subject to change; please do not rely on the contents of this file yet

-project(boost_core VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.5)
+
+project(BoostCore LANGUAGES CXX)

 add_library(boost_core INTERFACE)
 add_library(Boost::core ALIAS boost_core)
@@ -12,20 +15,7 @@ add_library(Boost::core ALIAS boost_core)
 target_include_directories(boost_core INTERFACE include)

 target_link_libraries(boost_core
-  INTERFACE
-    Boost::assert
-    Boost::config
+    INTERFACE
+        Boost::assert
+        Boost::config
 )
-
-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_core HEADER_DIRECTORY include/)
-
-endif()
-
-if(BUILD_TESTING)
-
-  add_subdirectory(test)
-
-endif()
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,29 +16,16 @@ 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
+      TOOLSET: msvc-14.1,clang-win
      ADDRMD: 32,64
      CXXSTD: 14,17

-    # clang-win 32 bit fails to link with "unable to load mspdbcore.dll (error code: 126)"
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: clang-win
-      ADDRMD: 64
-      CXXSTD: 14,17
-
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      ADDRMD: 32,64
-      CXXSTD: 14,17,latest
-
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
      ADDPATH: C:\cygwin\bin;
      TOOLSET: gcc
--- a/doc/allocator_access.qbk
+++ b/doc/allocator_access.qbk
@@ -1,243 +0,0 @@
-[/
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-]
-
-[section Allocator Access]
-
-[simplesect Authors]
-
-* Glen Fernandes
-
-[endsimplesect]
-
-[section Overview]
-
-The header `<boost/core/allocator_access.hpp>` provides the class and function
-templates to simplify allocator use. It provides the same functionality as the
-C++ standard library `std::allocator_traits` but with individual templates for
-each allocator feature.
-
-These facilities also simplify existing libraries by avoiding having to check
-for `BOOST_NO_CXX11_ALLOCATOR` and conditionally use `std::allocator_traits`.
-
-[endsect]
-
-[section Examples]
-
-The following example shows these utilities used in the definition of
-an allocator-aware container class:
-
-```
-template<class T, class A = boost::default_allocator<T> >
-class container
-    : boost::empty_value<typename boost::allocator_rebind<A, T>::type> {
-public:
-    typedef T value_type;
-    typedef A allocator_type;
-    typedef typename boost::allocator_size_type<A>::type size_type;
-    typedef typename boost::allocator_difference_type<A>::type difference_type;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef typename boost::allocator_pointer<A>::type pointer;
-    typedef typename boost::allocator_const_pointer<A>::type const_pointer;
-    // ...
-};
-```
-
-In C++11 or above, aliases such as `boost::allocator_pointer_t<A>` can be used
-instead of `typename boost::allocator_pointer<A>::type`.
-
-[endsect]
-
-[section Reference]
-
-```
-namespace boost {
-
-template<class A>
-struct allocator_value_type;
-
-template<class A>
-using allocator_value_type_t = typename allocator_value_type<A>::type;
-
-template<class A>
-struct allocator_pointer;
-
-template<class A>
-using allocator_pointer_t = typename allocator_pointer<A>::type;
-
-template<class A>
-struct allocator_const_pointer;
-
-template<class A>
-using allocator_const_pointer_t = typename allocator_const_pointer<A>::type;
-
-template<class A>
-struct allocator_void_pointer;
-
-template<class A>
-using allocator_void_pointer_t = typename allocator_void_pointer<A>::type;
-
-template<class A>
-struct allocator_const_void_pointer;
-
-template<class A>
-using allocator_const_void_pointer_t =
-    typename allocator_const_void_pointer<A>::type;
-
-template<class A>
-struct allocator_difference_type;
-
-template<class A>
-using allocator_difference_type_t =
-    typename allocator_difference_type<A>::type;
-
-template<class A>
-struct allocator_size_type;
-
-template<class A>
-using allocator_size_type_t = typename allocator_size_type<A>::type;
-
-template<class A>
-struct allocator_propagate_on_container_copy_assignment;
-
-template<class A>
-using allocator_propagate_on_container_copy_assignment_t =
-    typename allocator_propagate_on_container_copy_assignment<A>::type;
-
-template<class A>
-struct allocator_propagate_on_container_move_assignment;
-
-template<class A>
-using allocator_propagate_on_container_move_assignment_t =
-    typename allocator_propagate_on_container_move_assignment<A>::type;
-
-template<class A>
-struct allocator_propagate_on_container_swap;
-
-template<class A>
-using allocator_propagate_on_container_swap_t =
-    typename allocator_propagate_on_container_swap<A>::type;
-
-template<class A>
-struct allocator_is_always_equal;
-
-template<class A>
-using allocator_is_always_equal_t =
-    typename allocator_is_always_equal<A>::type;
-
-template<class A, class T>
-struct allocator_rebind;
-
-template<class A, class T>
-using allocator_rebind_t = typename allocator_rebind<A, T>::type;
-
-template<class A>
-allocator_pointer_t<A> allocator_allocate(A& a, allocator_size_type_t<A> n);
-
-template<class A>
-allocator_pointer_t<A> allocator_allocate(A& a, allocator_size_type_t<A> n,
-    allocator_const_void_pointer_t<A> h);
-
-template<class A>
-void allocator_deallocate(A& a, allocator_pointer_t<A> p,
-    allocator_size_type_t<A> n);
-
-template<class A, class T, class... Args>
-void allocator_construct(A& a, T* p, Args&&... args);
-
-template<class A, class T>
-void allocator_destroy(A& a, T* p);
-
-template<class A>
-allocator_size_type_t<A> allocator_max_size(const A& a);
-
-template<class A>
-A allocator_select_on_container_copy_construction(const A& a);
-
-} // boost
-```
-
-[section Types]
-
-[variablelist
-[[`template<class A> struct allocator_value_type;`]
-[The member `type` is `A::value_type`.]]
-[[`template<class A> struct allocator_pointer;`]
-[The member `type` is `A::pointer` if valid, otherwise `A::value_type*`.]]
-[[`template<class A> struct allocator_const_pointer;`]
-[The member `type` is `A::const_pointer` if valid, otherwise
-`pointer_traits<allocator_pointer_t<A> >::rebind<const
-allocator_value_type_t<A> >`.]]
-[[`template<class A> struct allocator_void_pointer;`]
-[The member `type` is `A::void_pointer` if valid, otherwise
-`pointer_traits<allocator_pointer_t<A> >::rebind<void>`.]]
-[[`template<class A> struct allocator_const_void_pointer;`]
-[The member `type` is `A::const_void_pointer` if valid, otherwise
-`pointer_traits<allocator_pointer_t<A> >::rebind<const void>`.]]
-[[`template<class A> struct allocator_difference_type;`]
-[The member `type` is `A::difference_type` if valid, otherwise
-`pointer_traits<allocator_pointer_t<A> >::difference_type`.]]
-[[`template<class A> struct allocator_size_type;`]
-[The member `type` is `A::size_type` if valid, otherwise
-`std::make_unsigned_t<allocator_difference_type_t<A> >`.]]
-[[`template<class A> struct allocator_propagate_on_container_copy_assignment;`]
-[The member `type` is `A::propagate_on_container_copy_assignment` if valid,
-otherwise `std::false_type`.]]
-[[`template<class A> struct allocator_propagate_on_container_move_assignment;`]
-[The member `type` is `A::propagate_on_container_move_assignment` if valid,
-otherwise `std::false_type`.]]
-[[`template<class A> struct allocator_propagate_on_container_swap;`]
-[The member `type` is `A::propagate_on_container_swap` if valid, otherwise
-`std::false_type`.]]
-[[`template<class A> struct allocator_is_always_equal;`]
-[The member `type` is `A::is_always_equal` if valid, otherwise
-`std::is_empty<A>::type`.]]
-[[`template<class A, class T> struct allocator_rebind;`]
-[The member `type` is `A::rebind<T>::other` if valid, otherwise `A<T, Args>`
-if this `A` is `A<U, Args>`.]]]
-
-[endsect]
-
-[section Functions]
-
-[variablelist
-[[`template<class A>
-allocator_pointer_t<A> allocator_allocate(A& a, allocator_size_type_t<A> n);`]
-[Calls `a.allocate(n)`.]]
-[[`template<class A> allocator_pointer_t<A> allocator_allocate(A& a,
-allocator_size_type_t<A> n, allocator_const_void_pointer_t<A> hint);`]
-[Calls `a.allocate(n, hint)` if valid, otherwise calls `a.allocate(n)`.]]
-[[`template<class A> void allocator_deallocate(A& a, allocator_pointer_t<A> p,
-allocator_size_type_t<A> n);`]
-[Calls `a.deallocate(p, n)`.]]
-[[`template<class A, class T, class... Args>
-void allocator_construct(A& a, T*p, Args&&... args);`]
-[Calls `a.construct(p, std::forward<Args>(args)...)` if valid, otherwise calls
-`::new(static_cast<void*>(p)) T(std::forward<Args>(args)...)`.]]
-[[`template<class A, class T> void allocator_destroy(A& a, T* p);`]
-[Calls `a.destroy(p)` if valid, otherwise calls `p->~T()`.]]
-[[`template<class A> allocator_size_type_t<A> allocator_max_size(const A& a);`]
-[Returns `a.max_size()` if valid, otherwise returns
-`std::numeric_limits<allocator_size_type_t<A> >::max() /
-sizeof(A::value_type)`.]]
-[[`template<class A> A allocator_select_on_container_copy_construction(const
-A& a);`]
-[Returns `a.select_on_container_copy_construction()` if valid, otherwise
-returns `a`.]]]
-
-[endsect]
-
-[endsect]
-
-[section Acknowledgments]
-
-Glen Fernandes implemented the allocator access utilities.
-
-[endsect]
-
-[endsect]
--- a/doc/core.qbk
+++ b/doc/core.qbk
@@ -39,7 +39,6 @@ criteria for inclusion is that the utility component be:
 [endsect]

 [include addressof.qbk]
-[include allocator_access.qbk]
 [include alloc_construct.qbk]
 [include checked_delete.qbk]
 [include default_allocator.qbk]
@@ -56,7 +55,6 @@ criteria for inclusion is that the utility component be:
 [include noinit_adaptor.qbk]
 [include noncopyable.qbk]
 [include null_deleter.qbk]
-[include nvp.qbk]
 [include pointer_traits.qbk]
 [include quick_exit.qbk]
 [include ref.qbk]
--- a/doc/empty_value.qbk
+++ b/doc/empty_value.qbk
@@ -90,15 +90,13 @@ public:
    empty_value() = default;

    template<class... Args>
-    empty_value(empty_init_t, Args&&... args);
+    explicit empty_value(empty_init_t, Args&&... args);

    const T& get() const noexcept;

    T& get() noexcept;
 };

-inline constexpr empty_init_t empty_init{ };
-
 } /* boost */
 ```

--- a/doc/lightweight_test.qbk
+++ b/doc/lightweight_test.qbk
@@ -43,11 +43,9 @@ When using `lightweight_test.hpp`, *do not forget* to
 #define BOOST_TEST_GE(expr1, expr2) /*unspecified*/
 #define BOOST_TEST_CSTR_EQ(expr1, expr2) /*unspecified*/
 #define BOOST_TEST_CSTR_NE(expr1, expr2) /*unspecified*/
-#define BOOST_TEST_WITH(expr1, expr2, pred) /*unspecified*/
 #define BOOST_TEST_ALL_EQ(begin1, end1, begin2, end2) /* unspecified */
 #define BOOST_TEST_ALL_WITH(begin1, end1, begin2, end2, predicate) /* unspecified */
 #define BOOST_TEST_THROWS(expr, excep) /*unspecified*/
-#define BOOST_TEST_NO_THROW(expr) /*unspecified*/

 namespace boost
 {
@@ -176,17 +174,6 @@ Specialization of `BOOST_TEST_NE` which interprets `expr1` and `expr2` as pointe

 [endsect]

-[section BOOST_TEST_WITH]
-
-``
-BOOST_TEST_WITH(expr1, expr2, pred)
-``
-
-If `pred(expr1, expr2)` is not true increases the error count and outputs a
-message containing both expressions.
-
-[endsect]
-
 [section BOOST_TEST_ALL_EQ]

 ``
@@ -222,20 +209,6 @@ nothing and `expr` is not evaluated.

 [endsect]

-[section BOOST_TEST_NO_THROW]
-
-``
-BOOST_TEST_NO_THROW(expr)
-``
-
-If `BOOST_NO_EXCEPTIONS` is *not* defined and if `expr` throws an exception,
-increases the error count and outputs a message containing the expression
-and (if possible) the exception message.
-
-If `BOOST_NO_EXCEPTIONS` is defined, `expr` is evaluated.
-
-[endsect]
-
 [section report_errors]

 ``
--- a/doc/noinit_adaptor.qbk
+++ b/doc/noinit_adaptor.qbk
@@ -71,7 +71,8 @@ struct noinit_adaptor
    : A {
    template<class U>
    struct rebind {
-        typedef noinit_adaptor<allocator_rebind_t<A, U> > other;
+        typedef noinit_adaptor<typename std::allocator_traits<A>::template
+            rebind_alloc<U> > other;
    };

    noinit_adaptor() noexcept;
@@ -85,6 +86,9 @@ struct noinit_adaptor
    template<class U>
    void construct(U* p);

+    template<class U, class V, class... Args>
+    void construct(U* p, V&& v, Args&&... args);
+
    template<class U>
    void destroy(U* p);
 };
@@ -117,7 +121,7 @@ noinit_adaptor<A> noinit_adapt(const A& a) noexcept;
 [[variablelist
 [[Requires][`A` shall be constructible from `U`.]]
 [[Effects][Initializes the `A` base class with
-`static_cast<const A&>(u)`.]]]]]]
+`static_cast<const U&>(u)`.]]]]]]

 [endsect]

@@ -127,6 +131,11 @@ noinit_adaptor<A> noinit_adapt(const A& a) noexcept;
 [[`template<class U> void construct(U* p);`]
 [[variablelist
 [[Effects][`::new((void*)p) U`.]]]]]
+[[`template<class U, class V, class... Args> void construct(U* p, V&& v,
+Args&&... args);`]
+[[variablelist
+[[Effects][`::new(void*)p) U(std::forward<V>(v),
+std::forward<Args>(args)...)`.]]]]]
 [[`template<class U> void destroy(U* p);`]
 [[variablelist
 [[Effects][`p->~U()`.]]]]]]
--- a/doc/nvp.qbk
+++ b/doc/nvp.qbk
@@ -1,108 +0,0 @@
-[/
-Copyright 2019 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-]
-
-[section:nvp nvp]
-
-[section Overview]
-
-The header <boost/core/nvp.hpp> provides the class template `boost::nvp` that
-pairs a name (`const char*`) with the address of a value (`T*`). It is the new
-implementation of the NVP type previously provided by the Boost Serialization
-library. This type now lives in the Core library so that other Boost libraries
-can support named value serialization without taking a dependency on the
-Serialization library.
-
-[endsect]
-
-[section Examples]
-
-The following snippet shows use in a member serialize function:
-
-```
-template<class A>
-void serialize(A& archive, unsigned)
-{
-    archive & boost::make_nvp("x", x_) & boost::make_nvp("y", y_);
-}
-```
-
-[endsect]
-
-[section Reference]
-
-```
-namespace boost {
-
-template<class T>
-class nvp {
-public:
-    nvp(const char* name, T& value) noexcept;
-
-    const char* name() const noexcept;
-
-    T& value() const noexcept;
-
-    const T& const_value() const noexcept;
-};
-
-template<class T>
-const nvp<T> make_nvp(const char* name, T& value) noexcept;
-
-} /* boost */
-
-#define BOOST_NVP(object) ``['see below]``
-```
-
-[section Constructors]
-
-[variablelist
-[[`nvp(const char* name, T& value) noexcept;`]
-[Initializes the stored name pointer with `name` and the value pointer with
-`addressof(value)`.]]]
-
-[endsect]
-
-[section Members]
-
-[variablelist
-[[`const char* name() const noexcept;`]
-[Returns a pointer to the name.]]
-[[`T& value() const noexcept;`]
-[Returns a reference to the value.]]
-[[`const T& const_value() const noexcept;`]
-[Returns a reference to the value.]]]
-
-[endsect]
-
-[section Functions]
-
-[variablelist
-[[`template<class T> const nvp<T> make_nvp(const char* name, T& value)
-noexcept;`]
-[Returns `nvp<T>(name, value)`.]]]
-
-[endsect]
-
-[section Macros]
-
-[variablelist
-[[`#define BOOST_NVP(object) see below`]
-[Expands to `boost::make_nvp(BOOST_STRINGIZE(object), object)`.]]]
-
-[endsect]
-
-[endsect]
-
-[section History]
-
-Robert Ramey originally implemented NVP in the Serialization library. Glen
-Fernandes implemented this new (but compatible) version in the Core library.
-
-[endsect]
-
-[endsect]
--- a/include/boost/core/addressof.hpp
+++ b/include/boost/core/addressof.hpp
@@ -125,7 +125,7 @@ template<class T>
 BOOST_FORCEINLINE T*
 addressof(T& o) BOOST_NOEXCEPT
 {
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) || \
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) || \
    BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120)
    return boost::detail::addrof<T>::get(o, 0);
 #else
@@ -151,7 +151,7 @@ addressof(T (&o)[N]) BOOST_NOEXCEPT
 }
 #endif

-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 template<class T, std::size_t N>
 BOOST_FORCEINLINE
 T (*addressof(T (&o)[N]) BOOST_NOEXCEPT)[N]
--- a/include/boost/core/alloc_construct.hpp
+++ b/include/boost/core/alloc_construct.hpp
@@ -12,11 +12,12 @@ Distributed under the Boost Software License, Version 1.0.

 namespace boost {

+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class A, class T>
 inline void
 alloc_destroy(A& a, T* p)
 {
-    boost::allocator_destroy(a, p);
+    std::allocator_traits<A>::destroy(a, p);
 }

 template<class A, class T>
@@ -24,25 +25,26 @@ inline void
 alloc_destroy_n(A& a, T* p, std::size_t n)
 {
    while (n > 0) {
-        boost::allocator_destroy(a, p + --n);
+        std::allocator_traits<A>::destroy(a, p + --n);
    }
 }
-
+#else
 template<class A, class T>
 inline void
-alloc_destroy(noinit_adaptor<A>&, T* p)
+alloc_destroy(A&, T* p)
 {
    p->~T();
 }

 template<class A, class T>
 inline void
-alloc_destroy_n(noinit_adaptor<A>&, T* p, std::size_t n)
+alloc_destroy_n(A&, T* p, std::size_t n)
 {
    while (n > 0) {
        p[--n].~T();
    }
 }
+#endif

 namespace detail {

@@ -73,11 +75,12 @@ private:

 } /* detail */

+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
 template<class A, class T>
 inline void
 alloc_construct(A& a, T* p)
 {
-    boost::allocator_construct(a, p);
+    std::allocator_traits<A>::construct(a, p);
 }

 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
@@ -86,7 +89,7 @@ template<class A, class T, class U, class... V>
 inline void
 alloc_construct(A& a, T* p, U&& u, V&&... v)
 {
-    boost::allocator_construct(a, p, std::forward<U>(u),
+    std::allocator_traits<A>::construct(a, p, std::forward<U>(u),
        std::forward<V>(v)...);
 }
 #else
@@ -94,7 +97,7 @@ template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, U&& u)
 {
-    boost::allocator_construct(a, p, std::forward<U>(u));
+    std::allocator_traits<A>::construct(a, p, std::forward<U>(u));
 }
 #endif
 #else
@@ -102,14 +105,14 @@ template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, const U& u)
 {
-    boost::allocator_construct(a, p, u);
+    std::allocator_traits<A>::construct(a, p, u);
 }

 template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, U& u)
 {
-    boost::allocator_construct(a, p, u);
+    std::allocator_traits<A>::construct(a, p, u);
 }
 #endif

@@ -119,7 +122,7 @@ alloc_construct_n(A& a, T* p, std::size_t n)
 {
    detail::alloc_destroyer<A, T> hold(a, p);
    for (std::size_t& i = hold.size(); i < n; ++i) {
-        boost::allocator_construct(a, p + i);
+        std::allocator_traits<A>::construct(a, p + i);
    }
    hold.size() = 0;
 }
@@ -130,7 +133,7 @@ alloc_construct_n(A& a, T* p, std::size_t n, const T* l, std::size_t m)
 {
    detail::alloc_destroyer<A, T> hold(a, p);
    for (std::size_t& i = hold.size(); i < n; ++i) {
-        boost::allocator_construct(a, p + i, l[i % m]);
+        std::allocator_traits<A>::construct(a, p + i, l[i % m]);
    }
    hold.size() = 0;
 }
@@ -141,10 +144,17 @@ alloc_construct_n(A& a, T* p, std::size_t n, I b)
 {
    detail::alloc_destroyer<A, T> hold(a, p);
    for (std::size_t& i = hold.size(); i < n; void(++i), void(++b)) {
-        boost::allocator_construct(a, p + i, *b);
+        std::allocator_traits<A>::construct(a, p + i, *b);
    }
    hold.size() = 0;
 }
+#else
+template<class A, class T>
+inline void
+alloc_construct(A&, T* p)
+{
+    ::new(static_cast<void*>(p)) T();
+}

 template<class A, class T>
 inline void
@@ -153,6 +163,49 @@ alloc_construct(noinit_adaptor<A>&, T* p)
    ::new(static_cast<void*>(p)) T;
 }

+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+template<class A, class T, class U, class... V>
+inline void
+alloc_construct(A&, T* p, U&& u, V&&... v)
+{
+    ::new(static_cast<void*>(p)) T(std::forward<U>(u), std::forward<V>(v)...);
+}
+#else
+template<class A, class T, class U>
+inline void
+alloc_construct(A& a, T* p, U&& u)
+{
+    ::new(static_cast<void*>(p)) T(std::forward<U>(u));
+}
+#endif
+#else
+template<class A, class T, class U>
+inline void
+alloc_construct(A&, T* p, const U& u)
+{
+    ::new(static_cast<void*>(p)) T(u);
+}
+
+template<class A, class T, class U>
+inline void
+alloc_construct(A&, T* p, U& u)
+{
+    ::new(static_cast<void*>(p)) T(u);
+}
+#endif
+
+template<class A, class T>
+inline void
+alloc_construct_n(A& a, T* p, std::size_t n)
+{
+    detail::alloc_destroyer<A, T> hold(a, p);
+    for (std::size_t& i = hold.size(); i < n; ++i) {
+        ::new(static_cast<void*>(p + i)) T();
+    }
+    hold.size() = 0;
+}
+
 template<class A, class T>
 inline void
 alloc_construct_n(noinit_adaptor<A>& a, T* p, std::size_t n)
@@ -164,6 +217,29 @@ alloc_construct_n(noinit_adaptor<A>& a, T* p, std::size_t n)
    hold.size() = 0;
 }

+template<class A, class T>
+inline void
+alloc_construct_n(A& a, T* p, std::size_t n, const T* l, std::size_t m)
+{
+    detail::alloc_destroyer<A, T> hold(a, p);
+    for (std::size_t& i = hold.size(); i < n; ++i) {
+        ::new(static_cast<void*>(p + i)) T(l[i % m]);
+    }
+    hold.size() = 0;
+}
+
+template<class A, class T, class I>
+inline void
+alloc_construct_n(A& a, T* p, std::size_t n, I b)
+{
+    detail::alloc_destroyer<A, T> hold(a, p);
+    for (std::size_t& i = hold.size(); i < n; void(++i), void(++b)) {
+        ::new(static_cast<void*>(p + i)) T(*b);
+    }
+    hold.size() = 0;
+}
+#endif
+
 } /* boost */

 #endif
--- a/include/boost/core/allocator_access.hpp
+++ b/include/boost/core/allocator_access.hpp
@@ -1,633 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#ifndef BOOST_CORE_ALLOCATOR_ACCESS_HPP
-#define BOOST_CORE_ALLOCATOR_ACCESS_HPP
-
-#include <boost/config.hpp>
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-#include <boost/core/pointer_traits.hpp>
-#if !defined(BOOST_MSVC)
-#include <limits>
-#else
-#include <memory>
-#endif
-#include <type_traits>
-#endif
-#include <new>
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-#include <utility>
-#endif
-
-namespace boost {
-namespace detail {
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-struct alloc_false {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-#else
-template<class>
-struct alloc_void {
-    typedef void type;
-};
-#endif
-
-} /* detail */
-
-template<class A>
-struct allocator_value_type {
-    typedef typename A::value_type type;
-};
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_pointer {
-    typedef typename A::pointer type;
-};
-#elif defined(BOOST_MSVC)
-template<class A>
-struct allocator_pointer {
-    typedef typename std::allocator_traits<A>::pointer type;
-};
-#else
-template<class A, class = void>
-struct allocator_pointer {
-    typedef typename A::value_type* type;
-};
-
-template<class A>
-struct allocator_pointer<A,
-    typename detail::alloc_void<typename A::pointer>::type> {
-    typedef typename A::pointer type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_const_pointer {
-    typedef typename A::const_pointer type;
-};
-#elif defined(BOOST_MSVC)
-template<class A>
-struct allocator_const_pointer {
-    typedef typename std::allocator_traits<A>::const_pointer type;
-};
-#else
-template<class A, class = void>
-struct allocator_const_pointer {
-    typedef typename pointer_traits<typename
-        allocator_pointer<A>::type>::template
-            rebind_to<const typename A::value_type>::type type;
-};
-
-template<class A>
-struct allocator_const_pointer<A,
-    typename detail::alloc_void<typename A::const_pointer>::type> {
-    typedef typename A::const_pointer type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_void_pointer {
-    typedef typename A::template rebind<void>::other::pointer type;
-};
-#else
-template<class A, class = void>
-struct allocator_void_pointer {
-     typedef typename pointer_traits<typename
-        allocator_pointer<A>::type>::template
-            rebind_to<void>::type type;
-};
-
-template<class A>
-struct allocator_void_pointer<A,
-    typename detail::alloc_void<typename A::void_pointer>::type> {
-    typedef typename A::void_pointer type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_const_void_pointer {
-    typedef typename A::template rebind<void>::other::const_pointer type;
-};
-#else
-template<class A, class = void>
-struct allocator_const_void_pointer {
-     typedef typename pointer_traits<typename
-        allocator_pointer<A>::type>::template
-            rebind_to<const void>::type type;
-};
-
-template<class A>
-struct allocator_const_void_pointer<A,
-    typename detail::alloc_void<typename A::const_void_pointer>::type> {
-    typedef typename A::const_void_pointer type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_difference_type {
-    typedef typename A::difference_type type;
-};
-#elif defined(BOOST_MSVC)
-template<class A>
-struct allocator_difference_type {
-    typedef typename std::allocator_traits<A>::difference_type type;
-};
-#else
-template<class A, class = void>
-struct allocator_difference_type {
-    typedef typename pointer_traits<typename
-        allocator_pointer<A>::type>::difference_type type;
-};
-
-template<class A>
-struct allocator_difference_type<A,
-    typename detail::alloc_void<typename A::difference_type>::type> {
-    typedef typename A::difference_type type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_size_type {
-    typedef typename A::size_type type;
-};
-#elif defined(BOOST_MSVC)
-template<class A>
-struct allocator_size_type {
-    typedef typename std::allocator_traits<A>::size_type type;
-};
-#else
-template<class A, class = void>
-struct allocator_size_type {
-    typedef typename std::make_unsigned<typename
-        allocator_difference_type<A>::type>::type type;
-};
-
-template<class A>
-struct allocator_size_type<A,
-    typename detail::alloc_void<typename A::size_type>::type> {
-    typedef typename A::size_type type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_propagate_on_container_copy_assignment {
-    typedef detail::alloc_false type;
-};
-#else
-template<class A, class = void>
-struct allocator_propagate_on_container_copy_assignment {
-    typedef std::false_type type;
-};
-
-template<class A>
-struct allocator_propagate_on_container_copy_assignment<A,
-    typename detail::alloc_void<typename
-        A::propagate_on_container_copy_assignment>::type> {
-    typedef typename A::propagate_on_container_copy_assignment type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_propagate_on_container_move_assignment {
-    typedef detail::alloc_false type;
-};
-#else
-template<class A, class = void>
-struct allocator_propagate_on_container_move_assignment {
-    typedef std::false_type type;
-};
-
-template<class A>
-struct allocator_propagate_on_container_move_assignment<A,
-    typename detail::alloc_void<typename
-        A::propagate_on_container_move_assignment>::type> {
-    typedef typename A::propagate_on_container_move_assignment type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_propagate_on_container_swap {
-    typedef detail::alloc_false type;
-};
-#else
-template<class A, class = void>
-struct allocator_propagate_on_container_swap {
-    typedef std::false_type type;
-};
-
-template<class A>
-struct allocator_propagate_on_container_swap<A,
-    typename detail::alloc_void<typename
-        A::propagate_on_container_swap>::type> {
-    typedef typename A::propagate_on_container_swap type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-struct allocator_is_always_equal {
-    typedef detail::alloc_false type;
-};
-#else
-template<class A, class = void>
-struct allocator_is_always_equal {
-    typedef typename std::is_empty<A>::type type;
-};
-
-template<class A>
-struct allocator_is_always_equal<A,
-    typename detail::alloc_void<typename A::is_always_equal>::type> {
-    typedef typename A::is_always_equal type;
-};
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A, class T>
-struct allocator_rebind {
-    typedef typename A::template rebind<T>::other type;
-};
-#elif defined(BOOST_MSVC)
-template<class A, class T>
-struct allocator_rebind {
-    typedef typename std::allocator_traits<A>::template rebind_alloc<T> type;
-};
-#else
-namespace detail {
-
-template<class, class>
-struct alloc_to { };
-
-template<template<class, class...> class A, class T, class U, class... V>
-struct alloc_to<A<U, V...>, T> {
-    typedef A<T, V...> type;
-};
-
-} /* detail */
-
-template<class A, class T, class = void>
-struct allocator_rebind {
-    typedef typename detail::alloc_to<A, T>::type type;
-};
-
-template<class A, class T>
-struct allocator_rebind<A, T,
-    typename detail::alloc_void<typename A::template rebind<T>::other>::type> {
-    typedef typename A::template rebind<T>::other type;
-};
-#endif
-
-template<class A>
-inline typename allocator_pointer<A>::type
-allocator_allocate(A& a, typename allocator_size_type<A>::type n)
-{
-    return a.allocate(n);
-}
-
-template<class A>
-inline void
-allocator_deallocate(A& a, typename allocator_pointer<A>::type p,
-    typename allocator_size_type<A>::type n)
-{
-    a.deallocate(p, n);
-}
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-inline typename allocator_pointer<A>::type
-allocator_allocate(A& a, typename allocator_size_type<A>::type n,
-    typename allocator_const_void_pointer<A>::type h)
-{
-    return a.allocate(n, h);
-}
-#elif defined(BOOST_MSVC)
-template<class A>
-inline typename allocator_pointer<A>::type
-allocator_allocate(A& a, typename allocator_size_type<A>::type n,
-    typename allocator_const_void_pointer<A>::type h)
-{
-    return std::allocator_traits<A>::allocate(a, n, h);
-}
-#else
-namespace detail {
-
-template<class, class, class, class = void>
-struct alloc_has_allocate {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-
-template<class A, class N, class H>
-struct alloc_has_allocate<A, N, H,
-    typename alloc_void<decltype(std::declval<A&>().allocate(std::declval<N>(),
-        std::declval<H>()))>::type> {
-    BOOST_STATIC_CONSTEXPR bool value = true;
-};
-
-} /* detail */
-
-template<class A>
-inline typename std::enable_if<detail::alloc_has_allocate<A,
-    typename allocator_size_type<A>::type,
-        typename allocator_const_void_pointer<A>::type>::value,
-            typename allocator_pointer<A>::type>::type
-allocator_allocate(A& a, typename allocator_size_type<A>::type n,
-    typename allocator_const_void_pointer<A>::type h)
-{
-    return a.allocate(n, h);
-}
-
-template<class A>
-inline typename std::enable_if<!detail::alloc_has_allocate<A,
-    typename allocator_size_type<A>::type,
-        typename allocator_const_void_pointer<A>::type>::value,
-            typename allocator_pointer<A>::type>::type
-allocator_allocate(A& a, typename allocator_size_type<A>::type n,
-    typename allocator_const_void_pointer<A>::type)
-{
-    return a.allocate(n);
-}
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A, class T>
-inline void
-allocator_construct(A&, T* p)
-{
-    ::new((void*)p) T();
-}
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-template<class A, class T, class V, class... Args>
-inline void
-allocator_construct(A&, T* p, V&& v, Args&&... args)
-{
-    ::new((void*)p) T(std::forward<V>(v), std::forward<Args>(args)...);
-}
-#else
-template<class A, class T, class V>
-inline void
-allocator_construct(A&, T* p, V&& v)
-{
-    ::new((void*)p) T(std::forward<V>(v));
-}
-#endif
-#else
-template<class A, class T, class V>
-inline void
-allocator_construct(A&, T* p, const V& v)
-{
-    ::new((void*)p) T(v);
-}
-
-template<class A, class T, class V>
-inline void
-allocator_construct(A&, T* p, V& v)
-{
-    ::new((void*)p) T(v);
-}
-#endif
-#elif defined(BOOST_MSVC)
-template<class A, class T, class... Args>
-inline void
-allocator_construct(A& a, T* p, Args&&... args)
-{
-    std::allocator_traits<A>::construct(a, p, std::forward<Args>(args)...);
-}
-#else
-namespace detail {
-
-template<class, class, class, class...>
-struct alloc_has_construct {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-
-template<class A, class T, class... Args>
-struct alloc_has_construct<typename alloc_void<decltype(std::declval<A
-    &>().construct(std::declval<T*>(), std::declval<Args&&>()...))>::type,
-        A, T, Args...> {
-    BOOST_STATIC_CONSTEXPR bool value = true;
-};
-
-} /* detail */
-
-template<class A, class T, class... Args>
-inline typename std::enable_if<detail::alloc_has_construct<void, A, T,
-    Args...>::value>::type
-allocator_construct(A& a, T* p, Args&&... args)
-{
-    a.construct(p, std::forward<Args>(args)...);
-}
-
-template<class A, class T, class... Args>
-inline typename std::enable_if<!detail::alloc_has_construct<void, A, T,
-    Args...>::value>::type
-allocator_construct(A&, T* p, Args&&... args)
-{
-    ::new((void*)p) T(std::forward<Args>(args)...);
-}
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A, class T>
-inline void
-allocator_destroy(A&, T* p)
-{
-    p->~T();
-    (void)p;
-}
-#elif defined(BOOST_MSVC)
-template<class A, class T>
-inline void
-allocator_destroy(A& a, T* p)
-{
-    std::allocator_traits<A>::destroy(a, p);
-}
-#else
-namespace detail {
-
-template<class, class, class = void>
-struct alloc_has_destroy {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-
-template<class A, class T>
-struct alloc_has_destroy<A, T,
-    typename alloc_void<decltype(std::declval<A
-        &>().destroy(std::declval<T*>()))>::type> {
-    BOOST_STATIC_CONSTEXPR bool value = true;
-};
-
-} /* detail */
-
-template<class A, class T>
-inline typename std::enable_if<detail::alloc_has_destroy<A, T>::value>::type
-allocator_destroy(A& a, T* p)
-{
-    a.destroy(p);
-}
-
-template<class A, class T>
-inline typename std::enable_if<!detail::alloc_has_destroy<A, T>::value>::type
-allocator_destroy(A&, T* p)
-{
-    p->~T();
-    (void)p;
-}
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-inline typename allocator_size_type<A>::type
-allocator_max_size(const A& a)
-{
-    return a.max_size();
-}
-#elif defined(BOOST_MSVC)
-template<class A>
-inline typename allocator_size_type<A>::type
-allocator_max_size(const A& a)
-{
-    return std::allocator_traits<A>::max_size(a);
-}
-#else
-namespace detail {
-
-template<class, class = void>
-struct alloc_has_max_size {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-
-template<class A>
-struct alloc_has_max_size<A,
-    typename alloc_void<decltype(std::declval<const
-        A&>().max_size())>::type> {
-    BOOST_STATIC_CONSTEXPR bool value = true;
-};
-
-} /* detail */
-
-template<class A>
-inline typename std::enable_if<detail::alloc_has_max_size<A>::value,
-    typename allocator_size_type<A>::type>::type
-allocator_max_size(const A& a)
-{
-    return a.max_size();
-}
-
-template<class A>
-inline typename std::enable_if<!detail::alloc_has_max_size<A>::value,
-    typename allocator_size_type<A>::type>::type
-allocator_max_size(const A&)
-{
-    return (std::numeric_limits<typename
-        allocator_size_type<A>::type>::max)() / sizeof(typename A::value_type);
-}
-#endif
-
-#if defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class A>
-inline A
-allocator_select_on_container_copy_construction(const A& a)
-{
-    return a;
-}
-#elif defined(BOOST_MSVC)
-template<class A>
-inline A
-allocator_select_on_container_copy_construction(const A& a)
-{
-    return std::allocator_traits<A>::select_on_container_copy_construction(a);
-}
-#else
-namespace detail {
-
-template<class, class = void>
-struct alloc_has_soccc {
-    BOOST_STATIC_CONSTEXPR bool value = false;
-};
-
-template<class A>
-struct alloc_has_soccc<A,
-    typename alloc_void<decltype(std::declval<const
-        A&>().select_on_container_copy_construction())>::type> {
-    BOOST_STATIC_CONSTEXPR bool value = true;
-};
-
-} /* detail */
-
-template<class A>
-inline typename std::enable_if<detail::alloc_has_soccc<A>::value, A>::type
-allocator_select_on_container_copy_construction(const A& a)
-{
-    return a.select_on_container_copy_construction();
-}
-
-template<class A>
-inline typename std::enable_if<!detail::alloc_has_soccc<A>::value, A>::type
-allocator_select_on_container_copy_construction(const A& a)
-{
-    return a;
-}
-#endif
-
-#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
-template<class A>
-using allocator_value_type_t = typename allocator_value_type<A>::type;
-
-template<class A>
-using allocator_pointer_t = typename allocator_pointer<A>::type;
-
-template<class A>
-using allocator_const_pointer_t = typename allocator_const_pointer<A>::type;
-
-template<class A>
-using allocator_void_pointer_t = typename allocator_void_pointer<A>::type;
-
-template<class A>
-using allocator_const_void_pointer_t =
-    typename allocator_const_void_pointer<A>::type;
-
-template<class A>
-using allocator_difference_type_t =
-    typename allocator_difference_type<A>::type;
-
-template<class A>
-using allocator_size_type_t = typename allocator_size_type<A>::type;
-
-template<class A>
-using allocator_propagate_on_container_copy_assignment_t =
-    typename allocator_propagate_on_container_copy_assignment<A>::type;
-
-template<class A>
-using allocator_propagate_on_container_move_assignment_t =
-    typename allocator_propagate_on_container_move_assignment<A>::type;
-
-template<class A>
-using allocator_propagate_on_container_swap_t =
-    typename allocator_propagate_on_container_swap<A>::type;
-
-template<class A>
-using allocator_is_always_equal_t =
-    typename allocator_is_always_equal<A>::type;
-
-template<class A, class T>
-using allocator_rebind_t = typename allocator_rebind<A, T>::type;
-#endif
-
-} /* boost */
-
-#endif
--- a/include/boost/core/default_allocator.hpp
+++ b/include/boost/core/default_allocator.hpp
@@ -10,11 +10,16 @@ Distributed under the Boost Software License, Version 1.0.

 #include <boost/config.hpp>
 #include <new>
+#include <climits>
+
+#if defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 60000
+#define BOOST_CORE_NO_CXX11_ALLOCATOR
+#endif

 namespace boost {

 #if defined(BOOST_NO_EXCEPTIONS)
-BOOST_NORETURN void throw_exception(const std::exception&);
+void throw_exception(const std::exception&);
 #endif

 namespace default_ {
@@ -76,9 +81,16 @@ struct default_allocator {
    BOOST_CONSTEXPR default_allocator(const default_allocator<U>&)
        BOOST_NOEXCEPT { }

+#if defined(PTRDIFF_MAX) && defined(SIZE_MAX)
    BOOST_CONSTEXPR std::size_t max_size() const BOOST_NOEXCEPT {
-        return static_cast<std::size_t>(-1) / (2 < sizeof(T) ? sizeof(T) : 2);
+        return PTRDIFF_MAX < SIZE_MAX / sizeof(T)
+            ? PTRDIFF_MAX : SIZE_MAX / sizeof(T);
    }
+#else
+    BOOST_CONSTEXPR std::size_t max_size() const BOOST_NOEXCEPT {
+        return ~static_cast<std::size_t>(0) / sizeof(T);
+    }
+#endif

 #if !defined(BOOST_NO_EXCEPTIONS)
    T* allocate(std::size_t n) {
@@ -108,8 +120,7 @@ struct default_allocator {
    }
 #endif

-#if (defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 60000) || \
-    defined(BOOST_NO_CXX11_ALLOCATOR)
+#if defined(BOOST_NO_CXX11_ALLOCATOR) || defined(BOOST_CORE_NO_CXX11_ALLOCATOR)
    template<class U, class V>
    void construct(U* p, const V& v) {
        ::new(p) U(v);
@@ -118,7 +129,6 @@ struct default_allocator {
    template<class U>
    void destroy(U* p) {
        p->~U();
-        (void)p;
    }
 #endif
 };
--- a/include/boost/core/empty_value.hpp
+++ b/include/boost/core/empty_value.hpp
@@ -59,9 +59,9 @@ public:

 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template<class U, class... Args>
-    empty_value(boost::empty_init_t, U&& value, Args&&... args)
-        : value_(std::forward<U>(value), std::forward<Args>(args)...) { }
+    template<class... Args>
+    explicit empty_value(boost::empty_init_t, Args&&... args)
+        : value_(std::forward<Args>(args)...) { }
 #else
    template<class U>
    empty_value(boost::empty_init_t, U&& value)
@@ -107,9 +107,9 @@ public:

 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-    template<class U, class... Args>
-    empty_value(boost::empty_init_t, U&& value, Args&&... args)
-        : T(std::forward<U>(value), std::forward<Args>(args)...) { }
+    template<class... Args>
+    explicit empty_value(boost::empty_init_t, Args&&... args)
+        : T(std::forward<Args>(args)...) { }
 #else
    template<class U>
    empty_value(boost::empty_init_t, U&& value)
@@ -139,8 +139,6 @@ public:

 using empty_::empty_value;

-BOOST_INLINE_CONSTEXPR empty_init_t empty_init = empty_init_t();
-
 } /* boost */

 #endif
--- a/include/boost/core/lightweight_test.hpp
+++ b/include/boost/core/lightweight_test.hpp
@@ -24,17 +24,12 @@

 #include <boost/current_function.hpp>
 #include <boost/config.hpp>
-#include <exception>
 #include <iostream>
 #include <iterator>
 #include <cstdlib>
 #include <cstring>
 #include <cstddef>

-#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
-# include <crtdbg.h>
-#endif
-
 //  IDE's like Visual Studio perform better if output goes to std::cout or
 //  some other stream, so allow user to configure output stream:
 #ifndef BOOST_LIGHTWEIGHT_TEST_OSTREAM
@@ -53,13 +48,7 @@ public:
        : report_(false)
        , errors_(0) {
 #if defined(_MSC_VER) && (_MSC_VER > 1310)
-        // disable message boxes on assert(), abort()
        ::_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
-#endif
-#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
-        // disable message boxes on iterator debugging violations
-        _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
-        _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
 #endif
    }

@@ -94,21 +83,12 @@ inline int& test_errors()
    return test_results().errors();
 }

-inline bool test_impl(char const * expr, char const * file, int line, char const * function, bool v)
+inline void test_failed_impl(char const * expr, char const * file, int line, char const * function)
 {
-    if( v )
-    {
-        test_results();
-        return true;
-    }
-    else
-    {
-        BOOST_LIGHTWEIGHT_TEST_OSTREAM
-          << file << "(" << line << "): test '" << expr << "' failed in function '"
-          << function << "'" << std::endl;
-        ++test_results().errors();
-        return false;
-    }
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM
+      << file << "(" << line << "): test '" << expr << "' failed in function '"
+      << function << "'" << std::endl;
+    ++test_results().errors();
 }

 inline void error_impl(char const * msg, char const * file, int line, char const * function)
@@ -119,41 +99,25 @@ inline void error_impl(char const * msg, char const * file, int line, char const
    ++test_results().errors();
 }

-inline void throw_failed_impl(const char* expr, char const * excep, char const * file, int line, char const * function)
+inline void throw_failed_impl(char const * excep, char const * file, int line, char const * function)
 {
   BOOST_LIGHTWEIGHT_TEST_OSTREAM
-    << file << "(" << line << "): expression '" << expr << "' did not throw exception '" << excep << "' in function '"
+    << file << "(" << line << "): Exception '" << excep << "' not thrown in function '"
    << function << "'" << std::endl;
   ++test_results().errors();
 }

-inline void no_throw_failed_impl(const char* expr, const char* file, int line, const char* function)
-{
-    BOOST_LIGHTWEIGHT_TEST_OSTREAM
-        << file << "(" << line << "): expression '" << expr << "' threw an exception in function '"
-        << function << "'" << std::endl;
-   ++test_results().errors();
-}
-
-inline void no_throw_failed_impl(const char* expr, const char* what, const char* file, int line, const char* function)
-{
-    BOOST_LIGHTWEIGHT_TEST_OSTREAM
-        << file << "(" << line << "): expression '" << expr << "' threw an exception in function '"
-        << function << "': " << what << std::endl;
-   ++test_results().errors();
-}
-
 // In the comparisons below, it is possible that T and U are signed and unsigned integer types, which generates warnings in some compilers.
 // A cleaner fix would require common_type trait or some meta-programming, which would introduce a dependency on Boost.TypeTraits. To avoid
 // the dependency we just disable the warnings.
-#if defined(__clang__) && defined(__has_warning)
+#if defined(_MSC_VER)
+# pragma warning(push)
+# pragma warning(disable: 4389)
+#elif defined(__clang__) && defined(__has_warning)
 # if __has_warning("-Wsign-compare")
 #  pragma clang diagnostic push
 #  pragma clang diagnostic ignored "-Wsign-compare"
 # endif
-#elif defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4389)
 #elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wsign-compare"
@@ -173,111 +137,67 @@ template<class T> inline const void* test_output_impl(T volatile* v) { return co
 inline const void* test_output_impl(std::nullptr_t) { return nullptr; }
 #endif

-// predicates
-
-struct lw_test_eq
-{
+struct lw_test_eq {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t == u; }
+    static const char* op() { return "=="; }
 };

-struct lw_test_ne
-{
+struct lw_test_ne {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t != u; }
+    static const char* op() { return "!="; }
 };

-struct lw_test_lt
-{
+struct lw_test_lt {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t < u; }
+    static const char* op() { return "<"; }
 };

-struct lw_test_le
-{
+struct lw_test_le {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t <= u; }
+    static const char* op() { return "<="; }
 };

-struct lw_test_gt
-{
+struct lw_test_gt {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t > u; }
+    static const char* op() { return ">"; }
 };

-struct lw_test_ge
-{
+struct lw_test_ge {
    template <typename T, typename U>
    bool operator()(const T& t, const U& u) const { return t >= u; }
+    static const char* op() { return ">="; }
 };

-// lwt_predicate_name
-
-template<class T> char const * lwt_predicate_name( T const& )
-{
-    return "~=";
-}
-
-inline char const * lwt_predicate_name( lw_test_eq const& )
-{
-    return "==";
-}
-
-inline char const * lwt_predicate_name( lw_test_ne const& )
-{
-    return "!=";
-}
-
-inline char const * lwt_predicate_name( lw_test_lt const& )
-{
-    return "<";
-}
-
-inline char const * lwt_predicate_name( lw_test_le const& )
-{
-    return "<=";
-}
-
-inline char const * lwt_predicate_name( lw_test_gt const& )
-{
-    return ">";
-}
-
-inline char const * lwt_predicate_name( lw_test_ge const& )
-{
-    return ">=";
-}
-
-//
-
 template<class BinaryPredicate, class T, class U>
-inline bool test_with_impl(BinaryPredicate pred, char const * expr1, char const * expr2,
+inline void test_with_impl(BinaryPredicate pred, char const * expr1, char const * expr2,
                           char const * file, int line, char const * function,
                           T const & t, U const & u)
 {
    if( pred(t, u) )
    {
        test_results();
-        return true;
    }
    else
    {
        BOOST_LIGHTWEIGHT_TEST_OSTREAM
-            << file << "(" << line << "): test '" << expr1 << " " << lwt_predicate_name(pred) << " " << expr2
-            << "' ('" << test_output_impl(t) << "' " << lwt_predicate_name(pred) << " '" << test_output_impl(u)
+            << file << "(" << line << "): test '" << expr1 << " " << pred.op() << " " << expr2
+            << "' ('" << test_output_impl(t) << "' " << pred.op() << " '" << test_output_impl(u)
            << "') failed in function '" << function << "'" << std::endl;
        ++test_results().errors();
-        return false;
    }
 }

-inline bool test_cstr_eq_impl( char const * expr1, char const * expr2,
+inline void test_cstr_eq_impl( char const * expr1, char const * expr2,
  char const * file, int line, char const * function, char const * const t, char const * const u )
 {
    if( std::strcmp(t, u) == 0 )
    {
        test_results();
-        return true;
    }
    else
    {
@@ -285,17 +205,15 @@ inline bool test_cstr_eq_impl( char const * expr1, char const * expr2,
            << file << "(" << line << "): test '" << expr1 << " == " << expr2 << "' ('" << t
            << "' == '" << u << "') failed in function '" << function << "'" << std::endl;
        ++test_results().errors();
-        return false;
    }
 }

-inline bool test_cstr_ne_impl( char const * expr1, char const * expr2,
+inline void test_cstr_ne_impl( char const * expr1, char const * expr2,
  char const * file, int line, char const * function, char const * const t, char const * const u )
 {
    if( std::strcmp(t, u) != 0 )
    {
        test_results();
-        return true;
    }
    else
    {
@@ -303,12 +221,11 @@ inline bool test_cstr_ne_impl( char const * expr1, char const * expr2,
            << file << "(" << line << "): test '" << expr1 << " != " << expr2 << "' ('" << t
            << "' != '" << u << "') failed in function '" << function << "'" << std::endl;
        ++test_results().errors();
-        return false;
    }
 }

 template<class FormattedOutputFunction, class InputIterator1, class InputIterator2>
-bool test_all_eq_impl(FormattedOutputFunction& output,
+void test_all_eq_impl(FormattedOutputFunction& output,
                      char const * file, int line, char const * function,
                      InputIterator1 first_begin, InputIterator1 first_end,
                      InputIterator2 second_begin, InputIterator2 second_end)
@@ -367,18 +284,16 @@ bool test_all_eq_impl(FormattedOutputFunction& output,
    if (error_count == 0)
    {
        test_results();
-        return true;
    }
    else
    {
        output << std::endl;
        ++test_results().errors();
-        return false;
    }
 }

 template<class FormattedOutputFunction, class InputIterator1, class InputIterator2, typename BinaryPredicate>
-bool test_all_with_impl(FormattedOutputFunction& output,
+void test_all_with_impl(FormattedOutputFunction& output,
                        char const * file, int line, char const * function,
                        InputIterator1 first_begin, InputIterator1 first_end,
                        InputIterator2 second_begin, InputIterator2 second_end,
@@ -438,22 +353,20 @@ bool test_all_with_impl(FormattedOutputFunction& output,
    if (error_count == 0)
    {
        test_results();
-        return true;
    }
    else
    {
        output << std::endl;
        ++test_results().errors();
-        return false;
    }
 }

-#if defined(__clang__) && defined(__has_warning)
+#if defined(_MSC_VER)
+# pragma warning(pop)
+#elif defined(__clang__) && defined(__has_warning)
 # if __has_warning("-Wsign-compare")
 #  pragma clang diagnostic pop
 # endif
-#elif defined(_MSC_VER)
-# pragma warning(pop)
 #elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
 # pragma GCC diagnostic pop
 #endif
@@ -466,31 +379,27 @@ inline int report_errors()
    result.done();

    int errors = result.errors();
-
    if( errors == 0 )
    {
        BOOST_LIGHTWEIGHT_TEST_OSTREAM
          << "No errors detected." << std::endl;
+        return 0;
    }
    else
    {
        BOOST_LIGHTWEIGHT_TEST_OSTREAM
          << errors << " error" << (errors == 1? "": "s") << " detected." << std::endl;
+        return 1;
    }
-
-    // `return report_errors();` from main only supports 8 bit exit codes
-    return errors < 256? errors: 255;
 }

 } // namespace boost

-#define BOOST_TEST(expr) ( ::boost::detail::test_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, (expr)? true: false) )
+#define BOOST_TEST(expr) ((expr)? (void)::boost::detail::test_results(): ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION))
 #define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr))

 #define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )

-#define BOOST_TEST_WITH(expr1,expr2,predicate) ( ::boost::detail::test_with_impl(predicate, #expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
-
 #define BOOST_TEST_EQ(expr1,expr2) ( ::boost::detail::test_with_impl(::boost::detail::lw_test_eq(), #expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
 #define BOOST_TEST_NE(expr1,expr2) ( ::boost::detail::test_with_impl(::boost::detail::lw_test_ne(), #expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )

@@ -506,38 +415,22 @@ inline int report_errors()
 #define BOOST_TEST_ALL_WITH(begin1, end1, begin2, end2, predicate) ( ::boost::detail::test_all_with_impl(BOOST_LIGHTWEIGHT_TEST_OSTREAM, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, begin1, end1, begin2, end2, predicate) )

 #ifndef BOOST_NO_EXCEPTIONS
-   #define BOOST_TEST_THROWS( EXPR, EXCEP )                           \
-      try {                                                           \
-         EXPR;                                                        \
-         ::boost::detail::throw_failed_impl                           \
-         (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-      }                                                               \
-      catch(EXCEP const&) {                                           \
-         ::boost::detail::test_results();                             \
-      }                                                               \
-      catch(...) {                                                    \
-         ::boost::detail::throw_failed_impl                           \
-         (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-      }                                                               \
+   #define BOOST_TEST_THROWS( EXPR, EXCEP )                    \
+      try {                                                    \
+         EXPR;                                                 \
+         ::boost::detail::throw_failed_impl                    \
+         (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+      }                                                        \
+      catch(EXCEP const&) {                                    \
+         ::boost::detail::test_results();                      \
+      }                                                        \
+      catch(...) {                                             \
+         ::boost::detail::throw_failed_impl                    \
+         (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+      }                                                        \
   //
 #else
   #define BOOST_TEST_THROWS( EXPR, EXCEP )
 #endif

-#ifndef BOOST_NO_EXCEPTIONS
-#  define BOOST_TEST_NO_THROW(EXPR)                                    \
-    try {                                                              \
-        EXPR;                                                          \
-    } catch (const std::exception& e) {                                \
-        ::boost::detail::no_throw_failed_impl                          \
-        (#EXPR, e.what(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-    } catch (...) {                                                    \
-        ::boost::detail::no_throw_failed_impl                          \
-        (#EXPR, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION);           \
-    }
-    //
-#else
-#  define BOOST_TEST_NO_THROW(EXPR) { EXPR; }
-#endif
-
 #endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_HPP
--- a/include/boost/core/lightweight_test_trait.hpp
+++ b/include/boost/core/lightweight_test_trait.hpp
@@ -126,12 +126,6 @@ template<class T1, class T2> inline void test_trait_same_impl( char const * type

 #define BOOST_TEST_TRAIT_TRUE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, true, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
 #define BOOST_TEST_TRAIT_FALSE(type) ( ::boost::detail::test_trait_impl(#type, (void(*)type)0, false, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
-
-#if defined(__GNUC__)
-// ignoring -Wvariadic-macros with #pragma doesn't work under GCC
-# pragma GCC system_header
-#endif
-
 #define BOOST_TEST_TRAIT_SAME(...) ( ::boost::detail::test_trait_same_impl(#__VA_ARGS__, ::boost::core::is_same<__VA_ARGS__>(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )

 #endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_TRAIT_HPP
--- a/include/boost/core/no_exceptions_support.hpp
+++ b/include/boost/core/no_exceptions_support.hpp
@@ -29,7 +29,7 @@
 #    define BOOST_RETHROW throw;
 #    define BOOST_CATCH_END }
 #else
-#    if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
+#    if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #        define BOOST_TRY { if ("")
 #        define BOOST_CATCH(x) else if (!"")
 #    elif !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
--- a/include/boost/core/noinit_adaptor.hpp
+++ b/include/boost/core/noinit_adaptor.hpp
@@ -8,7 +8,14 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_NOINIT_ADAPTOR_HPP
 #define BOOST_CORE_NOINIT_ADAPTOR_HPP

-#include <boost/core/allocator_access.hpp>
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+#include <memory>
+#endif
+#include <new>
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#include <utility>
+#endif

 namespace boost {

@@ -17,7 +24,12 @@ struct noinit_adaptor
    : A {
    template<class U>
    struct rebind {
-        typedef noinit_adaptor<typename allocator_rebind<A, U>::type> other;
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+        typedef noinit_adaptor<typename std::allocator_traits<A>::template
+            rebind_alloc<U> > other;
+#else
+        typedef noinit_adaptor<typename A::template rebind<U>::other> other;
+#endif
    };

    noinit_adaptor()
@@ -31,26 +43,39 @@ struct noinit_adaptor
    template<class U>
    noinit_adaptor(const U& u) BOOST_NOEXCEPT
        : A(u) { }
-
-    template<class U>
-    noinit_adaptor(U& u) BOOST_NOEXCEPT
-        : A(u) { }
 #endif

    template<class U>
    noinit_adaptor(const noinit_adaptor<U>& u) BOOST_NOEXCEPT
-        : A(static_cast<const A&>(u)) { }
+        : A(static_cast<const U&>(u)) { }

    template<class U>
    void construct(U* p) {
        ::new((void*)p) U;
    }

-#if defined(BOOST_NO_CXX11_ALLOCATOR)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+    template<class U, class V, class... Args>
+    void construct(U* p, V&& v, Args&&... args) {
+        ::new((void*)p) U(std::forward<V>(v), std::forward<Args>(args)...);
+    }
+#else
+    template<class U, class V>
+    void construct(U* p, V&& v) {
+        ::new((void*)p) U(std::forward<V>(v));
+    }
+#endif
+#else
    template<class U, class V>
    void construct(U* p, const V& v) {
        ::new((void*)p) U(v);
    }
+
+    template<class U, class V>
+    void construct(U* p, V& v) {
+        ::new((void*)p) U(v);
+    }
 #endif

    template<class U>
--- a/include/boost/core/nvp.hpp
+++ b/include/boost/core/nvp.hpp
@@ -1,57 +0,0 @@
-/*
-Copyright 2019 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#ifndef BOOST_CORE_NVP_HPP
-#define BOOST_CORE_NVP_HPP
-
-#include <boost/core/addressof.hpp>
-#include <boost/config.hpp>
-
-namespace boost {
-namespace serialization {
-
-template<class T>
-class nvp {
-public:
-    nvp(const char* n, T& v) BOOST_NOEXCEPT
-        : n_(n)
-        , v_(boost::addressof(v)) { }
-
-    const char* name() const BOOST_NOEXCEPT {
-        return n_;
-    }
-
-    T& value() const BOOST_NOEXCEPT {
-        return *v_;
-    }
-
-    const T& const_value() const BOOST_NOEXCEPT {
-        return *v_;
-    }
-
-private:
-    const char* n_;
-    T* v_;
-};
-
-template<class T>
-inline const nvp<T>
-make_nvp(const char* n, T& v) BOOST_NOEXCEPT
-{
-    return nvp<T>(n, v);
-}
-
-} /* serialization */
-
-using serialization::nvp;
-using serialization::make_nvp;
-
-} /* boost */
-
-#define BOOST_NVP(v) boost::make_nvp(BOOST_STRINGIZE(v), v)
-
-#endif
--- a/include/boost/core/pointer_traits.hpp
+++ b/include/boost/core/pointer_traits.hpp
@@ -13,7 +13,6 @@ Distributed under the Boost Software License, Version 1.0.
 #include <memory>
 #else
 #include <boost/core/addressof.hpp>
-#include <cstddef>
 #endif

 namespace boost {
--- a/include/boost/core/quick_exit.hpp
+++ b/include/boost/core/quick_exit.hpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)

 #include <boost/config.hpp>
-#include <stdlib.h>
+#include <cstdlib>

 #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)

--- a/include/boost/core/ref.hpp
+++ b/include/boost/core/ref.hpp
@@ -10,7 +10,6 @@
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 #include <boost/core/addressof.hpp>
-#include <boost/core/enable_if.hpp>

 //
 //  ref.hpp - ref/cref, useful helper functions
@@ -47,26 +46,6 @@ namespace boost

 #endif

-namespace detail
-{
-
-template< class Y, class T > struct ref_convertible
-{
-    typedef char (&yes) [1];
-    typedef char (&no)  [2];
-
-    static yes f( T* );
-    static no  f( ... );
-
-    enum _vt { value = sizeof( (f)( static_cast<Y*>(0) ) ) == sizeof(yes) };
-};
-
-struct ref_empty
-{
-};
-
-} // namespace detail
-
 // reference_wrapper

 /**
@@ -108,14 +87,6 @@ public:
 public:
 #endif

-    template<class Y> friend class reference_wrapper;
-
-    template<class Y> reference_wrapper( reference_wrapper<Y> r,
-        typename enable_if_c<boost::detail::ref_convertible<Y, T>::value,
-            boost::detail::ref_empty>::type = boost::detail::ref_empty() ): t_( r.t_ )
-    {
-    }
-
    /**
     @return The stored reference.
     @remark Does not throw.
@@ -145,7 +116,7 @@ private:
 /**
 @cond
 */
-#if defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x581) )
+#if defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x581) )
 #  define BOOST_REF_CONST
 #else
 #  define BOOST_REF_CONST const
--- a/include/boost/core/swap.hpp
+++ b/include/boost/core/swap.hpp
@@ -23,12 +23,9 @@

 #include <boost/core/enable_if.hpp>
 #include <boost/config.hpp>
-#if __cplusplus >= 201103L || defined(BOOST_DINKUMWARE_STDLIB)
-#include <utility> // for std::swap (C++11)
-#else
-#include <algorithm> // for std::swap (C++98)
-#endif
-#include <cstddef> // for std::size_t
+#include <utility> //for std::swap (C++11)
+#include <algorithm> //for std::swap (C++98)
+#include <cstddef> //for std::size_t

 namespace boost_swap_impl
 {
--- a/include/boost/core/uncaught_exceptions.hpp
+++ b/include/boost/core/uncaught_exceptions.hpp
@@ -1,5 +1,5 @@
 /*
- *          Copyright Andrey Semashev 2018 - 2020.
+ *             Copyright Andrey Semashev 2018.
 * Distributed under the Boost Software License, Version 1.0.
 *    (See accompanying file LICENSE_1_0.txt or copy at
 *          https://www.boost.org/LICENSE_1_0.txt)
@@ -26,23 +26,8 @@
 #pragma once
 #endif

-#if defined(__APPLE__)
-#include <Availability.h>
-// Apple systems only support std::uncaught_exceptions starting with specific versions:
-// - Mac OS >= 10.12
-// - iOS >= 10.0
-// - tvOS >= 10.0
-// - watchOS >= 3.0
-// https://github.com/boostorg/core/issues/80
-#if (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) && \
-    ( \
-        (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || \
-        (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
-    )
-#define BOOST_CORE_HAS_UNCAUGHT_EXCEPTIONS
-#endif
-// Visual Studio 14.0 supports N4152 std::uncaught_exceptions() but doesn't define __cpp_lib_uncaught_exceptions
-#elif (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) || \
+// Visual Studio 14 supports N4152 std::uncaught_exceptions()
+#if (defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) || \
    (defined(_MSC_VER) && _MSC_VER >= 1900)
 #define BOOST_CORE_HAS_UNCAUGHT_EXCEPTIONS
 #endif
@@ -61,11 +46,7 @@
 #if defined(BOOST_CORE_HAS_CXXABI_H)
 // MinGW GCC 4.4 seem to not work the same way the newer GCC versions do. As a result, __cxa_get_globals based implementation will always return 0.
 // Just disable it for now and fall back to std::uncaught_exception().
-// On AIX, xlclang++ does have cxxabi.h but doesn't have __cxa_get_globals (https://github.com/boostorg/core/issues/78).
-#if !( \
-        (defined(__MINGW32__) && (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 405)) || \
-        defined(__ibmxl__) \
-    )
+#if !(defined(__MINGW32__) && (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 405))
 #include <cxxabi.h>
 #include <cstring>
 #define BOOST_CORE_HAS_CXA_GET_GLOBALS
@@ -95,7 +76,7 @@ extern "C" __cxa_eh_globals* __cxa_get_globals() BOOST_NOEXCEPT_OR_NOTHROW __att
 #endif
 } // namespace __cxxabiv1
 #endif
-#endif
+#endif // !(defined(__MINGW32__) && (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 405))
 #endif // defined(BOOST_CORE_HAS_CXXABI_H)

 #if defined(_MSC_VER) && _MSC_VER >= 1400
--- a/include/boost/detail/iterator.hpp
+++ b/include/boost/detail/iterator.hpp
@@ -6,11 +6,7 @@
 #ifndef ITERATOR_DWA122600_HPP_
 #define ITERATOR_DWA122600_HPP_

-// This header is obsolete and deprecated.
-
-#include <boost/config/header_deprecated.hpp>
-
-BOOST_HEADER_DEPRECATED("<iterator>")
+// This header is obsolete and will be deprecated.

 #include <iterator>
 #if defined(__SUNPRO_CC) && (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
--- a/include/boost/detail/no_exceptions_support.hpp
+++ b/include/boost/detail/no_exceptions_support.hpp
@@ -12,10 +12,6 @@
 // The header file at this path is deprecated;
 // use boost/core/no_exceptions_support.hpp instead.

-#include <boost/config/header_deprecated.hpp>
-
-BOOST_HEADER_DEPRECATED("<boost/core/no_exceptions_support.hpp>")
-
 #include <boost/core/no_exceptions_support.hpp>

 #endif
--- a/include/boost/detail/scoped_enum_emulation.hpp
+++ b/include/boost/detail/scoped_enum_emulation.hpp
@@ -12,10 +12,6 @@
 // The header file at this path is deprecated;
 // use boost/core/scoped_enum.hpp instead.

-#include <boost/config/header_deprecated.hpp>
-
-BOOST_HEADER_DEPRECATED("<boost/core/scoped_enum.hpp>")
-
 #include <boost/core/scoped_enum.hpp>

 #endif
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,13 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core Boost::static_assert Boost::type_traits Boost::throw_exception)
-
-endif()
-
-add_subdirectory(swap)
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -35,10 +35,7 @@ compile-fail ref_rv_fail4.cpp ;
 compile-fail ref_rv_fail5.cpp ;
 compile-fail ref_implicit_fail.cpp ;
 compile-fail ref_implicit_fail2.cpp ;
-compile-fail ref_implicit_fail3.cpp ;
-compile-fail ref_implicit_fail4.cpp ;
 run ref_cv_test.cpp ;
-run ref_conversion_test.cpp ;

 run eif_constructors.cpp ;
 run eif_dummy_arg_disambiguation.cpp ;
@@ -58,12 +55,10 @@ compile-fail explicit_operator_bool_compile_fail_conv_pvoid.cpp ;
 compile-fail explicit_operator_bool_compile_fail_delete.cpp ;
 compile-fail explicit_operator_bool_compile_fail_shift.cpp ;

-compile ignore_unused_test.cpp
-  : <warnings>extra
-    <toolset>gcc:<warnings-as-errors>on
-    <toolset>clang:<warnings-as-errors>on
-    <toolset>msvc:<warnings-as-errors>on ;
-
+compile ignore_unused_test.cpp : <toolset>gcc-4.8:<cxxflags>"-Wunused-variable -Wunused-local-typedefs -Werror"
+                                   <toolset>gcc:<cxxflags>"-Wunused-variable -Werror"
+                                   <toolset>clang:<cxxflags>"-Wunused-variable -Werror"
+                                   <toolset>msvc:<cxxflags>"/we4100 /we4101" ;
 run sp_typeinfo_test.cpp ;
 run sp_typeinfo_test.cpp : : : <rtti>off : sp_typeinfo_test_no_rtti ;

@@ -71,32 +66,16 @@ run visit_each_test.cpp ;

 run get_pointer_test.cpp ;

-local pedantic-errors = <warnings>pedantic
-    <toolset>msvc:<warnings-as-errors>on
-    <toolset>gcc:<warnings-as-errors>on
-    <toolset>clang:<warnings-as-errors>on ;
-
-run lightweight_test_test.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_test.cpp : : :
-  <exception-handling>off $(pedantic-errors) : lightweight_test_test_no_except ;
-run lightweight_test_test2.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_all_with_test.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_lt_le_test.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_gt_ge_test.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_eq_nullptr.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_test3.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_test4.cpp
-  : : : $(pedantic-errors) ;
-run lightweight_test_test5.cpp
-  : : : $(pedantic-errors)
-    <toolset>gcc-4.4.7:<cxxflags>-Wno-sign-compare ;
+run lightweight_test_test.cpp ;
+run lightweight_test_test.cpp : : : <exception-handling>off : lightweight_test_test_no_except ;
+run lightweight_test_test2.cpp ;
+run lightweight_test_all_with_test.cpp ;
+run lightweight_test_lt_le_test.cpp ;
+run lightweight_test_gt_ge_test.cpp ;
+run lightweight_test_eq_nullptr.cpp ;
+run lightweight_test_test3.cpp ;
+run lightweight_test_test4.cpp ;
+run lightweight_test_test5.cpp ;

 run-fail lightweight_test_all_eq_test.cpp ;
 run-fail lightweight_test_all_with_fail.cpp ;
@@ -113,22 +92,12 @@ run-fail lightweight_test_fail8.cpp ;
 run-fail lightweight_test_fail8.cpp : : : <rtti>off : lightweight_test_fail8_no_rtti ;
 run-fail lightweight_test_fail9.cpp ;
 run-fail lightweight_test_fail10.cpp ;
-run-fail lightweight_test_fail11.cpp : ;
-run-fail lightweight_test_fail12.cpp ;
-run-fail lightweight_test_fail13.cpp ;
-run-fail lightweight_test_fail14.cpp ;
+run-fail lightweight_test_fail11.cpp ;
 run-fail lightweight_test_lt_fail.cpp ;
 run-fail lightweight_test_le_fail.cpp ;
 run-fail lightweight_test_gt_fail.cpp ;
 run-fail lightweight_test_ge_fail.cpp ;

-run lightweight_test_bool.cpp
-  : : : $(pedantic-errors) ;
-
-run lightweight_test_with_test.cpp
-  : : : $(pedantic-errors) ;
-run-fail lightweight_test_with_fail.cpp ;
-
 run is_same_test.cpp ;

 run typeinfo_test.cpp ;
@@ -137,12 +106,9 @@ run typeinfo_test.cpp : : : <rtti>off : typeinfo_test_no_rtti ;
 run iterator_test.cpp ;
 run detail_iterator_test.cpp ;

-run demangle_test.cpp
-  : : : <test-info>always_show_run_output ;
-
-run demangled_name_test.cpp
-  : : : <test-info>always_show_run_output ;
+run demangle_test.cpp  : : : <test-info>always_show_run_output ;

+run demangled_name_test.cpp  : : : <test-info>always_show_run_output ;
 run demangled_name_test.cpp  : : : <rtti>off <test-info>always_show_run_output : demangled_name_test_no_rtti ;

 run scoped_enum.cpp ;
@@ -173,37 +139,12 @@ run-fail quick_exit_fail.cpp ;

 compile use_default_test.cpp ;

-run default_allocator_test.cpp
-  : : : <warnings>pedantic
-        <toolset>msvc:<warnings-as-errors>on
-        <toolset>gcc:<warnings-as-errors>on
-        <toolset>clang:<warnings-as-errors>on ;
-
+run default_allocator_test.cpp ;
 run noinit_adaptor_test.cpp ;
 run alloc_construct_test.cpp ;
 run alloc_construct_throws_test.cpp ;
 run alloc_construct_cxx11_test.cpp ;

-run nvp_test.cpp ;
-
-run allocator_value_type_test.cpp ;
-run allocator_pointer_test.cpp ;
-run allocator_const_pointer_test.cpp ;
-run allocator_void_pointer_test.cpp ;
-run allocator_const_void_pointer_test.cpp ;
-run allocator_difference_type_test.cpp ;
-run allocator_size_type_test.cpp ;
-run allocator_pocca_test.cpp ;
-run allocator_pocma_test.cpp ;
-run allocator_pocs_test.cpp ;
-run allocator_is_always_equal_test.cpp ;
-run allocator_rebind_test.cpp ;
-run allocator_allocate_test.cpp ;
-run allocator_allocate_hint_test.cpp ;
-run allocator_deallocate_test.cpp ;
-run allocator_max_size_test.cpp ;
-run allocator_soccc_test.cpp ;
-
 lib lib_typeid : lib_typeid.cpp : <link>shared:<define>LIB_TYPEID_DYN_LINK=1 ;

 run test_lib_typeid.cpp lib_typeid : : : <link>shared : test_lib_typeid_shared ;
@@ -212,10 +153,8 @@ run test_lib_typeid.cpp lib_typeid : : : <link>static : test_lib_typeid_static ;
 run test_lib_typeid.cpp lib_typeid : : : <link>shared <rtti>off : test_lib_typeid_shared_no_rtti ;
 run test_lib_typeid.cpp lib_typeid : : : <link>static <rtti>off : test_lib_typeid_static_no_rtti ;

-run uncaught_exceptions.cpp
-  : : : <exception-handling>on ;
-run uncaught_exceptions_np.cpp
-  : : : <exception-handling>on ;
+run uncaught_exceptions.cpp : : : <exception-handling>on ;
+run uncaught_exceptions_np.cpp : : : <exception-handling>on ;

 run no_exceptions_support_test.cpp ;
 run no_exceptions_support_test.cpp : : : <exception-handling>off : no_exceptions_support_test_nx ;
--- a/test/addressof_fn_test.cpp
+++ b/test/addressof_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt

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


 void f0()
--- a/test/addressof_np_test.cpp
+++ b/test/addressof_np_test.cpp
@@ -7,7 +7,7 @@
 //

 #include <boost/utility/addressof.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <cstddef>

 #if defined( BOOST_NO_CXX11_NULLPTR )
--- a/test/addressof_test.cpp
+++ b/test/addressof_test.cpp
@@ -20,7 +20,7 @@
 #pragma warning(pop)
 #endif

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

 template<class T> void scalar_test( T * = 0 )
 {
--- a/test/addressof_test2.cpp
+++ b/test/addressof_test2.cpp
@@ -22,7 +22,7 @@
 #pragma warning(pop)
 #endif

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

 template<class T> void scalar_test( T * = 0 )
 {
--- a/test/allocator_allocate_hint_test.cpp
+++ b/test/allocator_allocate_hint_test.cpp
@@ -1,59 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef std::size_t size_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    template<class U>
-    struct rebind {
-        typedef A1<U> other;
-    };
-    A1()
-        : value() { }
-    T* allocate(std::size_t n, const void*) {
-        value = n;
-        return 0;
-    }
-    std::size_t value;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    A2()
-        : value() { }
-    T* allocate(std::size_t n) {
-        value = n;
-        return 0;
-    }
-    std::size_t value;
-};
-#endif
-
-int main()
-{
-    {
-        A1<int> a;
-        BOOST_TEST_NOT(boost::allocator_allocate(a, 5, 0));
-        BOOST_TEST_EQ(a.value, 5);
-    }
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    {
-        A2<int> a;
-        BOOST_TEST_NOT(boost::allocator_allocate(a, 5, 0));
-        BOOST_TEST_EQ(a.value, 5);
-    }
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_allocate_test.cpp
+++ b/test/allocator_allocate_test.cpp
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-template<class T>
-struct A {
-    typedef T value_type;
-    typedef T* pointer;
-    typedef std::size_t size_type;
-    A()
-        : value() { }
-    T* allocate(std::size_t n) {
-        value = n;
-        return 0;
-    }
-    std::size_t value;
-};
-
-int main()
-{
-    A<int> a;
-    BOOST_TEST_NOT(boost::allocator_allocate(a, 5));
-    BOOST_TEST_EQ(a.value, 5);
-    return boost::report_errors();
-}
--- a/test/allocator_const_pointer_test.cpp
+++ b/test/allocator_const_pointer_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef int* const_pointer;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
-        boost::allocator_const_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const int*,
-        boost::allocator_const_pointer<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_const_void_pointer_test.cpp
+++ b/test/allocator_const_void_pointer_test.cpp
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef int* const_pointer;
-    typedef int* const_void_pointer;
-    template<class U>
-    struct rebind {
-        typedef A1<U> other;
-    };
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
-        boost::allocator_const_void_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const void*,
-        boost::allocator_const_void_pointer<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_construct_test.cpp
+++ b/test/allocator_construct_test.cpp
@@ -1,46 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    A1() { }
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    A2() { }
-    template<class U, class V>
-    void construct(U* p, const V& v) {
-        ::new((void*)p) U(v + 1);
-    }
-};
-#endif
-
-int main()
-{
-    {
-        A1<int> a;
-        int i = 0;
-        boost::allocator_construct(a, &i, 5);
-        BOOST_TEST_EQ(i, 5);
-    }
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    {
-        A1<int> a;
-        int i = 0;
-        boost::allocator_construct(a, &i, 5);
-        BOOST_TEST_EQ(i, 6);
-    }
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_deallocate_test.cpp
+++ b/test/allocator_deallocate_test.cpp
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-template<class T>
-struct A {
-    typedef T value_type;
-    typedef T* pointer;
-    typedef std::size_t size_type;
-    A()
-        : value() { }
-    void deallocate(T*, std::size_t n) {
-        value = n;
-    }
-    std::size_t value;
-};
-
-int main()
-{
-    A<int> a;
-    boost::allocator_deallocate(a, 0, 5);
-    BOOST_TEST_EQ(a.value, 5);
-    return boost::report_errors();
-}
--- a/test/allocator_destroy_test.cpp
+++ b/test/allocator_destroy_test.cpp
@@ -1,62 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-struct S {
-    static int count;
-    S() {
-        ++count;
-    }
-    S(const S&) {
-        ++count;
-    }
-    ~S() {
-        --count;
-    }
-};
-
-int S::count = 0;
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    A1() { }
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    A2() { }
-    template<class U>
-    void destroy(U* p) {
-        *p = U();
-    }
-};
-#endif
-
-int main()
-{
-    {
-        A1<int> a;
-        S s;
-        boost::allocator_destroy(a, &s);
-        BOOST_TEST_EQ(S::count, 0);
-        ::new((void*)&s) S();
-    }
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    {
-        A1<int> a;
-        int i = 5;
-        boost::allocator_destroy(a, &i);
-        BOOST_TEST_EQ(i, 0);
-    }
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_difference_type_test.cpp
+++ b/test/allocator_difference_type_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef short difference_type;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<short,
-        boost::allocator_difference_type<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<std::ptrdiff_t,
-        boost::allocator_difference_type<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_is_always_equal_test.cpp
+++ b/test/allocator_is_always_equal_test.cpp
@@ -1,47 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    int value;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-
-template<class T>
-struct A3 {
-    typedef T value_type;
-    typedef std::false_type is_always_equal;
-};
-
-template<class T>
-struct A4 {
-    typedef T value_type;
-    typedef std::true_type is_always_equal;
-    int value;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_FALSE((boost::allocator_is_always_equal<A1<int> >::type));
- #if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A2<int> >::type));
-    BOOST_TEST_TRAIT_FALSE((boost::allocator_is_always_equal<A3<int> >::type));
-    BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A4<int> >::type));
- #endif
-    return boost::report_errors();
-}
--- a/test/allocator_max_size_test.cpp
+++ b/test/allocator_max_size_test.cpp
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <limits>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef short size_type;
-    A1() { }
-    short max_size() const {
-        return 1;
-    }
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    typedef short size_type;
-    A2() { }
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_EQ(boost::allocator_max_size(A1<int>()), 1);
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_LE(boost::allocator_max_size(A2<int>()),
-        (std::numeric_limits<short>::max)());
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_pocca_test.cpp
+++ b/test/allocator_pocca_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    typedef std::true_type propagate_on_container_copy_assignment;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_FALSE((boost::
-        allocator_propagate_on_container_copy_assignment<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::
-        allocator_propagate_on_container_copy_assignment<A2<int> >::type));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_pocma_test.cpp
+++ b/test/allocator_pocma_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    typedef std::true_type propagate_on_container_move_assignment;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_FALSE((boost::
-        allocator_propagate_on_container_move_assignment<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::
-        allocator_propagate_on_container_move_assignment<A2<int> >::type));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_pocs_test.cpp
+++ b/test/allocator_pocs_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    typedef std::true_type propagate_on_container_swap;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_FALSE((boost::
-        allocator_propagate_on_container_swap<A1<int> >::type));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::
-        allocator_propagate_on_container_swap<A2<int> >::type));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_pointer_test.cpp
+++ b/test/allocator_pointer_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef int* pointer;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
-        boost::allocator_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
-        boost::allocator_pointer<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_rebind_test.cpp
+++ b/test/allocator_rebind_test.cpp
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    template<class>
-    struct rebind {
-        typedef A1<int> other;
-    };
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A1<int>,
-        boost::allocator_rebind<A1<char>, bool>::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A2<int>,
-        boost::allocator_rebind<A2<char>, int>::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_size_type_test.cpp
+++ b/test/allocator_size_type_test.cpp
@@ -1,34 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef int size_type;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int,
-        boost::allocator_size_type<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<std::size_t,
-        boost::allocator_size_type<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_soccc_test.cpp
+++ b/test/allocator_soccc_test.cpp
@@ -1,41 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    A1(int n)
-        : value(n) { }
-    int value;
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-    A2(int n)
-        : value(n) { }
-    A2 select_on_container_copy_construction() const {
-        return A2(value + 1);
-    }
-    int value;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_EQ(1, boost::
-        allocator_select_on_container_copy_construction(A1<int>(1)).value);
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_EQ(2, boost::
-        allocator_select_on_container_copy_construction(A2<int>(1)).value);
-#endif
-    return boost::report_errors();
-}
--- a/test/allocator_value_type_test.cpp
+++ b/test/allocator_value_type_test.cpp
@@ -1,22 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A {
-    typedef T value_type;
-};
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int,
-        boost::allocator_value_type<A<int> >::type>));
-    return boost::report_errors();
-}
--- a/test/allocator_void_pointer_test.cpp
+++ b/test/allocator_void_pointer_test.cpp
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/allocator_access.hpp>
-#include <boost/core/is_same.hpp>
-#include <boost/core/lightweight_test_trait.hpp>
-
-template<class T>
-struct A1 {
-    typedef T value_type;
-    typedef int* pointer;
-    typedef int* void_pointer;
-    template<class U>
-    struct rebind {
-        typedef A1<U> other;
-    };
-};
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-template<class T>
-struct A2 {
-    typedef T value_type;
-};
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
-        boost::allocator_void_pointer<A1<char> >::type>));
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<void*,
-        boost::allocator_void_pointer<A2<int> >::type>));
-#endif
-    return boost::report_errors();
-}
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@@ -1,17 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(cmake_install_test LANGUAGES CXX)
-
-find_package(boost_core REQUIRED)
-
-add_executable(quick ../quick.cpp)
-target_link_libraries(quick Boost::core)
-
-enable_testing()
-add_test(quick quick)
-
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -2,7 +2,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

-cmake_minimum_required(VERSION 3.5...3.16)
+cmake_minimum_required(VERSION 3.5)

 project(cmake_subdir_test LANGUAGES CXX)

--- a/test/default_allocator_test.cpp
+++ b/test/default_allocator_test.cpp
@@ -173,11 +173,20 @@ void test_construct_other()
    (void)a5;
 }

+#if defined(PTRDIFF_MAX) && defined(SIZE_MAX)
 template<class T>
 std::size_t max_size()
 {
-    return static_cast<std::size_t>(-1) / (2 < sizeof(T) ? sizeof(T) : 2);
+    return PTRDIFF_MAX < SIZE_MAX / sizeof(T)
+        ? PTRDIFF_MAX : SIZE_MAX / sizeof(T);
 }
+#else
+template<class T>
+std::size_t max_size()
+{
+    return ~static_cast<std::size_t>(0) / sizeof(T);
+}
+#endif

 void test_max_size()
 {
--- a/test/detail_iterator_test.cpp
+++ b/test/detail_iterator_test.cpp
@@ -8,7 +8,6 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#define BOOST_ALLOW_DEPRECATED_HEADERS
 #include <boost/detail/iterator.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
--- a/test/eif_constructors.cpp
+++ b/test/eif_constructors.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_dummy_arg_disambiguation.cpp
+++ b/test/eif_dummy_arg_disambiguation.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_lazy.cpp
+++ b/test/eif_lazy.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if_c;
 using boost::lazy_enable_if_c;
--- a/test/eif_lazy_test.cpp
+++ b/test/eif_lazy_test.cpp
@@ -14,7 +14,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::lazy_enable_if;
 using boost::lazy_disable_if;
--- a/test/eif_member_templates.cpp
+++ b/test/eif_member_templates.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_namespace_disambiguation.cpp
+++ b/test/eif_namespace_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if;
 using boost::is_arithmetic;
--- a/test/eif_no_disambiguation.cpp
+++ b/test/eif_no_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if;
 using boost::is_arithmetic;
--- a/test/eif_partial_specializations.cpp
+++ b/test/eif_partial_specializations.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>

 using boost::enable_if_has_type;
 using boost::enable_if_c;
--- a/test/explicit_operator_bool_noexcept.cpp
+++ b/test/explicit_operator_bool_noexcept.cpp
@@ -18,7 +18,7 @@

 #if !defined(BOOST_NO_CXX11_NOEXCEPT)

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

 namespace {
--- a/test/lightweight_test_bool.cpp
+++ b/test/lightweight_test_bool.cpp
@@ -1,63 +0,0 @@
-// Copyright 2020 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/core/lightweight_test.hpp>
-#include <vector>
-
-int main()
-{
-    BOOST_TEST( BOOST_TEST( true ) );
-    BOOST_TEST_NOT( BOOST_TEST( false ) );
-
-    BOOST_TEST( BOOST_TEST_NOT( false ) );
-    BOOST_TEST_NOT( BOOST_TEST_NOT( true ) );
-
-    BOOST_TEST( BOOST_TEST_EQ( 1, 1 ) );
-    BOOST_TEST_NOT( BOOST_TEST_EQ( 1, 2 ) );
-
-    BOOST_TEST( BOOST_TEST_NE( 1, 2 ) );
-    BOOST_TEST_NOT( BOOST_TEST_NE( 1, 1 ) );
-
-    BOOST_TEST( BOOST_TEST_LT( 1, 2 ) );
-    BOOST_TEST_NOT( BOOST_TEST_LT( 1, 1 ) );
-
-    BOOST_TEST( BOOST_TEST_LE( 1, 1 ) );
-    BOOST_TEST_NOT( BOOST_TEST_LE( 2, 1 ) );
-
-    BOOST_TEST( BOOST_TEST_GT( 2, 1 ) );
-    BOOST_TEST_NOT( BOOST_TEST_GT( 1, 1 ) );
-
-    BOOST_TEST( BOOST_TEST_GE( 1, 1 ) );
-    BOOST_TEST_NOT( BOOST_TEST_GE( 1, 2 ) );
-
-    BOOST_TEST( BOOST_TEST_CSTR_EQ( "1", "1" ) );
-    BOOST_TEST_NOT( BOOST_TEST_CSTR_EQ( "1", "2" ) );
-
-    BOOST_TEST( BOOST_TEST_CSTR_NE( "1", "2" ) );
-    BOOST_TEST_NOT( BOOST_TEST_CSTR_NE( "1", "1" ) );
-
-    std::vector<int> v1;
-    v1.push_back( 1 );
-
-    std::vector<int> v2;
-
-    BOOST_TEST( BOOST_TEST_ALL_EQ(v1.begin(), v1.end(), v1.begin(), v1.end()) );
-    BOOST_TEST_NOT( BOOST_TEST_ALL_EQ(v1.begin(), v1.end(), v2.begin(), v2.end()) );
-
-    BOOST_TEST( BOOST_TEST_ALL_WITH(v1.begin(), v1.end(), v1.begin(), v1.end(), boost::detail::lw_test_eq()) );
-    BOOST_TEST_NOT( BOOST_TEST_ALL_WITH(v1.begin(), v1.end(), v2.begin(), v2.end(), boost::detail::lw_test_eq()) );
-
-    int const * p = 0;
-
-    BOOST_TEST( p == 0 ) || BOOST_TEST_EQ( *p, 0 );
-    BOOST_TEST( p != 0 ) && BOOST_TEST_EQ( *p, 0 );
-
-    int x = 0;
-    p = &x;
-
-    BOOST_TEST( p == 0 ) || BOOST_TEST_EQ( *p, 0 );
-    BOOST_TEST( p != 0 ) && BOOST_TEST_EQ( *p, 0 );
-
-    return boost::report_errors() == 14? 0: 1;
-}
--- a/test/lightweight_test_eq_nullptr.cpp
+++ b/test/lightweight_test_eq_nullptr.cpp
@@ -8,12 +8,8 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#if defined(_MSC_VER)
-# pragma warning( disable: 4100 ) // nullptr_t parameter unrereferenced
-#endif
-
-#include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
+#include <boost/core/lightweight_test.hpp>

 int main()
 {
--- a/test/lightweight_test_fail.cpp
+++ b/test/lightweight_test_fail.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 int main()
 {
--- a/test/lightweight_test_fail12.cpp
+++ b/test/lightweight_test_fail12.cpp
@@ -1,68 +0,0 @@
-//
-// Negative test for BOOST_TEST_TRAIT_SAME
-//
-// Copyright 2014, 2019 Peter Dimov
-//
-// 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/core/lightweight_test_trait.hpp>
-#include <boost/config.hpp>
-
-struct X
-{
-    typedef int type;
-};
-
-template<class T1, class T2> struct Y
-{
-    typedef T1 type;
-};
-
-typedef int I1;
-typedef const int I2;
-typedef volatile int I3;
-typedef const volatile int I4;
-typedef int& I5;
-typedef const int& I6;
-typedef volatile int& I7;
-typedef const volatile int& I8;
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-typedef int&& I9;
-typedef const int&& I10;
-typedef volatile int&& I11;
-typedef const volatile int&& I12;
-#endif
-
-int main()
-{
-    BOOST_TEST_TRAIT_SAME(char[1], char[2]);
-    BOOST_TEST_TRAIT_SAME(char[1], char[]);
-    BOOST_TEST_TRAIT_SAME(char[1], char*);
-    BOOST_TEST_TRAIT_SAME(void(), void(int));
-    BOOST_TEST_TRAIT_SAME(void(), void(*)());
-    BOOST_TEST_TRAIT_SAME(X, void);
-    BOOST_TEST_TRAIT_SAME(X::type, void);
-    BOOST_TEST_TRAIT_SAME(X, Y<void, void>);
-    BOOST_TEST_TRAIT_SAME(X::type, Y<float, int>::type);
-    BOOST_TEST_TRAIT_SAME(Y<int, float>, Y<int, double>);
-    BOOST_TEST_TRAIT_SAME(I1, I2);
-    BOOST_TEST_TRAIT_SAME(I3, I4);
-    BOOST_TEST_TRAIT_SAME(I5, I6);
-    BOOST_TEST_TRAIT_SAME(I7, I8);
-
-    int expected = 14;
-
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
-    BOOST_TEST_TRAIT_SAME(I9, I10);
-    BOOST_TEST_TRAIT_SAME(I11, I12);
-
-    expected += 2;
-
-#endif
-
-    return boost::report_errors() == expected;
-}
--- a/test/lightweight_test_fail13.cpp
+++ b/test/lightweight_test_fail13.cpp
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/lightweight_test.hpp>
-
-void f()
-{
-    throw 5;
-}
-
-int main()
-{
-    BOOST_TEST_NO_THROW(f());
-    return boost::report_errors();
-}
--- a/test/lightweight_test_fail14.cpp
+++ b/test/lightweight_test_fail14.cpp
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/lightweight_test.hpp>
-
-struct error
-    : std::exception {
-    const char* what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE {
-        return "message";
-    }
-};
-
-void f()
-{
-    throw error();
-}
-
-int main()
-{
-    BOOST_TEST_NO_THROW(f());
-    return boost::report_errors();
-}
--- a/test/lightweight_test_fail2.cpp
+++ b/test/lightweight_test_fail2.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 int main()
 {
--- a/test/lightweight_test_fail3.cpp
+++ b/test/lightweight_test_fail3.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 int main()
 {
--- a/test/lightweight_test_fail4.cpp
+++ b/test/lightweight_test_fail4.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 int main()
 {
--- a/test/lightweight_test_fail5.cpp
+++ b/test/lightweight_test_fail5.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 struct X
 {
--- a/test/lightweight_test_fail6.cpp
+++ b/test/lightweight_test_fail6.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

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

 struct X
 {
--- a/test/lightweight_test_test.cpp
+++ b/test/lightweight_test_test.cpp
@@ -8,14 +8,8 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#if defined(_MSC_VER)
-# pragma warning( disable: 4702 ) // unreachable code
-# pragma warning( disable: 4530 ) // unwind without /EHsc from <ostream>
-# pragma warning( disable: 4577 ) // noexcept without /EHsc from <exception>
-#endif
-
-#include <boost/core/lightweight_test.hpp>
 #include <vector>
+#include <boost/detail/lightweight_test.hpp>

 struct X
 {
@@ -39,16 +33,6 @@ void f( bool x )
    }
 }

-#if defined(__GNUC__)
-# pragma GCC diagnostic ignored "-Waddress"
-#endif
-
-#if defined(__clang__) && defined(__has_warning)
-# if __has_warning( "-Wstring-plus-int" )
-#  pragma clang diagnostic ignored "-Wstring-plus-int"
-# endif
-#endif
-
 int main()
 {
    int x = 0;
@@ -108,9 +92,5 @@ int main()
    BOOST_TEST_THROWS( f(true), X );
    BOOST_TEST_THROWS( f(false), int );

-    // BOOST_TEST_NO_THROW
-
-    BOOST_TEST_NO_THROW(++y);
-
    return boost::report_errors();
 }
--- a/test/lightweight_test_test5.cpp
+++ b/test/lightweight_test_test5.cpp
@@ -1,19 +1,68 @@
 //
-// Test that BOOST_TEST_EQ doesn't emit sign compare warnings
+// Negative test for BOOST_TEST_TRAIT_SAME
 //
-// Copyright 2019 Peter Dimov
+// Copyright 2014, 2019 Peter Dimov
 //
 // 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/core/lightweight_test.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
+#include <boost/config.hpp>
+
+struct X
+{
+    typedef int type;
+};
+
+template<class T1, class T2> struct Y
+{
+    typedef T1 type;
+};
+
+typedef int I1;
+typedef const int I2;
+typedef volatile int I3;
+typedef const volatile int I4;
+typedef int& I5;
+typedef const int& I6;
+typedef volatile int& I7;
+typedef const volatile int& I8;
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+typedef int&& I9;
+typedef const int&& I10;
+typedef volatile int&& I11;
+typedef const volatile int&& I12;
+#endif

 int main()
 {
-    BOOST_TEST_EQ(1, 1u);
-    BOOST_TEST_EQ(~0u, -1);
+    BOOST_TEST_TRAIT_SAME(char[1], char[2]);
+    BOOST_TEST_TRAIT_SAME(char[1], char[]);
+    BOOST_TEST_TRAIT_SAME(char[1], char*);
+    BOOST_TEST_TRAIT_SAME(void(), void(int));
+    BOOST_TEST_TRAIT_SAME(void(), void(*)());
+    BOOST_TEST_TRAIT_SAME(X, void);
+    BOOST_TEST_TRAIT_SAME(X::type, void);
+    BOOST_TEST_TRAIT_SAME(X, Y<void, void>);
+    BOOST_TEST_TRAIT_SAME(X::type, Y<float, int>::type);
+    BOOST_TEST_TRAIT_SAME(Y<int, float>, Y<int, double>);
+    BOOST_TEST_TRAIT_SAME(I1, I2);
+    BOOST_TEST_TRAIT_SAME(I3, I4);
+    BOOST_TEST_TRAIT_SAME(I5, I6);
+    BOOST_TEST_TRAIT_SAME(I7, I8);

-    return boost::report_errors();
+    int expected = 14;
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+    BOOST_TEST_TRAIT_SAME(I9, I10);
+    BOOST_TEST_TRAIT_SAME(I11, I12);
+
+    expected += 2;
+
+#endif
+
+    return boost::report_errors() == expected;
 }
--- a/test/lightweight_test_with_fail.cpp
+++ b/test/lightweight_test_with_fail.cpp
@@ -1,39 +0,0 @@
-// Negative test for BOOST_TEST_WITH
-//
-// Copyright 2020 Bjorn Reese
-// Copyright 2020 Peter Dimov
-//
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/core/lightweight_test.hpp>
-#include <cmath>
-
-template <typename T>
-struct with_tolerance
-{
-    with_tolerance( T tolerance ): tolerance( tolerance )
-    {
-    }
-
-    bool operator()( T lhs, T rhs ) const
-    {
-        return std::abs( lhs - rhs ) <= tolerance;
-    }
-
-private:
-
-    T tolerance;
-};
-
-void test_tolerance_predicate()
-{
-    BOOST_TEST_WITH( 1.0, 1.0 - 1e-6, with_tolerance<double>(1e-7) );
-    BOOST_TEST_WITH( 1.0, 1.0 + 1e-6, with_tolerance<double>(1e-7) );
-}
-
-int main()
-{
-    test_tolerance_predicate();
-    return boost::report_errors() == 2;
-}
--- a/test/lightweight_test_with_test.cpp
+++ b/test/lightweight_test_with_test.cpp
@@ -1,39 +0,0 @@
-//
-// Test for BOOST_TEST_WITH
-//
-// Copyright (c) 2020 Bjorn Reese
-//
-// 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/core/lightweight_test.hpp>
-#include <cmath>
-
-template <typename T>
-struct with_tolerance
-{
-    with_tolerance(T tolerance) : tolerance(tolerance) {}
-    bool operator()(T lhs, T rhs) const
-    {
-        return (std::abs(lhs - rhs) <= tolerance);
-    }
-
-private:
-    T tolerance;
-};
-
-void test_tolerance_predicate()
-{
-    BOOST_TEST_WITH( 1.0, 1.0, with_tolerance<double>(1e-5) );
-    BOOST_TEST_WITH( 1.0, 1.0 - 1e-6, with_tolerance<double>(1e-5) );
-    BOOST_TEST_WITH( 1.0, 1.0 + 1e-6, with_tolerance<double>(1e-5) );
-}
-
-int main()
-{
-    test_tolerance_predicate();
-
-    return boost::report_errors();
-}
--- a/test/nvp_test.cpp
+++ b/test/nvp_test.cpp
@@ -1,46 +0,0 @@
-/*
-Copyright 2019 Glen Joseph Fernandes
-(glenjofe@gmail.com)
-
-Distributed under the Boost Software License, Version 1.0.
-(http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/core/nvp.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-void test()
-{
-    const char* n = "name";
-    int v = 1;
-    boost::nvp<int> p(n, v);
-    BOOST_TEST_EQ(p.name(), n);
-    BOOST_TEST_EQ(p.value(), 1);
-    BOOST_TEST_EQ(&p.value(), &v);
-}
-
-void test_factory()
-{
-    const char* n = "name";
-    int v = 1;
-    boost::nvp<int> p = boost::make_nvp(n, v);
-    BOOST_TEST_EQ(p.name(), n);
-    BOOST_TEST_EQ(p.value(), 1);
-    BOOST_TEST_EQ(&p.value(), &v);
-}
-
-void test_macro()
-{
-    int v = 1;
-    boost::nvp<int> p = BOOST_NVP(v);
-    BOOST_TEST_CSTR_EQ(p.name(), "v");
-    BOOST_TEST_EQ(p.value(), 1);
-    BOOST_TEST_EQ(&p.value(), &v);
-}
-
-int main()
-{
-    test();
-    test_factory();
-    test_macro();
-    return boost::report_errors();
-}
--- a/test/quick.cpp
+++ b/test/quick.cpp
@@ -12,6 +12,7 @@
 #include <boost/core/addressof.hpp>
 #include <boost/core/checked_delete.hpp>
 #include <boost/core/demangle.hpp>
+#include <boost/detail/iterator.hpp>
 #include <boost/core/enable_if.hpp>
 #include <boost/core/explicit_operator_bool.hpp>
 #include <boost/get_pointer.hpp>
--- a/test/ref_conversion_test.cpp
+++ b/test/ref_conversion_test.cpp
@@ -1,39 +0,0 @@
-//  Implicit conversions between compatible reference wrappers
-//
-//  Copyright 2020 Peter Dimov
-//
-//  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/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-struct X
-{
-};
-
-struct Y: public X
-{
-};
-
-void f1( boost::reference_wrapper<X> r, Y * p )
-{
-    BOOST_TEST_EQ( r.get_pointer(), p );
-}
-
-void f2( boost::reference_wrapper<int const> r, int * p )
-{
-    BOOST_TEST_EQ( r.get_pointer(), p );
-}
-
-int main()
-{
-    Y y;
-    f1( boost::ref(y), &y );
-
-    int i = 0;
-    f2( boost::ref(i), &i );
-
-    return boost::report_errors();
-}
--- a/test/ref_ct_test.cpp
+++ b/test/ref_ct_test.cpp
@@ -9,7 +9,7 @@
 #include <boost/ref.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/config/workaround.hpp>
+#include <boost/detail/workaround.hpp>

 namespace {

--- a/test/ref_fn_test.cpp
+++ b/test/ref_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt

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


 void f0()
--- a/test/ref_implicit_fail3.cpp
+++ b/test/ref_implicit_fail3.cpp
@@ -1,29 +0,0 @@
-//
-// Incompatible reference_wrappers must not implicitly convert to each other
-//
-// Copyright 2020 Peter Dimov
-//
-// 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/ref.hpp>
-
-struct X
-{
-};
-
-struct Y
-{
-};
-
-void f( boost::reference_wrapper<X> )
-{
-}
-
-int main()
-{
-    Y y;
-    f( boost::ref(y) ); // should fail
-}
--- a/test/ref_implicit_fail4.cpp
+++ b/test/ref_implicit_fail4.cpp
@@ -1,21 +0,0 @@
-//
-// Incompatible reference_wrappers must not implicitly convert to each other
-//
-// Copyright 2020 Peter Dimov
-//
-// 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/ref.hpp>
-
-void f( boost::reference_wrapper< int const > )
-{
-}
-
-int main()
-{
-    long y = 0;
-    f( boost::ref(y) ); // should fail
-}
--- a/test/ref_test.cpp
+++ b/test/ref_test.cpp
@@ -7,7 +7,7 @@
 // see 'ref_ct_test.cpp' for compile-time part

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

 namespace {
 using namespace boost;
--- a/test/sp_typeinfo_test.cpp
+++ b/test/sp_typeinfo_test.cpp
@@ -11,7 +11,7 @@
 #define BOOST_ALLOW_DEPRECATED_HEADERS

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

 int main()
--- a/test/swap/CMakeLists.txt
+++ b/test/swap/CMakeLists.txt
@@ -1,11 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::core)
-
-endif()
--- a/test/swap/Jamfile.v2
+++ b/test/swap/Jamfile.v2
@@ -7,31 +7,65 @@
 # bring in rules for testing
 import testing ;

-compile swap_root_header_1.cpp ;
-compile swap_root_header_2.cpp ;
-compile swap_lib_header_1.cpp ;
-compile swap_lib_header_2.cpp ;
-compile swap_mixed_headers_1.cpp ;
-compile swap_mixed_headers_2.cpp ;
+local compile_tests =
+    root_header_1.cpp
+    root_header_2.cpp
+    lib_header_1.cpp
+    lib_header_2.cpp
+    mixed_headers_1.cpp
+    mixed_headers_2.cpp
+    ;

-compile-fail swap_const_wrapper_fail.cpp ;
+local compile_fail_tests =
+    const_wrapper_fail.cpp ;

-run swap_primitive.cpp ;
-run swap_specialized_in_boost.cpp ;
-run swap_specialized_in_global.cpp ;
-run swap_specialized_in_other.cpp ;
-run swap_specialized_in_std.cpp ;
-run swap_specialized_in_boost_and_other.cpp ;
-run swap_std_bitset.cpp ;
-run swap_std_dateorder.cpp ;
-run swap_std_string.cpp ;
-run swap_std_typeinfo_ptr.cpp ;
-run swap_std_vector_of_boost.cpp ;
-run swap_std_vector_of_global.cpp ;
-run swap_std_vector_of_other.cpp ;
-run swap_no_ambiguity_in_boost.cpp ;
-run swap_array_of_array_of_class.cpp ;
-run swap_array_of_array_of_int.cpp ;
-run swap_array_of_class.cpp ;
-run swap_array_of_int.cpp ;
-run swap_array_of_template.cpp ;
+local run_tests =
+    primitive.cpp
+    specialized_in_boost.cpp
+    specialized_in_global.cpp
+    specialized_in_other.cpp
+    specialized_in_std.cpp
+    specialized_in_boost_and_other.cpp
+    std_bitset.cpp
+    std_dateorder.cpp
+    std_string.cpp
+    std_typeinfo_ptr.cpp
+    std_vector_of_boost.cpp
+    std_vector_of_global.cpp
+    std_vector_of_other.cpp
+    no_ambiguity_in_boost.cpp
+    array_of_array_of_class.cpp
+    array_of_array_of_int.cpp
+    array_of_class.cpp
+    array_of_int.cpp
+    array_of_template.cpp
+    ;
+
+rule test_all
+{
+    local all_rules ;
+    local file ;
+
+    for file in $(compile_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ compile $(file) : : "swap-$(test_name)" ] ;
+    }
+
+    for file in $(compile_fail_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ compile-fail $(file) : : "swap-$(test_name)" ] ;
+    }
+
+    for file in $(run_tests)
+    {
+        local test_name = [ MATCH "([^.]*).cpp$" : $(file) ] ;
+        all_rules += [ run $(file) : : : : "swap-$(test_name)" ] ;
+    }
+
+    #ECHO All rules: $(all_rules) ;
+    return $(all_rules) ;
+}
+
+test-suite core/swap : [ test_all r ] ;
--- a/test/swap/swap_array_of_array_of_class.cpp
+++ b/test/swap/swap_array_of_array_of_class.cpp
--- a/test/swap/swap_array_of_array_of_int.cpp
+++ b/test/swap/swap_array_of_array_of_int.cpp
--- a/test/swap/swap_array_of_class.cpp
+++ b/test/swap/swap_array_of_class.cpp
--- a/test/swap/swap_array_of_int.cpp
+++ b/test/swap/swap_array_of_int.cpp
--- a/test/swap/swap_array_of_template.cpp
+++ b/test/swap/swap_array_of_template.cpp
--- a/test/swap/swap_const_wrapper_fail.cpp
+++ b/test/swap/swap_const_wrapper_fail.cpp
--- a/test/swap/swap_lib_header_1.cpp
+++ b/test/swap/swap_lib_header_1.cpp
--- a/Show More
+++ b/Show More