Disable -Waddress in lightweight_test_test.cpp

Based on Boost.Move idea

.travis.yml

@@ -1,12 +1,10 @@
-# Copyright 2016-2018 Peter Dimov
+# Copyright 2016-2019 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
 
-sudo: false
-
-python: "2.7"
+dist: xenial
 
 branches:
   only:
@@ -99,7 +97,6 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: trusty
       compiler: g++-7
       env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
       addons:
@@ -120,12 +117,22 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      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
+      compiler: g++-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
-            - g++-8
+            - g++-9
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-9
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
+      addons:
+        apt:
+          packages:
+            - g++-9
           sources:
             - ubuntu-toolchain-r-test
 
@@ -134,13 +141,31 @@ matrix:
       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,14,1z
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
       addons:
         apt:
           packages:
             - clang-3.5
-            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -151,7 +176,16 @@ matrix:
         apt:
           packages:
             - clang-3.6
-            - libstdc++-4.9-dev
+          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
           sources:
             - ubuntu-toolchain-r-test
 
@@ -162,7 +196,6 @@ matrix:
         apt:
           packages:
             - clang-3.8
-            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -173,7 +206,6 @@ matrix:
         apt:
           packages:
             - clang-3.9
-            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
 
@@ -186,7 +218,6 @@ matrix:
             - clang-4.0
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
 
     - os: linux
       compiler: clang++-5.0
@@ -197,7 +228,6 @@ matrix:
             - clang-5.0
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
 
     - os: linux
       compiler: clang++-6.0
@@ -208,7 +238,6 @@ matrix:
             - clang-6.0
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-6.0
 
     - os: linux
       compiler: clang++-7
@@ -219,21 +248,44 @@ matrix:
             - clang-7
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
+            - llvm-toolchain-xenial-7
 
     - os: linux
-      compiler: clang++-6.0
-      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
+      compiler: clang++-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
-            - clang-6.0
-            - libstdc++-5-dev
+            - clang-8
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-6.0
+            - llvm-toolchain-xenial-8
 
     - 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++-8
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-8
+
+    - os: linux
+      dist: trusty
       compiler: clang++-libc++
       env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
       addons:
@@ -243,6 +295,7 @@ 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:
@@ -272,14 +325,36 @@ matrix:
       osx_image: xcode10.1
 
     - os: linux
-      compiler: g++
-      env: CMAKE_SUBDIR_TEST=1
+      env: CMAKE_TEST=1
       script:
-      - cd libs/core/test/cmake_subdir_test && mkdir __build__ && cd __build__
+        - 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
+      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__
       - 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
@@ -295,6 +370,7 @@ 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

CMakeLists.txt

@@ -1,13 +1,10 @@
-# Copyright 2018 Peter Dimov
+# 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
 
-# Partial (add_subdirectory only) and experimental CMake support
-# Subject to change; please do not rely on the contents of this file yet
+cmake_minimum_required(VERSION 3.5...3.16)
 
-cmake_minimum_required(VERSION 3.5)
-
-project(BoostCore LANGUAGES CXX)
+project(boost_core VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
 add_library(boost_core INTERFACE)
 add_library(Boost::core ALIAS boost_core)
@@ -15,7 +12,20 @@ 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()

appveyor.yml

@@ -22,7 +22,19 @@ environment:
       ADDRMD: 32,64
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1,clang-win
+      TOOLSET: msvc-14.1
+      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
 

doc/allocator_access.qbk

@@ -0,0 +1,244 @@
+[/
+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.
+
+This implementation supports C++03 and above. 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> hint);
+
+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, otehrwise 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]

doc/core.qbk

@@ -39,6 +39,7 @@ 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]
@@ -55,6 +56,7 @@ 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]

doc/empty_value.qbk

@@ -97,6 +97,8 @@ public:
     T& get() noexcept;
 };
 
+inline constexpr empty_init_t empty_init{ };
+
 } /* boost */
 ```
 

doc/nvp.qbk

@@ -0,0 +1,108 @@
+[/
+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]

include/boost/core/allocator_access.hpp

@@ -0,0 +1,545 @@
+/*
+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/core/pointer_traits.hpp>
+#include <limits>
+#include <new>
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+#include <type_traits>
+#endif
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#include <utility>
+#endif
+
+#if !defined(BOOST_NO_CXX11_DECLTYPE) && \
+    !defined(BOOST_NO_SFINAE_EXPR) && \
+    (!defined(BOOST_MSVC) || BOOST_MSVC >= 1910)
+#define BOOST_CORE_ALLOCATOR_DETECTION
+#endif
+
+namespace boost {
+
+template<class A>
+struct allocator_value_type {
+    typedef typename A::value_type type;
+};
+
+namespace detail {
+
+template<class>
+struct alloc_void {
+    typedef void type;
+};
+
+} /* detail */
+
+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;
+};
+
+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;
+};
+
+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;
+};
+
+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;
+};
+
+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;
+};
+
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+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;
+};
+#else
+template<class A>
+struct allocator_size_type {
+    typedef typename A::size_type type;
+};
+#endif
+
+namespace detail {
+
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+typedef std::false_type alloc_false_type;
+#else
+struct alloc_false_type {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+#endif
+
+} /* detail */
+
+template<class A, class = void>
+struct allocator_propagate_on_container_copy_assignment {
+    typedef detail::alloc_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;
+};
+
+template<class A, class = void>
+struct allocator_propagate_on_container_move_assignment {
+    typedef detail::alloc_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;
+};
+
+template<class A, class = void>
+struct allocator_propagate_on_container_swap {
+    typedef detail::alloc_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;
+};
+
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+template<class A, class = void>
+struct allocator_is_always_equal {
+    typedef typename std::is_empty<A>::type type;
+};
+#else
+template<class A, class = void>
+struct allocator_is_always_equal {
+    typedef typename detail::alloc_false_type type;
+};
+#endif
+
+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;
+};
+
+namespace detail {
+
+template<class, class>
+struct alloc_to { };
+
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+template<template<class, class...> class A, class T, class U, class... V>
+struct alloc_to<A<U, V...>, T> {
+    typedef A<T, V...> type;
+};
+#else
+template<template<class> class A, class T, class U>
+struct alloc_to<A<U>, T> {
+    typedef A<T> type;
+};
+
+template<template<class, class> class A, class T, class U1, class U2>
+struct alloc_to<A<U1, U2>, T> {
+    typedef A<T, U2> type;
+};
+
+template<template<class, class, class> class A, class T, class U1, class U2,
+    class U3>
+struct alloc_to<A<U1, U2, U3>, T> {
+    typedef A<T, U2, U3> type;
+};
+#endif
+
+} /* 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;
+};
+
+template<class A>
+inline typename allocator_pointer<A>::type
+allocator_allocate(A& a, typename allocator_size_type<A>::type n)
+{
+    return a.allocate(n);
+}
+
+namespace detail {
+
+template<bool, class = void>
+struct alloc_if { };
+
+template<class R>
+struct alloc_if<true, R> {
+    typedef R type;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+template<class T>
+T alloc_declval() BOOST_NOEXCEPT;
+#endif
+
+template<class, class = void>
+struct alloc_has_allocate {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+template<class A>
+struct alloc_has_allocate<A, typename
+    alloc_void<decltype(alloc_declval<A&>().allocate(alloc_declval<typename
+        boost::allocator_size_type<A>::type>(), alloc_declval<typename
+            boost::allocator_const_void_pointer<A>::type>()))>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#endif
+
+} /* detail */
+
+template<class A>
+inline typename detail::alloc_if<detail::alloc_has_allocate<A>::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 detail::alloc_if<!detail::alloc_has_allocate<A>::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);
+}
+
+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);
+}
+
+namespace detail {
+
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+template<class...>
+struct alloc_types { };
+#else
+template<class>
+struct alloc_types { };
+#endif
+
+template<class, class, class, class = void>
+struct alloc_has_construct {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+template<class A, class T, class... U>
+struct alloc_has_construct<A, T, alloc_types<U...>, typename
+    alloc_void<decltype(alloc_declval<A&>().construct(alloc_declval<T*>(),
+        alloc_declval<U>()...))>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#else
+template<class A, class T, class U>
+struct alloc_has_construct<A, T, alloc_types<U>, typename
+    alloc_void<decltype(alloc_declval<A&>().construct(alloc_declval<T*>(),
+        alloc_declval<U>()))>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#endif
+#endif
+
+} /* detail */
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+template<class A, class T, class... Args>
+inline typename detail::alloc_if<detail::alloc_has_construct<A, T,
+    detail::alloc_types<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 detail::alloc_if<!detail::alloc_has_construct<A, T,
+    detail::alloc_types<Args...> >::value>::type
+allocator_construct(A&, T* p, Args&&... args)
+{
+    ::new(static_cast<void*>(p)) T(std::forward<Args>(args)...);
+}
+#else
+template<class A, class T, class V>
+inline typename detail::alloc_if<detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A& a, T*p, V&& v)
+{
+    a.construct(p, std::forward<V>(v));
+}
+
+template<class A, class T, class V>
+inline typename detail::alloc_if<!detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A&, T* p, V&& v)
+{
+    ::new(static_cast<void*>(p)) T(std::forward<V>(v));
+}
+#endif
+#else
+template<class A, class T, class V>
+inline typename detail::alloc_if<detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A& a, T*p, const V& v)
+{
+    a.construct(p, v);
+}
+
+template<class A, class T, class V>
+inline typename detail::alloc_if<!detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A&, T* p, const V& v)
+{
+    ::new(static_cast<void*>(p)) T(v);
+}
+
+template<class A, class T, class V>
+inline typename detail::alloc_if<detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A& a, T*p, V& v)
+{
+    a.construct(p, v);
+}
+
+template<class A, class T, class V>
+inline typename detail::alloc_if<!detail::alloc_has_construct<A, T,
+    detail::alloc_types<V> >::value>::type
+allocator_construct(A&, T* p, V& v)
+{
+    ::new(static_cast<void*>(p)) T(v);
+}
+#endif
+
+namespace detail {
+
+template<class, class, class = void>
+struct alloc_has_destroy {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+template<class A, class T>
+struct alloc_has_destroy<A, T, typename
+    alloc_void<decltype(alloc_declval<A&>().
+        destroy(alloc_declval<T*>()))>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#endif
+
+} /* detail */
+
+template<class A, class T>
+inline typename detail::alloc_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 detail::alloc_if<!detail::alloc_has_destroy<A, T>::value>::type
+allocator_destroy(A&, T* p)
+{
+    p->~T();
+    (void)p;
+}
+
+namespace detail {
+
+template<class, class = void>
+struct alloc_has_max_size {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+template<class A>
+struct alloc_has_max_size<A,
+    typename alloc_void<decltype(alloc_declval<const
+        A&>().max_size())>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#endif
+
+} /* detail */
+
+template<class A>
+inline typename detail::alloc_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 detail::alloc_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);
+}
+
+namespace detail {
+
+template<class, class = void>
+struct alloc_has_soccc {
+    BOOST_STATIC_CONSTEXPR bool value = false;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+template<class A>
+struct alloc_has_soccc<A,
+    typename alloc_void<decltype(alloc_declval<const
+        A&>().select_on_container_copy_construction())>::type> {
+    BOOST_STATIC_CONSTEXPR bool value = true;
+};
+#endif
+
+} /* detail */
+
+template<class A>
+inline typename detail::alloc_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 detail::alloc_if<!detail::alloc_has_soccc<A>::value, A>::type
+allocator_select_on_container_copy_construction(const A& a)
+{
+    return a;
+}
+
+#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

include/boost/core/default_allocator.hpp

@@ -9,8 +9,8 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_CORE_DEFAULT_ALLOCATOR_HPP
 
 #include <boost/config.hpp>
+#include <limits>
 #include <new>
-#include <climits>
 
 #if defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 60000
 #define BOOST_CORE_NO_CXX11_ALLOCATOR
@@ -19,7 +19,7 @@ Distributed under the Boost Software License, Version 1.0.
 namespace boost {
 
 #if defined(BOOST_NO_EXCEPTIONS)
-void throw_exception(const std::exception&);
+BOOST_NORETURN void throw_exception(const std::exception&);
 #endif
 
 namespace default_ {
@@ -81,16 +81,12 @@ 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 PTRDIFF_MAX < SIZE_MAX / sizeof(T)
-            ? PTRDIFF_MAX : SIZE_MAX / sizeof(T);
+        return std::numeric_limits<std::ptrdiff_t>::max()
+            < std::numeric_limits<std::size_t>::max() / sizeof(T)
+            ? std::numeric_limits<std::ptrdiff_t>::max()
+            : std::numeric_limits<std::size_t>::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) {

include/boost/core/empty_value.hpp

@@ -139,6 +139,8 @@ public:
 
 using empty_::empty_value;
 
+BOOST_INLINE_CONSTEXPR empty_init_t empty_init = empty_init_t();
+
 } /* boost */
 
 #endif

include/boost/core/lightweight_test.hpp

@@ -30,6 +30,10 @@
 #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
@@ -48,7 +52,13 @@ 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
     }
 
@@ -83,12 +93,21 @@ inline int& test_errors()
     return test_results().errors();
 }
 
-inline void test_failed_impl(char const * expr, char const * file, int line, char const * function)
+inline bool test_impl(char const * expr, char const * file, int line, char const * function, bool v)
 {
-    BOOST_LIGHTWEIGHT_TEST_OSTREAM
-      << file << "(" << line << "): test '" << expr << "' failed in function '"
-      << function << "'" << std::endl;
-    ++test_results().errors();
+    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;
+    }
 }
 
 inline void error_impl(char const * msg, char const * file, int line, char const * function)
@@ -110,14 +129,14 @@ inline void throw_failed_impl(char const * excep, char const * file, int line, c
 // 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(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable: 4389)
-#elif defined(__clang__) && defined(__has_warning)
+#if 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"
@@ -174,13 +193,14 @@ struct lw_test_ge {
 };
 
 template<class BinaryPredicate, class T, class U>
-inline void test_with_impl(BinaryPredicate pred, char const * expr1, char const * expr2,
+inline bool 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
     {
@@ -189,15 +209,17 @@ inline void test_with_impl(BinaryPredicate pred, char const * expr1, char const
             << "' ('" << test_output_impl(t) << "' " << pred.op() << " '" << test_output_impl(u)
             << "') failed in function '" << function << "'" << std::endl;
         ++test_results().errors();
+        return false;
     }
 }
 
-inline void test_cstr_eq_impl( char const * expr1, char const * expr2,
+inline bool 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
     {
@@ -205,15 +227,17 @@ inline void 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 void test_cstr_ne_impl( char const * expr1, char const * expr2,
+inline bool 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
     {
@@ -221,11 +245,12 @@ inline void 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>
-void test_all_eq_impl(FormattedOutputFunction& output,
+bool 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)
@@ -284,16 +309,18 @@ void 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>
-void test_all_with_impl(FormattedOutputFunction& output,
+bool 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,
@@ -353,20 +380,22 @@ void 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(_MSC_VER)
-# pragma warning(pop)
-#elif defined(__clang__) && defined(__has_warning)
+#if 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
@@ -397,7 +426,7 @@ inline int report_errors()
 
 } // namespace boost
 
-#define BOOST_TEST(expr) ((expr)? (void)::boost::detail::test_results(): ::boost::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION))
+#define BOOST_TEST(expr) ( ::boost::detail::test_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, (expr)? true: false) )
 #define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr))
 
 #define BOOST_ERROR(msg) ( ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )

include/boost/core/lightweight_test_trait.hpp

@@ -126,6 +126,12 @@ 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

include/boost/core/nvp.hpp

@@ -0,0 +1,57 @@
+/*
+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

include/boost/core/pointer_traits.hpp

@@ -13,6 +13,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <memory>
 #else
 #include <boost/core/addressof.hpp>
+#include <cstddef>
 #endif
 
 namespace boost {

include/boost/core/quick_exit.hpp

@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
-#include <cstdlib>
+#include <stdlib.h>
 
 #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
 

include/boost/core/swap.hpp

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

test/CMakeLists.txt

@@ -0,0 +1,13 @@
+# 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)

test/Jamfile.v2

@@ -55,10 +55,12 @@ 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 : <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" ;
+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 ;
+
 run sp_typeinfo_test.cpp ;
 run sp_typeinfo_test.cpp : : : <rtti>off : sp_typeinfo_test_no_rtti ;
 
@@ -66,15 +68,32 @@ run visit_each_test.cpp ;
 
 run get_pointer_test.cpp ;
 
-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 ;
+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-fail lightweight_test_all_eq_test.cpp ;
 run-fail lightweight_test_all_with_fail.cpp ;
@@ -91,13 +110,16 @@ 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_fail11.cpp : ;
 run-fail lightweight_test_fail12.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 is_same_test.cpp ;
 
 run typeinfo_test.cpp ;
@@ -106,9 +128,12 @@ 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 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  : : : <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 ;
@@ -145,6 +170,26 @@ 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 ;
@@ -153,8 +198,10 @@ 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 ;

test/addressof_fn_test.cpp

@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 void f0()

test/addressof_np_test.cpp

@@ -7,7 +7,7 @@
 //
 
 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 
 #if defined( BOOST_NO_CXX11_NULLPTR )

test/addressof_test.cpp

@@ -20,7 +20,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {

test/addressof_test2.cpp

@@ -22,7 +22,7 @@
 #pragma warning(pop)
 #endif
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 template<class T> void scalar_test( T * = 0 )
 {

test/allocator_allocate_hint_test.cpp

@@ -0,0 +1,61 @@
+/*
+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 A1 {
+    typedef int* pointer;
+    typedef int size_type;
+
+    A1()
+        : value() { }
+
+    pointer allocate(size_type n) {
+        value = n;
+        return &value;
+    }
+
+    size_type value;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+struct A2 {
+    typedef int* pointer;
+    typedef int size_type;
+
+    A2()
+        : value() { }
+
+    pointer allocate(size_type n) {
+        value = n;
+        return &value;
+    }
+
+    pointer allocate(size_type n, const void*) {
+        value = n + 1;
+        return &value;
+    }
+
+    size_type value;
+};
+#endif
+
+int main()
+{
+    {
+        A1 a;
+        BOOST_TEST_EQ(*boost::allocator_allocate(a, 1, 0), 1);
+    }
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+    {
+        A2 a;
+        BOOST_TEST_EQ(*boost::allocator_allocate(a, 1, 0), 2);
+    }
+#endif
+    return boost::report_errors();
+}

test/allocator_allocate_test.cpp

@@ -0,0 +1,31 @@
+/*
+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 A {
+    typedef int* pointer;
+    typedef int size_type;
+
+    A()
+        : value() { }
+
+    pointer allocate(size_type n) {
+        value = n;
+        return &value;
+    }
+
+    size_type value;
+};
+
+int main()
+{
+    A a;
+    BOOST_TEST_EQ(*boost::allocator_allocate(a, 5), 5);
+    return boost::report_errors();
+}

test/allocator_const_pointer_test.cpp

@@ -0,0 +1,30 @@
+/*
+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>
+
+struct A1 {
+    typedef char value_type;
+    typedef int* pointer;
+};
+
+struct A2 {
+    typedef char value_type;
+    typedef int* pointer;
+    typedef const bool* const_pointer;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const char*,
+        boost::allocator_const_pointer<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const bool*,
+        boost::allocator_const_pointer<A2>::type>));
+    return boost::report_errors();
+}

test/allocator_const_void_pointer_test.cpp

@@ -0,0 +1,28 @@
+/*
+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>
+
+struct A1 {
+    typedef int* pointer;
+};
+
+struct A2 {
+    typedef int* pointer;
+    typedef const bool* const_void_pointer;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const void*,
+        boost::allocator_const_void_pointer<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<const bool*,
+        boost::allocator_const_void_pointer<A2>::type>));
+    return boost::report_errors();
+}

test/allocator_construct_test.cpp

@@ -0,0 +1,49 @@
+/*
+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/default_allocator.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+struct S {
+    S(int v)
+        : value(v) { }
+
+    int value;
+};
+
+struct A1 { };
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+struct A2 {
+    void construct(S* p, int v) {
+        new(p) S(v + 1);
+    }
+};
+#endif
+
+int main()
+{
+    boost::default_allocator<S> d;
+    {
+        S* p = d.allocate(1);
+        A1 a;
+        boost::allocator_construct(a, p, 1);
+        BOOST_TEST_EQ(p->value, 1);
+        d.deallocate(p, 1);
+    }
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+    {
+        S* p = d.allocate(1);
+        A2 a;
+        boost::allocator_construct(a, p, 1);
+        BOOST_TEST_EQ(p->value, 2);
+        d.deallocate(p, 1);
+    }
+#endif
+    return boost::report_errors();
+}

test/allocator_deallocate_test.cpp

@@ -0,0 +1,31 @@
+/*
+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 A {
+    typedef int* pointer;
+    typedef int size_type;
+
+    A()
+        : value() { }
+
+    void deallocate(pointer, size_type n) {
+        value = n;
+    }
+
+    size_type value;
+};
+
+int main()
+{
+    A a;
+    boost::allocator_deallocate(a, 0, 5);
+    BOOST_TEST_EQ(a.value, 5);
+    return boost::report_errors();
+}

test/allocator_destroy_test.cpp

@@ -0,0 +1,62 @@
+/*
+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/default_allocator.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+struct S {
+    static int count;
+
+    S() {
+        ++count;
+    }
+
+    S(const S&) {
+        ++count;
+    }
+
+    ~S() {
+        --count;
+    }
+};
+
+int S::count = 0;
+
+struct A1 { };
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+struct A2 {
+    void destroy(S*) {
+        ++S::count;
+    }
+};
+#endif
+
+int main()
+{
+    boost::default_allocator<S> d;
+    {
+        S* p = d.allocate(1);
+        new(p) S;
+        A1 a;
+        boost::allocator_destroy(a, p);
+        BOOST_TEST_EQ(S::count, 0);
+        d.deallocate(p, 1);
+    }
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+    {
+        S* p = d.allocate(1);
+        new(p) S;
+        A2 a;
+        boost::allocator_destroy(a, p);
+        BOOST_TEST_EQ(S::count, 2);
+        d.deallocate(p, 1);
+    }
+#endif
+    return boost::report_errors();
+}

test/allocator_difference_type_test.cpp

@@ -0,0 +1,28 @@
+/*
+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>
+
+struct A1 {
+    typedef char* pointer;
+};
+
+struct A2 {
+    typedef char* pointer;
+    typedef int difference_type;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<std::ptrdiff_t,
+        boost::allocator_difference_type<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int,
+        boost::allocator_difference_type<A2>::type>));
+    return boost::report_errors();
+}

test/allocator_is_always_equal_test.cpp

@@ -0,0 +1,36 @@
+/*
+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>
+
+struct A1 {
+    int value;
+};
+
+struct A2 {
+    struct is_always_equal {
+        BOOST_STATIC_CONSTEXPR bool value = true;
+    };
+
+    int value;
+};
+
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+struct A3 { };
+#endif
+
+int main()
+{
+    BOOST_TEST_TRAIT_FALSE((boost::allocator_is_always_equal<A1>::type));
+    BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A2>::type));
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+    BOOST_TEST_TRAIT_TRUE((boost::allocator_is_always_equal<A3>::type));
+#endif
+    return boost::report_errors();
+}

test/allocator_max_size_test.cpp

@@ -0,0 +1,35 @@
+/*
+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 A1 {
+    typedef long value_type;
+    typedef short size_type;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+struct A2 {
+    typedef long value_type;
+    typedef short size_type;
+
+    size_type max_size() const {
+        return 1;
+    }
+};
+#endif
+
+int main()
+{
+    BOOST_TEST_EQ(boost::allocator_max_size(A1()),
+        std::numeric_limits<A1::size_type>::max() / sizeof(A1::value_type));
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+    BOOST_TEST_EQ(boost::allocator_max_size(A2()), 1);
+#endif
+    return boost::report_errors();
+}

test/allocator_pocca_test.cpp

@@ -0,0 +1,27 @@
+/*
+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>
+
+struct A1 { };
+
+struct A2 {
+    struct propagate_on_container_copy_assignment {
+        BOOST_STATIC_CONSTEXPR bool value = true;
+    };
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_FALSE((boost::
+        allocator_propagate_on_container_copy_assignment<A1>::type));
+    BOOST_TEST_TRAIT_TRUE((boost::
+        allocator_propagate_on_container_copy_assignment<A2>::type));
+    return boost::report_errors();
+}

test/allocator_pocma_test.cpp

@@ -0,0 +1,27 @@
+/*
+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>
+
+struct A1 { };
+
+struct A2 {
+    struct propagate_on_container_move_assignment {
+        BOOST_STATIC_CONSTEXPR bool value = true;
+    };
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_FALSE((boost::
+        allocator_propagate_on_container_move_assignment<A1>::type));
+    BOOST_TEST_TRAIT_TRUE((boost::
+        allocator_propagate_on_container_move_assignment<A2>::type));
+    return boost::report_errors();
+}

test/allocator_pocs_test.cpp

@@ -0,0 +1,27 @@
+/*
+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>
+
+struct A1 { };
+
+struct A2 {
+    struct propagate_on_container_swap {
+        BOOST_STATIC_CONSTEXPR bool value = true;
+    };
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_FALSE((boost::
+        allocator_propagate_on_container_swap<A1>::type));
+    BOOST_TEST_TRAIT_TRUE((boost::
+        allocator_propagate_on_container_swap<A2>::type));
+    return boost::report_errors();
+}

test/allocator_pointer_test.cpp

@@ -0,0 +1,28 @@
+/*
+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>
+
+struct A1 {
+    typedef char value_type;
+};
+
+struct A2 {
+    typedef char value_type;
+    typedef int* pointer;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<char*,
+        boost::allocator_pointer<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int*,
+        boost::allocator_pointer<A2>::type>));
+    return boost::report_errors();
+}

test/allocator_rebind_test.cpp

@@ -0,0 +1,30 @@
+/*
+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, class, class>
+struct A1 { };
+
+template<class, class U, class V>
+struct A2 {
+    template<class T>
+    struct rebind {
+        typedef A1<T, U, V> other;
+    };
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A1<bool, int, float>,
+        boost::allocator_rebind<A1<char, int, float>, bool>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<A1<bool, int, float>,
+        boost::allocator_rebind<A2<char, int, float>, bool>::type>));
+    return boost::report_errors();
+}

test/allocator_size_type_test.cpp

@@ -0,0 +1,34 @@
+/*
+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>
+
+#if !defined(BOOST_NO_CXX11_HDR_TYPE_TRAITS)
+struct A1 {
+    typedef long difference_type;
+};
+#else
+struct A1 {
+    typedef unsigned long size_type;
+};
+#endif
+
+struct A2 {
+    typedef long difference_type;
+    typedef unsigned short size_type;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<unsigned long,
+        boost::allocator_size_type<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<unsigned short,
+        boost::allocator_size_type<A2>::type>));
+    return boost::report_errors();
+}

test/allocator_soccc_test.cpp

@@ -0,0 +1,40 @@
+/*
+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 A1 {
+    A1(int v)
+        : value(v) { }
+
+    int value;
+};
+
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+struct A2 {
+    A2(int v)
+        : value(v) { }
+
+    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(1)).value);
+#if defined(BOOST_CORE_ALLOCATOR_DETECTION)
+    BOOST_TEST_EQ(2,
+        boost::allocator_select_on_container_copy_construction(A2(1)).value);
+#endif
+    return boost::report_errors();
+}

test/allocator_value_type_test.cpp

@@ -0,0 +1,21 @@
+/*
+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>
+
+struct A {
+    typedef int value_type;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<int,
+        boost::allocator_value_type<A>::type>));
+    return boost::report_errors();
+}

test/allocator_void_pointer_test.cpp

@@ -0,0 +1,28 @@
+/*
+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>
+
+struct A1 {
+    typedef int* pointer;
+};
+
+struct A2 {
+    typedef int* pointer;
+    typedef bool* void_pointer;
+};
+
+int main()
+{
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<void*,
+        boost::allocator_void_pointer<A1>::type>));
+    BOOST_TEST_TRAIT_TRUE((boost::core::is_same<bool*,
+        boost::allocator_void_pointer<A2>::type>));
+    return boost::report_errors();
+}

test/cmake_install_test/CMakeLists.txt

@@ -0,0 +1,17 @@
+# 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>)

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)
+cmake_minimum_required(VERSION 3.5...3.16)
 
 project(cmake_subdir_test LANGUAGES CXX)
 

test/eif_constructors.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

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/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

test/eif_lazy.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if_c;
 using boost::lazy_enable_if_c;

test/eif_lazy_test.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::lazy_enable_if;
 using boost::lazy_disable_if;

test/eif_member_templates.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::disable_if;

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/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;

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/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if;
 using boost::is_arithmetic;

test/eif_partial_specializations.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using boost::enable_if_has_type;
 using boost::enable_if_c;

test/explicit_operator_bool_noexcept.cpp

@@ -18,7 +18,7 @@
 
 #if !defined(BOOST_NO_CXX11_NOEXCEPT)
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/utility/explicit_operator_bool.hpp>
 
 namespace {

test/lightweight_test_bool.cpp

@@ -0,0 +1,63 @@
+// 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;
+}

test/lightweight_test_eq_nullptr.cpp

@@ -8,8 +8,12 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/config.hpp>
+#if defined(_MSC_VER)
+# pragma warning( disable: 4100 ) // nullptr_t parameter unrereferenced
+#endif
+
 #include <boost/core/lightweight_test.hpp>
+#include <boost/config.hpp>
 
 int main()
 {

test/lightweight_test_fail.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail2.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail3.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail4.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/lightweight_test_fail5.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {

test/lightweight_test_fail6.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {

test/lightweight_test_test.cpp

@@ -8,8 +8,14 @@
 // 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
 {
@@ -33,6 +39,16 @@ 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;

test/lightweight_test_test5.cpp

@@ -0,0 +1,19 @@
+//
+// Test that BOOST_TEST_EQ doesn't emit sign compare warnings
+//
+// Copyright 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>
+
+int main()
+{
+    BOOST_TEST_EQ(1, 1u);
+    BOOST_TEST_EQ(~0u, -1);
+
+    return boost::report_errors();
+}

test/nvp_test.cpp

@@ -0,0 +1,46 @@
+/*
+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();
+}

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/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace {
 

test/ref_fn_test.cpp

@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 void f0()

test/ref_test.cpp

@@ -7,7 +7,7 @@
 // see 'ref_ct_test.cpp' for compile-time part
 
 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace {
 using namespace boost;

test/sp_typeinfo_test.cpp

@@ -11,7 +11,7 @@
 #define BOOST_ALLOW_DEPRECATED_HEADERS
 
 #include <boost/detail/sp_typeinfo.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 int main()

test/swap/CMakeLists.txt

@@ -0,0 +1,11 @@
+# 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()

test/swap/Jamfile.v2

@@ -7,65 +7,31 @@
 # bring in rules for testing
 import testing ;
 
-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 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_fail_tests =
-    const_wrapper_fail.cpp ;
+compile-fail swap_const_wrapper_fail.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 ] ;
+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 ;