Remove lwm_nop.hpp; add lwm_std_mutex.hpp

appveyor.yml

@@ -20,7 +20,15 @@ environment:
       TOOLSET: msvc-12.0,msvc-14.0
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1,clang-win
+      TOOLSET: msvc-14.1
+      CXXSTD: 14,17
+      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      CXXSTD: 14,17
+      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
       CXXSTD: 14,17
       ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

include/boost/smart_ptr/detail/lightweight_mutex.hpp

@@ -28,15 +28,12 @@
 
 #include <boost/config.hpp>
 
-#if !defined(BOOST_HAS_THREADS)
+#if !defined(BOOST_NO_CXX11_HDR_MUTEX )
-#  include <boost/smart_ptr/detail/lwm_nop.hpp>
+#  include <boost/smart_ptr/detail/lwm_std_mutex.hpp>
-#elif defined(BOOST_HAS_PTHREADS)
+#elif defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-#  include <boost/smart_ptr/detail/lwm_pthreads.hpp>
-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #  include <boost/smart_ptr/detail/lwm_win32_cs.hpp>
 #else
-// Use #define BOOST_DISABLE_THREADS to avoid the error
+#  include <boost/smart_ptr/detail/lwm_pthreads.hpp>
-#  error Unrecognized threading platform
 #endif
 
 #endif // #ifndef BOOST_SMART_PTR_DETAIL_LIGHTWEIGHT_MUTEX_HPP_INCLUDED

include/boost/smart_ptr/detail/lwm_nop.hpp

@@ -1,37 +0,0 @@
-#ifndef BOOST_SMART_PTR_DETAIL_LWM_NOP_HPP_INCLUDED
-#define BOOST_SMART_PTR_DETAIL_LWM_NOP_HPP_INCLUDED
-
-// MS compatible compilers support #pragma once
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-//
-//  boost/detail/lwm_nop.hpp
-//
-//  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//
-// 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)
-//
-
-namespace boost
-{
-
-namespace detail
-{
-
-class lightweight_mutex
-{
-public:
-
-    typedef lightweight_mutex scoped_lock;
-};
-
-} // namespace detail
-
-} // namespace boost
-
-#endif // #ifndef BOOST_SMART_PTR_DETAIL_LWM_NOP_HPP_INCLUDED

include/boost/smart_ptr/detail/lwm_std_mutex.hpp

@@ -0,0 +1,62 @@
+#ifndef BOOST_SMART_PTR_DETAIL_LWM_STD_MUTEX_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_LWM_STD_MUTEX_HPP_INCLUDED
+
+// Copyright 2020 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/assert.hpp>
+#include <mutex>
+
+namespace boost
+{
+
+namespace detail
+{
+
+class lightweight_mutex
+{
+private:
+
+    std::mutex m_;
+
+    lightweight_mutex(lightweight_mutex const &);
+    lightweight_mutex & operator=(lightweight_mutex const &);
+
+public:
+
+    lightweight_mutex()
+    {
+    }
+
+    class scoped_lock;
+    friend class scoped_lock;
+
+    class scoped_lock
+    {
+    private:
+
+        std::mutex & m_;
+
+        scoped_lock(scoped_lock const &);
+        scoped_lock & operator=(scoped_lock const &);
+
+    public:
+
+        scoped_lock( lightweight_mutex & m ): m_( m.m_ )
+        {
+            m_.lock();
+        }
+
+        ~scoped_lock()
+        {
+            m_.unlock();
+        }
+    };
+};
+
+} // namespace detail
+
+} // namespace boost
+
+#endif // #ifndef BOOST_SMART_PTR_DETAIL_LWM_STD_MUTEX_HPP_INCLUDED

include/boost/smart_ptr/detail/lwm_win32_cs.hpp

@@ -11,15 +11,12 @@
 //  boost/detail/lwm_win32_cs.hpp
 //
 //  Copyright (c) 2002, 2003 Peter Dimov
-//  Copyright (c) Microsoft Corporation 2014
 //
 // 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/predef.h>
-
 #ifdef BOOST_USE_WINDOWS_H
 
 #include <windows.h>
@@ -52,11 +49,7 @@ struct critical_section
 #endif
 };
 
-#if BOOST_PLAT_WINDOWS_RUNTIME
-extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSectionEx(::_RTL_CRITICAL_SECTION *, unsigned long, unsigned long);
-#else
 extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSection(::_RTL_CRITICAL_SECTION *);
-#endif
 extern "C" __declspec(dllimport) void __stdcall EnterCriticalSection(::_RTL_CRITICAL_SECTION *);
 extern "C" __declspec(dllimport) void __stdcall LeaveCriticalSection(::_RTL_CRITICAL_SECTION *);
 extern "C" __declspec(dllimport) void __stdcall DeleteCriticalSection(::_RTL_CRITICAL_SECTION *);
@@ -67,11 +60,7 @@ typedef ::_RTL_CRITICAL_SECTION rtl_critical_section;
 
 typedef ::CRITICAL_SECTION critical_section;
 
-#if BOOST_PLAT_WINDOWS_RUNTIME
-using ::InitializeCriticalSectionEx;
-#else
 using ::InitializeCriticalSection;
-#endif
 using ::EnterCriticalSection;
 using ::LeaveCriticalSection;
 using ::DeleteCriticalSection;
@@ -93,11 +82,7 @@ public:
 
     lightweight_mutex()
     {
-#if BOOST_PLAT_WINDOWS_RUNTIME
-        boost::detail::InitializeCriticalSectionEx(reinterpret_cast< rtl_critical_section* >(&cs_), 4000, 0);
-#else
         boost::detail::InitializeCriticalSection(reinterpret_cast< rtl_critical_section* >(&cs_));
-#endif
     }
 
     ~lightweight_mutex()

include/boost/smart_ptr/detail/sp_counted_base_w32.hpp

@@ -26,7 +26,7 @@
 
 #include <boost/smart_ptr/detail/sp_interlocked.hpp>
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/config.hpp>
 
 namespace boost

include/boost/smart_ptr/detail/yield_k.hpp

@@ -11,7 +11,6 @@
 //  yield_k.hpp
 //
 //  Copyright (c) 2008 Peter Dimov
-//  Copyright (c) Microsoft Corporation 2014
 //
 //  void yield( unsigned k );
 //
@@ -25,11 +24,6 @@
 //
 
 #include <boost/config.hpp>
-#include <boost/predef/platform/windows_runtime.h>
-
-#if BOOST_PLAT_WINDOWS_RUNTIME
-#include <thread>
-#endif
 
 // BOOST_SMT_PAUSE
 
@@ -59,7 +53,7 @@ namespace boost
 namespace detail
 {
 
-#if !defined( BOOST_USE_WINDOWS_H ) && !BOOST_PLAT_WINDOWS_RUNTIME
+#if !defined( BOOST_USE_WINDOWS_H )
 
 #if defined(__clang__) && defined(__x86_64__)
 // clang x64 warns that __stdcall is ignored
@@ -76,7 +70,7 @@ namespace detail
 
 #undef BOOST_SP_STDCALL
 
-#endif // !defined( BOOST_USE_WINDOWS_H ) && !BOOST_PLAT_WINDOWS_RUNTIME
+#endif // !defined( BOOST_USE_WINDOWS_H )
 
 inline void yield( unsigned k ) BOOST_NOEXCEPT
 {
@@ -89,7 +83,6 @@ inline void yield( unsigned k ) BOOST_NOEXCEPT
         BOOST_SMT_PAUSE
     }
 #endif
-#if !BOOST_PLAT_WINDOWS_RUNTIME
     else if( k < 32 )
     {
         Sleep( 0 );
@@ -98,13 +91,6 @@ inline void yield( unsigned k ) BOOST_NOEXCEPT
     {
         Sleep( 1 );
     }
-#else
-    else
-    {
-        // Sleep isn't supported on the Windows Runtime.
-        std::this_thread::yield();
-    }
-#endif
 }
 
 } // namespace detail

include/boost/smart_ptr/enable_shared_from_raw.hpp

@@ -16,7 +16,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {

include/boost/smart_ptr/intrusive_ptr.hpp

@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>

include/boost/smart_ptr/scoped_array.hpp

@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
 
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
 

include/boost/smart_ptr/scoped_ptr.hpp

@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #ifndef BOOST_NO_AUTO_PTR
 # include <memory>          // for std::auto_ptr

include/boost/smart_ptr/shared_array.hpp

@@ -25,7 +25,7 @@
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #include <cstddef>            // for std::ptrdiff_t
 #include <algorithm>          // for std::swap

include/boost/smart_ptr/shared_ptr.hpp

@@ -26,7 +26,7 @@
 #include <boost/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
 #include <boost/smart_ptr/detail/sp_disable_deprecated.hpp>

test/allocate_shared_alloc11_test.cpp

@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/allocate_shared_construct11_test.cpp

@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/allocate_shared_esft_test.cpp

@@ -6,7 +6,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>

test/allocate_shared_test.cpp

@@ -6,7 +6,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/atomic_count_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/atomic_count.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/atomic_count_test2.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/detail/atomic_count.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/auto_ptr_rv_test.cpp

@@ -19,7 +19,7 @@ int main()
 #else
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 struct X

test/cpp11_pointer_cast_test.cpp

@@ -11,7 +11,7 @@
 #include <boost/pointer_cast.hpp>
 
 #include <boost/config.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/get_pointer.hpp>
 #include <boost/shared_ptr.hpp>
 

test/esft_regtest.cpp

@@ -14,7 +14,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
 #include <memory>
 #include <string>

test/esft_second_ptr_test.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/esft_void_test.cpp

@@ -11,7 +11,7 @@
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/get_deleter_array_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_array.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct deleter
 {

test/get_deleter_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct deleter
 {

test/intrusive_ptr_move_test.cpp

@@ -26,7 +26,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/config.hpp>

test/intrusive_ptr_test.cpp

@@ -26,7 +26,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/config.hpp>

test/intrusive_ref_counter_test.cpp

@@ -33,7 +33,7 @@
 #include <cstddef>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace N1 {
 

test/ip_convertible_test.cpp

@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 //

test/ip_hash_test.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class base
 {

test/lsp_array_cast_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/local_shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {

test/lsp_array_n_test.cpp

@@ -11,7 +11,7 @@
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 

test/lsp_array_test.cpp

@@ -11,7 +11,7 @@
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 

test/lw_thread_test.cpp

@@ -5,7 +5,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/detail/lightweight_thread.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/detail/atomic_count.hpp>
 
 boost::detail::atomic_count count( 0 );

test/make_local_shared_array_throws_test.cpp

@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_local_shared.hpp>
 
 class type {

test/make_local_shared_array_value_test.cpp

@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_local_shared.hpp>
 
 int main()

test/make_shared_array_throws_test.cpp

@@ -5,7 +5,7 @@ Copyright 2012-2015 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 class type {

test/make_shared_array_value_test.cpp

@@ -5,7 +5,7 @@ Copyright 2012-2015 Glen Joseph Fernandes
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 int main()

test/make_shared_esft_test.cpp

@@ -6,7 +6,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>

test/make_shared_move_emulation_test.cpp

@@ -9,7 +9,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility_core.hpp>

test/make_shared_perfect_forwarding_test.cpp

@@ -8,7 +8,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 

test/make_shared_test.cpp

@@ -6,7 +6,7 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/make_unique_array_noinit_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_array_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_array_throws_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_noinit_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_throws_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 class type {

test/make_unique_value_test.cpp

@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/config.hpp>
 #if !defined(BOOST_NO_CXX11_SMART_PTR)
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_unique.hpp>
 
 struct type {

test/owner_less_test.cpp

@@ -11,7 +11,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/owner_less.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/pointer_cast_test.cpp

@@ -17,7 +17,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/get_pointer.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 namespace
 {

test/sa_nullptr_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_array.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 #include <memory>
 

test/shared_from_raw_test.cpp

@@ -16,7 +16,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/shared_from_raw_test2.cpp

@@ -12,7 +12,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
 #include <memory>
 #include <string>

test/shared_from_raw_test3.cpp

@@ -15,7 +15,7 @@
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/shared_from_raw_test4.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/shared_from_raw_test5.cpp

@@ -17,7 +17,7 @@
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 class X: public boost::enable_shared_from_raw

test/shared_from_this_test.cpp

@@ -25,7 +25,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/shared_ptr_alias_move_test.cpp

@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <utility>
 

test/shared_ptr_alias_test.cpp

@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>

test/shared_ptr_alloc11_test.cpp

@@ -11,7 +11,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>

test/shared_ptr_alloc2_test.cpp

@@ -9,7 +9,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>

test/shared_ptr_alloc3_test.cpp

@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <memory>
 #include <cstddef>

test/shared_ptr_basic_test.cpp

@@ -28,7 +28,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/shared_ptr_convertible_test.cpp

@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 
 //

test/shared_ptr_move_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <utility>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )

test/shared_ptr_reinterpret_pointer_cast_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {};

test/shared_ptr_rv_pointer_cast_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
 

test/shared_ptr_rv_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {

test/shared_ptr_test.cpp

@@ -28,7 +28,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/smart_ptr_test.cpp

@@ -37,7 +37,7 @@
 
 #include <boost/smart_ptr.hpp>
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <iostream>
 #include <set>

test/sp_array_cast_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct X
 {

test/sp_array_n_test.cpp

@@ -11,7 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 

test/sp_array_test.cpp

@@ -11,7 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 #include <utility>
 

test/sp_atomic_test.cpp

@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/memory_order.hpp>
 

test/sp_bml_unique_ptr_test.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/move/unique_ptr.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <memory>

test/sp_constexpr_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #define HAVE_CONSTEXPR_INIT
 

test/sp_constexpr_test2.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #define HAVE_CONSTEXPR_INIT
 

test/sp_convertible_test.cpp

@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 
 //

test/sp_hash_test.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/sp_hash_test2.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/sp_hash_test3.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 int main()
 {

test/sp_interlocked_test.cpp

@@ -11,7 +11,7 @@
 #if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
 
 #include <boost/smart_ptr/detail/sp_interlocked.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #ifndef __LP64__
 

test/sp_nullptr_test.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>
 #include <memory>
 

test/sp_recursive_assign2_rv_test.cpp

@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/sp_recursive_assign2_test.cpp

@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/sp_recursive_assign_rv_test.cpp

@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/sp_recursive_assign_test.cpp

@@ -10,7 +10,7 @@
 
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 //
 

test/sp_typeinfo_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/detail/sp_typeinfo_.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>
 
 int main()

test/sp_unary_addr_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <memory>
 
 struct deleter

test/sp_unique_ptr_test.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <memory>
 #include <utility>

test/sp_zero_compare_test.cpp

@@ -13,7 +13,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct W
 {

test/spinlock_try_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/smart_ptr/detail/spinlock.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 // Sanity check only
 

test/weak_from_raw_test.cpp

@@ -12,7 +12,7 @@
 
 
 #include <boost/smart_ptr/enable_shared_from_raw.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 
 struct X: public boost::enable_shared_from_raw

test/weak_from_this_test.cpp

@@ -15,7 +15,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 class V: public boost::enable_shared_from_this<V>
 {

test/weak_ptr_move_test.cpp

@@ -9,7 +9,7 @@
 //
 
 #include <boost/weak_ptr.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <utility>
 
 #if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )

test/weak_ptr_test.cpp

@@ -24,7 +24,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

test/wp_convertible_test.cpp

@@ -8,7 +8,7 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/weak_ptr.hpp>
 
 //