Apply workaround for Intel-16

Without this I see: ``` /boost/core/noncopyable.hpp(42): error: defaulted default constructor cannot be constexpr because the corresponding implicitly declared default constructor would not be constexpr BOOST_CONSTEXPR noncopyable() = default; ``` See: https://travis-ci.org/boostorg/type_traits/jobs/4722892817 Not sure if later Intel versions also require this... still working on that.
2018-12-30 18:29:54 +00:00
22 changed files with 71 additions and 472 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -240,7 +240,6 @@ matrix:
        apt:
          packages:
            - libc++-dev
-            - libc++abi-dev

    - os: linux
      compiler: clang++-libc++
@@ -249,40 +248,13 @@ matrix:
        apt:
          packages:
            - libc++-dev
-            - libc++abi-dev

    - os: osx
      compiler: clang++
      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode7.3
-
-    - os: osx
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode8.3
-
-    - os: osx
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode9.4
-
-    - os: osx
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
-      osx_image: xcode10.1
-
-    - os: linux
-      compiler: g++
-      env: CMAKE_SUBDIR_TEST=1
-      script:
-      - cd libs/core/test/cmake_subdir_test && mkdir __build__ && cd __build__
-      - cmake ..
-      - cmake --build .
-      - cmake --build . --target check

 install:
-  - BOOST_BRANCH=develop
-  - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
  - cd ..
  - git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root
  - cd boost-root
@@ -291,7 +263,6 @@ install:
  - git submodule init libs/config
  - git submodule init libs/predef
  - git submodule init libs/static_assert
-  - git submodule init libs/throw_exception
  - git submodule init libs/type_traits
  - git submodule init tools/build
  - git submodule init tools/boost_install
@@ -303,8 +274,7 @@ install:
 script:
  - |-
    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - BUILD_JOBS=`(nproc || sysctl -n hw.ncpu) 2> /dev/null`
-  - ./b2 -j $BUILD_JOBS libs/core/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
+  - ./b2 -j 3 libs/core/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}

 notifications:
  email:
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Peter Dimov
+# Copyright 2016, 2017 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)

@@ -14,39 +14,37 @@ branches:

 environment:
  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0

    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-12.0,msvc-14.0
-      ADDRMD: 32,64
+      TOOLSET: msvc-14.0

    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1,clang-win
-      ADDRMD: 32,64
+      TOOLSET: msvc-14.1
      CXXSTD: 14,17

-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\cygwin\bin;
      TOOLSET: gcc
      CXXSTD: 03,11,14,1z

-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\cygwin64\bin;
      TOOLSET: gcc
      CXXSTD: 03,11,14,1z

-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw\bin;
      TOOLSET: gcc
      CXXSTD: 03,11,14,1z

-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
      TOOLSET: gcc
      CXXSTD: 03,11,14,1z

-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
      TOOLSET: gcc
      CXXSTD: 03,11,14,1z
@@ -62,12 +60,11 @@ install:
  - git submodule init libs/config
  - git submodule init libs/predef
  - git submodule init libs/static_assert
-  - git submodule init libs/throw_exception
  - git submodule init libs/type_traits
  - git submodule init tools/build
  - git submodule init tools/boost_install
  - git submodule update --jobs 4
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\core\
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\core
  - cmd /c bootstrap
  - b2 headers

@@ -76,5 +73,4 @@ build: off
 test_script:
  - PATH=%ADDPATH%%PATH%
  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
-  - b2 -j %NUMBER_OF_PROCESSORS% libs/core/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release
+  - b2 -j 3 libs/core/test toolset=%TOOLSET% %CXXSTD%
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -49,7 +49,7 @@ boostbook standalone
    <xsl:param>boost.root=../../../..
    <xsl:param>generate.section.toc.level=1
    <xsl:param>toc.max.depth=1
-    <format>pdf:<xsl:param>boost.url.prefix="http://www.boost.org/doc/libs/release/libs/core/doc/html"
+    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/core/doc/html
  ;

 ###############################################################################
--- a/doc/core.qbk
+++ b/doc/core.qbk
@@ -58,4 +58,3 @@ criteria for inclusion is that the utility component be:
 [include swap.qbk]
 [include typeinfo.qbk]
 [include uncaught_exceptions.qbk]
-[include use_default.qbk]
--- a/doc/lightweight_test.qbk
+++ b/doc/lightweight_test.qbk
@@ -1,7 +1,7 @@
 [/
  Copyright 2010, 2011 Beman Dawes
  Copyright 2013 Ion Gaztanaga
-  Copyright 2014-2019 Peter Dimov
+  Copyright 2014, 2017 Peter Dimov
  Copyright 2017 Kohei Takahashi

  Distributed under the Boost Software License, Version 1.0.
@@ -253,7 +253,6 @@ return a boolean value.
 ``
 #define BOOST_TEST_TRAIT_TRUE((Trait)) /*unspecified*/
 #define BOOST_TEST_TRAIT_FALSE((Trait)) /*unspecified*/
-#define BOOST_TEST_TRAIT_SAME(Type1, Type2) /*unspecified*/
 ``

 [endsect]
@@ -281,20 +280,6 @@ message containing `Trait`. Note the double set of parentheses.

 [endsect]

-[section BOOST_TEST_TRAIT_SAME]
-
-``
-BOOST_TEST_TRAIT_SAME(Type1, Type2)
-``
-
-If the two types are not the same, increases the error count and outputs a
-message containing them. This macro requires that the compiler supports
-variadic macros and `__VA_ARGS__`. (Note that unlike `BOOST_TEST_TRAIT_TRUE`
-and `BOOST_TEST_TRAIT_FALSE`, this macro only requires a single set of
-parentheses.)
-
-[endsect]
-
 [section Example]

 ``
@@ -312,8 +297,6 @@ int main()
 {
    BOOST_TEST_TRAIT_TRUE(( is_same<X<int, long>::type, int> ));

-    BOOST_TEST_TRAIT_SAME( X<int, long>::type, int );
-
    return boost::report_errors();
 }
 ``
--- a/doc/use_default.qbk
+++ b/doc/use_default.qbk
@@ -1,47 +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:use_default use_default]
-
-[section Overview]
-
-The header <boost/core/use_default.hpp> provides the type `boost::use_default`
-which is used by other Boost libraries as a sentinel type in a templates to
-indicate defaults.
-
-[endsect]
-
-[section Example]
-
-```
-template<class Derived, class Base,
-   class Value = boost::use_default,
-   class CategoryOrTraversal = boost::use_default,
-   class Reference = boost::use_default,
-   class Difference = boost::use_default>
-class iterator_adaptor;
-
-template<class Value>
-class node_iterator
-    : public iterator_adaptor<node_iterator<Value>, Value*,
-        boost::use_default, boost::forward_traversal_tag>;
-```
-
-[endsect]
-
-[section Reference]
-
-```
-namespace boost {
-  struct use_default { };
-}
-```
-
-[endsect]
-
-[endsect]
--- a/include/boost/core/checked_delete.hpp
+++ b/include/boost/core/checked_delete.hpp
@@ -7,8 +7,6 @@
 # pragma once
 #endif

-#include <boost/config.hpp>
-
 //
 //  boost/checked_delete.hpp
 //
@@ -28,7 +26,7 @@ namespace boost

 // verify that types are complete for increased safety

-template<class T> inline void checked_delete(T * x) BOOST_NOEXCEPT
+template<class T> inline void checked_delete(T * x)
 {
    // intentionally complex - simplification causes regressions
    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
@@ -36,7 +34,7 @@ template<class T> inline void checked_delete(T * x) BOOST_NOEXCEPT
    delete x;
 }

-template<class T> inline void checked_array_delete(T * x) BOOST_NOEXCEPT
+template<class T> inline void checked_array_delete(T * x)
 {
    typedef char type_must_be_complete[ sizeof(T)? 1: -1 ];
    (void) sizeof(type_must_be_complete);
@@ -48,7 +46,7 @@ template<class T> struct checked_deleter
    typedef void result_type;
    typedef T * argument_type;

-    void operator()(T * x) const BOOST_NOEXCEPT
+    void operator()(T * x) const
    {
        // boost:: disables ADL
        boost::checked_delete(x);
@@ -60,7 +58,7 @@ template<class T> struct checked_array_deleter
    typedef void result_type;
    typedef T * argument_type;

-    void operator()(T * x) const BOOST_NOEXCEPT
+    void operator()(T * x) const
    {
        boost::checked_array_delete(x);
    }
--- a/include/boost/core/lightweight_test.hpp
+++ b/include/boost/core/lightweight_test.hpp
@@ -22,8 +22,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //

+#include <boost/core/no_exceptions_support.hpp>
 #include <boost/current_function.hpp>
-#include <boost/config.hpp>
 #include <iostream>
 #include <iterator>
 #include <cstdlib>
--- a/include/boost/core/lightweight_test_trait.hpp
+++ b/include/boost/core/lightweight_test_trait.hpp
@@ -9,7 +9,7 @@

 // boost/core/lightweight_test_trait.hpp
 //
-// BOOST_TEST_TRAIT_TRUE, BOOST_TEST_TRAIT_FALSE, BOOST_TEST_TRAIT_SAME
+// BOOST_TEST_TRAIT_TRUE, BOOST_TEST_TRAIT_FALSE
 //
 // Copyright 2014 Peter Dimov
 //
@@ -19,7 +19,6 @@

 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/typeinfo.hpp>
-#include <boost/core/is_same.hpp>

 namespace boost
 {
@@ -47,37 +46,11 @@ template< class T > inline void test_trait_impl( char const * trait, void (*)( T
    }
 }

-template<class T> inline bool test_trait_same_impl_( T )
-{
-    return T::value;
-}
-
-template<class T1, class T2> inline void test_trait_same_impl( char const * types,
-  boost::core::is_same<T1, T2> same, char const * file, int line, char const * function )
-{
-    if( test_trait_same_impl_( same ) )
-    {
-        test_results();
-    }
-    else
-    {
-        BOOST_LIGHTWEIGHT_TEST_OSTREAM
-            << file << "(" << line << "): test 'is_same<" << types << ">'"
-            << " failed in function '" << function
-            << "' ('" << boost::core::demangled_name( BOOST_CORE_TYPEID(T1) )
-            << "' != '" << boost::core::demangled_name( BOOST_CORE_TYPEID(T2) ) << "')"
-            << std::endl;
-
-        ++test_results().errors();
-    }
-}
-
 } // namespace detail

 } // namespace boost

 #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) )
-#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
@@ -32,21 +32,9 @@
 #    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
+#    else
 #        define BOOST_TRY { if (true)
 #        define BOOST_CATCH(x) else if (false)
-#    else
-         // warning C4127: conditional expression is constant
-#        define BOOST_TRY { \
-             __pragma(warning(push)) \
-             __pragma(warning(disable: 4127)) \
-             if (true) \
-             __pragma(warning(pop))
-#        define BOOST_CATCH(x) else \
-             __pragma(warning(push)) \
-             __pragma(warning(disable: 4127)) \
-             if (false) \
-             __pragma(warning(pop))
 #    endif
 #    define BOOST_RETHROW
 #    define BOOST_CATCH_END }
--- a/include/boost/core/noncopyable.hpp
+++ b/include/boost/core/noncopyable.hpp
@@ -38,7 +38,8 @@ namespace noncopyable_  // protection from unintended ADL
  class noncopyable: base_token
  {
  protected:
-#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS)
+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS)\
+      && !BOOST_WORKAROUND(__ICC, <= 1600)
      BOOST_CONSTEXPR noncopyable() = default;
      ~noncopyable() = default;
 #else
--- a/include/boost/core/typeinfo.hpp
+++ b/include/boost/core/typeinfo.hpp
@@ -47,7 +47,7 @@ public:

    bool operator==( typeinfo const& rhs ) const
    {
-#if ( defined(_WIN32) || defined(__CYGWIN__) ) && ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
+#if ( defined(_WIN32) || defined(__CYGWIN__) ) && defined(__GNUC__) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)

        return lib_id_ == rhs.lib_id_? this == &rhs: std::strcmp( name_, rhs.name_ ) == 0;

@@ -65,7 +65,7 @@ public:

    bool before( typeinfo const& rhs ) const
    {
-#if ( defined(_WIN32) || defined(__CYGWIN__) ) && ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)
+#if ( defined(_WIN32) || defined(__CYGWIN__) ) && defined(__GNUC__) && !defined(BOOST_DISABLE_CURRENT_FUNCTION)

        return lib_id_ == rhs.lib_id_? std::less< typeinfo const* >()( this, &rhs ): std::strcmp( name_, rhs.name_ ) < 0;

--- a/include/boost/core/uncaught_exceptions.hpp
+++ b/include/boost/core/uncaught_exceptions.hpp
@@ -9,7 +9,7 @@
 * \author Andrey Semashev
 * \date   2018-11-10
 *
- * \brief  This header provides an `uncaught_exceptions` function implementation, which was introduced in C++17.
+ * \brief  This header provides an `uncaught_exception` function implementation, which was introduced in C++17.
 *
 * The code in this file is based on the implementation by Evgeny Panasyuk:
 *
@@ -46,36 +46,20 @@
 #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().
-#if !(defined(__MINGW32__) && (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 405))
-#include <cxxabi.h>
-#include <cstring>
+#if !defined(__MINGW32__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)))
 #define BOOST_CORE_HAS_CXA_GET_GLOBALS
-// At least on MinGW and Linux, only GCC since 4.7 declares __cxa_get_globals() in cxxabi.h. Older versions of GCC do not expose this function but it's there.
-// On OpenBSD, it seems, the declaration is also missing.
-// Note that at least on FreeBSD 11, cxxabi.h declares __cxa_get_globals with a different exception specification, so we can't declare the function unconditionally.
-// On Linux with clang and libc++ and on OS X, there is a version of cxxabi.h from libc++abi that doesn't declare __cxa_get_globals, but provides __cxa_uncaught_exceptions.
-// The function only appeared in version _LIBCPPABI_VERSION >= 1002 of the library. Unfortunately, there are linking errors about undefined reference to __cxa_uncaught_exceptions
-// on Ubuntu Trusty and OS X, so we avoid using it and forward-declare __cxa_get_globals instead.
-#if !defined(__FreeBSD__) && \
-    ( \
-        (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407) || \
-        defined(__OpenBSD__) || \
-        defined(_LIBCPPABI_VERSION) \
-    )
+#include <cxxabi.h>
+// Only GCC 4.7 declares __cxa_get_globals() in cxxabi.h, older compilers do not expose this function but it's there
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407
 namespace __cxxabiv1 {
 struct __cxa_eh_globals;
-#if defined(__OpenBSD__)
-extern "C" __cxa_eh_globals* __cxa_get_globals();
-#else
 extern "C" __cxa_eh_globals* __cxa_get_globals() BOOST_NOEXCEPT_OR_NOTHROW __attribute__((__const__));
-#endif
 } // namespace __cxxabiv1
+#endif // defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407
 #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
-#include <cstring>
 #define BOOST_CORE_HAS_GETPTD
 namespace boost {
 namespace core {
@@ -105,14 +89,10 @@ inline unsigned int uncaught_exceptions() BOOST_NOEXCEPT
    return static_cast< unsigned int >(std::uncaught_exceptions());
 #elif defined(BOOST_CORE_HAS_CXA_GET_GLOBALS)
    // Tested on {clang 3.2,GCC 3.5.6,GCC 4.1.2,GCC 4.4.6,GCC 4.4.7}x{x32,x64}
-    unsigned int count;
-    std::memcpy(&count, reinterpret_cast< const unsigned char* >(::abi::__cxa_get_globals()) + sizeof(void*), sizeof(count)); // __cxa_eh_globals::uncaughtExceptions, x32 offset - 0x4, x64 - 0x8
-    return count;
+    return *(reinterpret_cast< const unsigned int* >(reinterpret_cast< const char* >(::abi::__cxa_get_globals()) + sizeof(void*))); // __cxa_eh_globals::uncaughtExceptions, x32 offset - 0x4, x64 - 0x8
 #elif defined(BOOST_CORE_HAS_GETPTD)
    // MSVC specific. Tested on {MSVC2005SP1,MSVC2008SP1,MSVC2010SP1,MSVC2012}x{x32,x64}.
-    unsigned int count;
-    std::memcpy(&count, static_cast< const unsigned char* >(boost::core::detail::_getptd()) + (sizeof(void*) == 8u ? 0x100 : 0x90), sizeof(count)); // _tiddata::_ProcessingThrow, x32 offset - 0x90, x64 - 0x100
-    return count;
+    return *(reinterpret_cast< const unsigned int* >(static_cast< const char* >(boost::core::detail::_getptd()) + (sizeof(void*) == 8 ? 0x100 : 0x90))); // _tiddata::_ProcessingThrow, x32 offset - 0x90, x64 - 0x100
 #else
    // Portable C++03 implementation. Does not allow to detect multiple nested exceptions.
    return static_cast< unsigned int >(std::uncaught_exception());
--- a/include/boost/core/use_default.hpp
+++ b/include/boost/core/use_default.hpp
@@ -1,17 +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_USE_DEFAULT_HPP
-#define BOOST_CORE_USE_DEFAULT_HPP
-
-namespace boost {
-
-struct use_default { };
-
-} /* boost */
-
-#endif
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -76,8 +76,6 @@ 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_fail.cpp ;
 run-fail lightweight_test_fail2.cpp ;
@@ -128,26 +126,20 @@ run exchange_move_test.cpp ;

 run empty_value_test.cpp ;
 run empty_value_size_test.cpp ;
-run empty_value_final_test.cpp ;

 run quick_exit_test.cpp ;
 run-fail quick_exit_fail.cpp ;

-compile use_default_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 ;
 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 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 no_exceptions_support_test.cpp ;
-run no_exceptions_support_test.cpp : : : <exception-handling>off : no_exceptions_support_test_nx ;
-
 use-project /boost/core/swap : ./swap ;
 build-project ./swap ;
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -1,19 +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)
-
-project(cmake_subdir_test LANGUAGES CXX)
-
-add_subdirectory(../.. boostorg/core)
-add_subdirectory(../../../assert boostorg/assert)
-add_subdirectory(../../../config boostorg/config)
-
-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/empty_value_final_test.cpp
+++ b/test/empty_value_final_test.cpp
@@ -1,62 +0,0 @@
-/*
-Copyright 2018 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/empty_value.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-#if !defined(BOOST_NO_CXX11_FINAL)
-class type final {
-public:
-    explicit type(int count)
-        : value_(count) { }
-    int value() const {
-        return value_ + 1;
-    }
-    int value() {
-        return value_ + 2;
-    }
-private:
-    int value_;
-};
-
-struct empty final {
-    int value() const {
-        return 1;
-    }
-    int value() {
-        return 2;
-    }
-};
-
-void test_type()
-{
-    const boost::empty_value<type> v1(boost::empty_init_t(), 3);
-    BOOST_TEST(v1.get().value() == 4);
-    boost::empty_value<type> v2(boost::empty_init_t(), 3);
-    BOOST_TEST(v2.get().value() == 5);
-}
-
-void test_empty()
-{
-    const boost::empty_value<empty> v1 = boost::empty_init_t();
-    BOOST_TEST(v1.get().value() == 1);
-    boost::empty_value<empty> v2;
-    BOOST_TEST(v2.get().value() == 2);
-}
-
-int main()
-{
-    test_type();
-    test_empty();
-    return boost::report_errors();
-}
-#else
-int main()
-{
-    return 0;
-}
-#endif
--- a/test/empty_value_test.cpp
+++ b/test/empty_value_test.cpp
@@ -9,63 +9,67 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/core/lightweight_test.hpp>

 struct empty {
-    int value() const {
-        return 1;
+    operator bool() const {
+        return false;
    }
-    int value() {
-        return 2;
+    operator bool() {
+        return true;
    }
 };

 class type {
 public:
-    explicit type(int count)
-        : value_(count) { }
-    int value() const {
-        return value_ + 1;
-    }
-    int value() {
-        return value_ + 2;
+    type()
+        : value_(false) { }
+    explicit type(bool value)
+        : value_(value) { }
+    operator bool() const {
+        return value_;
    }
 private:
-    int value_;
+    bool value_;
 };

-void test_int()
+void test_bool()
 {
-    const boost::empty_value<int> v1(boost::empty_init_t(), 7);
-    BOOST_TEST(v1.get() == 7);
-    boost::empty_value<int> v2 = boost::empty_init_t();
-    BOOST_TEST(v2.get() == 0);
+    const boost::empty_value<bool> v1(boost::empty_init_t(), true);
+    BOOST_TEST(v1.get());
+    boost::empty_value<bool> v2 = boost::empty_init_t();
+    BOOST_TEST(!v2.get());
    v2 = v1;
-    BOOST_TEST(v2.get() == 7);
-    v2.get() = 8;
-    BOOST_TEST(v2.get() == 8);
+    BOOST_TEST(v2.get());
+    v2.get() = false;
+    BOOST_TEST(!v2.get());
 }

 void test_empty()
 {
-    const boost::empty_value<empty> v1 = boost::empty_init_t();
-    BOOST_TEST(v1.get().value() == 1);
+    empty e;
+    const boost::empty_value<empty> v1(boost::empty_init_t(), e);
+    BOOST_TEST(!v1.get());
    boost::empty_value<empty> v2;
-    BOOST_TEST(v2.get().value() == 2);
+    BOOST_TEST(v2.get());
+    v2 = v1;
+    BOOST_TEST(v2.get());
+    v2.get() = empty();
+    BOOST_TEST(v2.get());
 }

 void test_type()
 {
-    const boost::empty_value<type> v1(boost::empty_init_t(), 2);
-    BOOST_TEST(v1.get().value() == 3);
-    boost::empty_value<type> v2(boost::empty_init_t(), 3);
-    BOOST_TEST(v2.get().value() == 5);
+    const boost::empty_value<type> v1(boost::empty_init_t(), true);
+    BOOST_TEST(v1.get());
+    boost::empty_value<type> v2;
+    BOOST_TEST(!v2.get());
    v2 = v1;
-    BOOST_TEST(v2.get().value() == 4);
-    v2.get() = type(4);
-    BOOST_TEST(v2.get().value() == 6);
+    BOOST_TEST(v2.get());
+    v2.get() = type();
+    BOOST_TEST(!v2.get());
 }

 int main()
 {
-    test_int();
+    test_bool();
    test_empty();
    test_type();
    return boost::report_errors();
--- a/test/lightweight_test_test4.cpp
+++ b/test/lightweight_test_test4.cpp
@@ -1,36 +0,0 @@
-//
-// 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>
-
-struct X
-{
-    typedef int type;
-};
-
-template<class T1, class T2> struct Y
-{
-    typedef T1 type;
-};
-
-int main()
-{
-    BOOST_TEST_TRAIT_SAME(X, X);
-    BOOST_TEST_TRAIT_SAME(void, void);
-    BOOST_TEST_TRAIT_SAME(char[1], char[1]);
-    BOOST_TEST_TRAIT_SAME(char[], char[]);
-    BOOST_TEST_TRAIT_SAME(void(), void());
-    BOOST_TEST_TRAIT_SAME(X::type, X::type);
-    BOOST_TEST_TRAIT_SAME(X::type, Y<int, float>::type);
-    BOOST_TEST_TRAIT_SAME(Y<int, float>, Y<int, float>);
-    BOOST_TEST_TRAIT_SAME(Y<void, float>::type, void);
-
-    return boost::report_errors();
-}
--- a/test/lightweight_test_test5.cpp
+++ b/test/lightweight_test_test5.cpp
@@ -1,37 +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>
-
-struct X
-{
-    typedef int type;
-};
-
-template<class T1, class T2> struct Y
-{
-    typedef T1 type;
-};
-
-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>);
-
-    return boost::report_errors() == 10;
-}
--- a/test/no_exceptions_support_test.cpp
+++ b/test/no_exceptions_support_test.cpp
@@ -1,52 +0,0 @@
-//
-// Test for no_exceptions_support.hpp
-//
-// 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/no_exceptions_support.hpp>
-#include <boost/core/quick_exit.hpp>
-#include <boost/throw_exception.hpp>
-#include <exception>
-
-void f()
-{
-    boost::throw_exception( std::exception() );
-}
-
-int main()
-{
-    BOOST_TRY
-    {
-        f();
-    }
-    BOOST_CATCH( std::exception const& )
-    {
-        return 0;
-    }
-    BOOST_CATCH( ... )
-    {
-        return 1;
-    }
-    BOOST_CATCH_END
-
-    return 1;
-}
-
-#if defined(BOOST_NO_EXCEPTIONS)
-
-namespace boost
-{
-
-void throw_exception( std::exception const& )
-{
-    boost::quick_exit( 0 );
-}
-
-}
-
-#endif
--- a/test/use_default_test.cpp
+++ b/test/use_default_test.cpp
@@ -1,15 +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/use_default.hpp>
-
-template<class, class = boost::use_default>
-struct type { };
-
-template class type<int>;
-template class type<void, boost::use_default>;