passenger 6.0.18 → 6.0.20

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/pack/tag_keyword_arg_ref.hpp

@@ -10,7 +10,7 @@
 #include <boost/parameter/aux_/tagged_argument.hpp>
 #include <boost/parameter/config.hpp>
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <
         typename Keyword
@@ -34,7 +34,7 @@ namespace boost { namespace parameter { namespace aux {
 
 #include <boost/mpl/bool.hpp>
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <typename Keyword, typename ActualArg>
     struct tag_ref<Keyword,ActualArg,::boost::mpl::false_>

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/pack/unmatched_argument.hpp

@@ -34,7 +34,7 @@ namespace boost { namespace parameter { namespace aux {
         ));
 #endif
         typedef int type;
-    }; 
+    };
 }}} // namespace boost::parameter::aux
 
 #endif  // include guard

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/preprocessor/overloads.hpp

@@ -51,7 +51,7 @@
     ::boost::parameter::aux::item< \
         BOOST_PP_CAT(PS, n), BOOST_PP_CAT(A, n)
 
-#define BOOST_PARAMETER_close_list(z, n, text) > 
+#define BOOST_PARAMETER_close_list(z, n, text) >
 
 #define BOOST_PARAMETER_arg_list(n) \
     ::boost::parameter::aux::make_arg_list< \

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/tag.hpp

@@ -19,7 +19,7 @@
 #include <boost/mp11/utility.hpp>
 #include <type_traits>
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <typename Keyword, typename Arg>
     struct tag_if_lvalue_reference
@@ -75,7 +75,7 @@ namespace boost { namespace parameter { namespace aux {
 #include <boost/type_traits/is_lvalue_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <typename Keyword, typename ActualArg>
     struct tag
@@ -119,7 +119,7 @@ namespace boost { namespace parameter { namespace aux {
 
 #else   // !defined(BOOST_PARAMETER_HAS_PERFECT_FORWARDING)
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <
         typename Keyword
@@ -142,7 +142,7 @@ namespace boost { namespace parameter { namespace aux {
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 
-namespace boost { namespace parameter { namespace aux { 
+namespace boost { namespace parameter { namespace aux {
 
     template <typename Keyword, typename Arg>
     struct tag<Keyword,Arg,::boost::mpl::false_>

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/unwrap_cv_reference.hpp

@@ -121,7 +121,7 @@ namespace boost { namespace parameter { namespace aux {
         typedef boost::mpl::bool_<
 #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
             is_cv_reference_wrapper::
-#endif 
+#endif
         value> type;
     };
 

data/src/cxx_supportlib/vendor-modified/boost/parameter/aux_/void.hpp

@@ -6,7 +6,7 @@
 #ifndef BOOST_PARAMETER_VOID_050329_HPP
 #define BOOST_PARAMETER_VOID_050329_HPP
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     // A placemarker for "no argument passed."
     // MAINTAINER NOTE: Do not make this into a metafunction

data/src/cxx_supportlib/vendor-modified/boost/parameter/binding.hpp

@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_same.hpp>
 #endif
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     // A metafunction that, given an argument pack, returns the reference type
     // of the parameter identified by the given keyword.  If no such parameter
@@ -100,7 +100,7 @@ namespace boost { namespace parameter {
 
 #include <boost/parameter/aux_/is_placeholder.hpp>
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     template <
         typename Parameters
@@ -132,7 +132,7 @@ namespace boost { namespace parameter {
 
 #include <boost/parameter/aux_/result_of0.hpp>
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     // A metafunction that, given an argument pack, returns the reference type
     // of the parameter identified by the given keyword.  If no such parameter

data/src/cxx_supportlib/vendor-modified/boost/parameter/match.hpp

@@ -26,7 +26,7 @@
 /**/
 #else
 #define BOOST_PARAMETER_MATCH_DEFAULTS(ArgTypes)
-#endif 
+#endif
 
 #include <boost/parameter/aux_/preprocessor/seq_enum.hpp>
 

data/src/cxx_supportlib/vendor-modified/boost/parameter/template_keyword.hpp

@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_array.hpp>
 #endif
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     template <typename Tag, typename T>
     struct template_keyword : ::boost::parameter::aux::template_keyword_base

data/src/cxx_supportlib/vendor-modified/boost/parameter/value_type.hpp

@@ -24,7 +24,7 @@
 #include <boost/type_traits/is_same.hpp>
 #endif
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     // A metafunction that, given an argument pack, returns the value type
     // of the parameter identified by the given keyword.  If no such parameter
@@ -100,7 +100,7 @@ namespace boost { namespace parameter {
 
 #include <boost/parameter/aux_/is_placeholder.hpp>
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     template <
         typename Parameters
@@ -132,7 +132,7 @@ namespace boost { namespace parameter {
 
 #include <boost/parameter/aux_/result_of0.hpp>
 
-namespace boost { namespace parameter { 
+namespace boost { namespace parameter {
 
     // A metafunction that, given an argument pack, returns the value type
     // of the parameter identified by the given keyword.  If no such parameter

data/src/cxx_supportlib/vendor-modified/boost/pool/simple_segregated_storage.hpp

@@ -328,6 +328,19 @@ void * simple_segregated_storage<SizeType>::try_malloc_n(
     void * & start, size_type n, const size_type partition_size)
 {
   void * iter = nextof(start);
+  if (n == 1)
+  {
+    void * next = nextof(iter);
+    if (next != static_cast<char *>(iter) + partition_size)
+    {
+      start = iter;
+      return 0;
+    }
+    else
+    {
+      return iter;
+    }
+  }
   while (--n != 0)
   {
     void * next = nextof(iter);

data/src/cxx_supportlib/vendor-modified/boost/ratio/config.hpp

@@ -9,7 +9,9 @@
 #ifndef BOOST_RATIO_CONFIG_HPP
 #define BOOST_RATIO_CONFIG_HPP
 
+#include <boost/ratio/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
 #include <boost/cstdint.hpp>
 
 
@@ -24,7 +26,7 @@
 
 
 #if !defined BOOST_RATIO_VERSION
-#define BOOST_RATIO_VERSION 1
+#define BOOST_RATIO_VERSION 2
 #else
 #if BOOST_RATIO_VERSION!=1  && BOOST_RATIO_VERSION!=2
 #error "BOOST_RATIO_VERSION must be 1 or 2"
@@ -90,7 +92,10 @@
 #define BOOST_RATIO_DENOMINATOR_IS_OUT_OF_RANGE "ratio denominator is out of range"
 #endif
 
+#if defined(BOOST_RATIO_EXTENSIONS)
 
-//#define BOOST_RATIO_EXTENSIONS
+BOOST_PRAGMA_MESSAGE("Support for BOOST_RATIO_EXTENSIONS is deprecated and will be removed when Boost.Ratio is implemented in terms of <ratio>.")
+
+#endif
 
 #endif  // header

data/src/cxx_supportlib/vendor-modified/boost/ratio/detail/requires_cxx11.hpp

@@ -0,0 +1,22 @@
+#ifndef BOOST_RATIO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#define BOOST_RATIO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+
+// Copyright 2023 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
+
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \
+    defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
+    defined(BOOST_NO_CXX11_DECLTYPE) || \
+    defined(BOOST_NO_CXX11_CONSTEXPR) || \
+    defined(BOOST_NO_CXX11_NOEXCEPT) || \
+    defined(BOOST_NO_CXX11_HDR_RATIO)
+
+BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.Ratio 1.82 and will be removed in Boost.Ratio 1.84.")
+
+#endif
+
+#endif // #ifndef BOOST_RATIO_DETAIL_REQUIRES_CXX11_HPP_INCLUDED

data/src/cxx_supportlib/vendor-modified/boost/ratio/mpl/plus.hpp

@@ -1,6 +1,6 @@
 //  plus.hpp
 //
-//  (C) Copyright 2011Vicente J. Botet Escriba
+//  (C) Copyright 2011 Vicente J. Botet Escriba
 //  Use, modification and distribution are subject to 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).

data/src/cxx_supportlib/vendor-modified/boost/regex/v4/regex_workaround.hpp

@@ -198,10 +198,10 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
       const char *strSource 
    )
    {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  if (lenSourceWithNull > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     if (lenSourceWithNull > sizeInBytes)
          return 1;
-	  std::memcpy(strDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination, strSource, lenSourceWithNull);
       return 0;
    }
    inline std::size_t strcat_s(
@@ -210,11 +210,11 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
       const char *strSource 
    )
    {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  std::size_t lenDestination = std::strlen(strDestination);
-	  if (lenSourceWithNull + lenDestination > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     std::size_t lenDestination = std::strlen(strDestination);
+     if (lenSourceWithNull + lenDestination > sizeInBytes)
          return 1;
-	  std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
       return 0;
    }
 

data/src/cxx_supportlib/vendor-modified/boost/regex/v5/icu.hpp

@@ -190,8 +190,8 @@ public:
       constexpr char_class_type mask_xdigit = char_class_type(1) << offset_xdigit;
       constexpr char_class_type mask_underscore = char_class_type(1) << offset_underscore;
       constexpr char_class_type mask_unicode = char_class_type(1) << offset_unicode;
-      constexpr char_class_type mask_any = char_class_type(1) << offset_any;
-      constexpr char_class_type mask_ascii = char_class_type(1) << offset_ascii;
+      //constexpr char_class_type mask_any = char_class_type(1) << offset_any;
+      //constexpr char_class_type mask_ascii = char_class_type(1) << offset_ascii;
       constexpr char_class_type mask_horizontal = char_class_type(1) << offset_horizontal;
       constexpr char_class_type mask_vertical = char_class_type(1) << offset_vertical;
 
@@ -365,15 +365,15 @@ private:
 
    static char_class_type lookup_icu_mask(const ::UChar32* p1, const ::UChar32* p2)
    {
-      constexpr char_class_type mask_blank = char_class_type(1) << offset_blank;
-      constexpr char_class_type mask_space = char_class_type(1) << offset_space;
-      constexpr char_class_type mask_xdigit = char_class_type(1) << offset_xdigit;
-      constexpr char_class_type mask_underscore = char_class_type(1) << offset_underscore;
-      constexpr char_class_type mask_unicode = char_class_type(1) << offset_unicode;
+      //constexpr char_class_type mask_blank = char_class_type(1) << offset_blank;
+      //constexpr char_class_type mask_space = char_class_type(1) << offset_space;
+      //constexpr char_class_type mask_xdigit = char_class_type(1) << offset_xdigit;
+      //constexpr char_class_type mask_underscore = char_class_type(1) << offset_underscore;
+      //constexpr char_class_type mask_unicode = char_class_type(1) << offset_unicode;
       constexpr char_class_type mask_any = char_class_type(1) << offset_any;
       constexpr char_class_type mask_ascii = char_class_type(1) << offset_ascii;
-      constexpr char_class_type mask_horizontal = char_class_type(1) << offset_horizontal;
-      constexpr char_class_type mask_vertical = char_class_type(1) << offset_vertical;
+      //constexpr char_class_type mask_horizontal = char_class_type(1) << offset_horizontal;
+      //constexpr char_class_type mask_vertical = char_class_type(1) << offset_vertical;
 
       static const ::UChar32 prop_name_table[] = {
          /* any */  'a', 'n', 'y',

data/src/cxx_supportlib/vendor-modified/boost/regex/v5/regex_workaround.hpp

@@ -116,10 +116,10 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
       const char *strSource 
    )
    {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  if (lenSourceWithNull > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     if (lenSourceWithNull > sizeInBytes)
          return 1;
-	  std::memcpy(strDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination, strSource, lenSourceWithNull);
       return 0;
    }
    inline std::size_t strcat_s(
@@ -128,11 +128,11 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
       const char *strSource 
    )
    {
-	  std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
-	  std::size_t lenDestination = std::strlen(strDestination);
-	  if (lenSourceWithNull + lenDestination > sizeInBytes)
+     std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
+     std::size_t lenDestination = std::strlen(strDestination);
+     if (lenSourceWithNull + lenDestination > sizeInBytes)
          return 1;
-	  std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
+     std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
       return 0;
    }
 

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/allocate_shared_array.hpp

@@ -8,6 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/core/allocator_access.hpp>
 #include <boost/core/alloc_construct.hpp>
 #include <boost/core/first_scalar.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/requires_cxx11.hpp

@@ -0,0 +1,23 @@
+#ifndef BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+#define BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED
+
+// Copyright 2023 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
+
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || \
+    defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
+    defined(BOOST_NO_CXX11_DECLTYPE) || \
+    defined(BOOST_NO_CXX11_CONSTEXPR) || \
+    defined(BOOST_NO_CXX11_NOEXCEPT) || \
+    defined(BOOST_NO_CXX11_NULLPTR) || \
+    defined(BOOST_NO_CXX11_SMART_PTR)
+
+BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.84. Please open an issue in https://github.com/boostorg/smart_ptr if you want it retained.")
+
+#endif
+
+#endif // #ifndef BOOST_SMART_PTR_DETAIL_REQUIRES_CXX11_HPP_INCLUDED

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/sp_counted_base_gcc_atomic.hpp

@@ -137,7 +137,7 @@ public:
 
     long use_count() const // nothrow
     {
-        return atomic_load( &use_count_ );
+        return static_cast<long>( atomic_load( &use_count_ ) );
     }
 };
 

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/detail/yield_k.hpp

@@ -19,9 +19,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/smart_ptr/detail/sp_thread_pause.hpp>
-#include <boost/smart_ptr/detail/sp_thread_sleep.hpp>
-#include <boost/config.hpp>
+#include <boost/core/yield_primitives.hpp>
 
 namespace boost
 {
@@ -34,13 +32,13 @@ inline void yield( unsigned k )
     // Experiments on Windows and Fedora 32 show that a single pause,
     // followed by an immediate sp_thread_sleep(), is best.
 
-    if( k == 0 )
+    if( k & 1 )
     {
-        sp_thread_pause();
+        boost::core::sp_thread_sleep();
     }
     else
     {
-        sp_thread_sleep();
+        boost::core::sp_thread_pause();
     }
 }
 

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/enable_shared_from_this.hpp

@@ -13,6 +13,7 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/intrusive_ptr.hpp

@@ -13,6 +13,8 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
+
 #include <boost/config.hpp>
 
 #include <boost/assert.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/make_shared.hpp

@@ -11,6 +11,7 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/make_shared_object.hpp>
 
 #if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( BOOST_NO_SFINAE )

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/make_shared_array.hpp

@@ -8,6 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 #define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/core/default_allocator.hpp>
 #include <boost/smart_ptr/allocate_shared_array.hpp>
 

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/make_shared_object.hpp

@@ -11,6 +11,7 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility_core.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/scoped_array.hpp

@@ -10,6 +10,7 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/checked_delete.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/scoped_ptr.hpp

@@ -10,6 +10,7 @@
 //
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/core/checked_delete.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/shared_array.hpp

@@ -14,6 +14,8 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
+
 #include <boost/config.hpp>   // for broken compiler workarounds
 
 #include <memory>             // TR1 cyclic inclusion fix

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/shared_ptr.hpp

@@ -14,6 +14,7 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/detail/sp_convertible.hpp>
 #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>

data/src/cxx_supportlib/vendor-modified/boost/smart_ptr/weak_ptr.hpp

@@ -13,6 +13,7 @@
 //  See http://www.boost.org/libs/smart_ptr/ for documentation.
 //
 
+#include <boost/smart_ptr/detail/requires_cxx11.hpp>
 #include <boost/smart_ptr/detail/shared_count.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/smart_ptr/detail/sp_noexcept.hpp>

data/src/cxx_supportlib/vendor-modified/boost/system/detail/config.hpp

@@ -8,6 +8,7 @@
 //
 // See http://www.boost.org/libs/system for documentation.
 
+#include <boost/system/detail/requires_cxx11.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 
@@ -64,7 +65,9 @@
 
 // BOOST_SYSTEM_CLANG_6
 
-#if defined(__clang__) && (__clang_major__ < 7 || (defined(__APPLE__) && __clang_major__ < 11))
+// Android NDK r18b has Clang 7.0.2 that still needs the workaround
+// https://github.com/boostorg/system/issues/100
+#if defined(__clang__) && (__clang_major__ < 7 || (defined(__APPLE__) && __clang_major__ < 11) || (defined(__ANDROID__) && __clang_major__ == 7))
 # define BOOST_SYSTEM_CLANG_6
 #endif
 

data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category.hpp

@@ -13,6 +13,7 @@
 #include <boost/system/detail/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
 #include <string>
 #include <functional>
 #include <cstddef>
@@ -116,11 +117,18 @@ protected:
 
 #endif
 
-    BOOST_SYSTEM_CONSTEXPR error_category() BOOST_NOEXCEPT: id_( 0 ), stdcat_(), sc_init_()
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
+    BOOST_CONSTEXPR
+#endif
+    error_category() BOOST_NOEXCEPT: id_( 0 ), stdcat_(), sc_init_()
     {
     }
 
-    explicit BOOST_SYSTEM_CONSTEXPR error_category( boost::ulong_long_type id ) BOOST_NOEXCEPT: id_( id ), stdcat_(), sc_init_()
+    explicit
+#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
+    BOOST_CONSTEXPR
+#endif
+    error_category( boost::ulong_long_type id ) BOOST_NOEXCEPT: id_( id ), stdcat_(), sc_init_()
     {
     }
 

data/src/cxx_supportlib/vendor-modified/boost/system/detail/error_category_impl.hpp

@@ -98,33 +98,14 @@ inline char const * error_category::message( int ev, char * buffer, std::size_t
 #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
 
 #include <boost/system/detail/std_category_impl.hpp>
+#include <boost/system/detail/mutex.hpp>
 #include <new>
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-# include <mutex>
-#endif
-
 namespace boost
 {
 namespace system
 {
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-
-namespace detail
-{
-
-template<class = void> struct stdcat_mx_holder
-{
-    static std::mutex mx_;
-};
-
-template<class T> std::mutex stdcat_mx_holder<T>::mx_;
-
-} // namespace detail
-
-#endif
-
 inline void error_category::init_stdcat() const
 {
     static_assert( sizeof( stdcat_ ) >= sizeof( boost::system::detail::std_category ), "sizeof(stdcat_) is not enough for std_category" );
@@ -137,13 +118,17 @@ inline void error_category::init_stdcat() const
 
 #endif
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-    std::lock_guard<std::mutex> lk( boost::system::detail::stdcat_mx_holder<>::mx_ );
-#endif
+    // detail::mutex has a constexpr default constructor,
+    // and therefore guarantees static initialization, on
+    // everything except VS 2013 (msvc-12.0)
+
+    static system::detail::mutex mx_;
+
+    system::detail::lock_guard<system::detail::mutex> lk( mx_ );
 
     if( sc_init_.load( std::memory_order_acquire ) == 0 )
     {
-        ::new( static_cast<void*>( stdcat_ ) ) boost::system::detail::std_category( this, 0 );
+        ::new( static_cast<void*>( stdcat_ ) ) boost::system::detail::std_category( this, system::detail::id_wrapper<0>() );
         sc_init_.store( 1, std::memory_order_release );
     }
 }
@@ -160,7 +145,7 @@ inline BOOST_NOINLINE error_category::operator std::error_category const & () co
 // This condition must be the same as the one in error_condition.hpp
 #if defined(BOOST_SYSTEM_AVOID_STD_GENERIC_CATEGORY)
 
-        static const boost::system::detail::std_category generic_instance( this, 0x1F4D3 );
+        static const boost::system::detail::std_category generic_instance( this, system::detail::id_wrapper<0x1F4D3>() );
         return generic_instance;
 
 #else
@@ -175,7 +160,7 @@ inline BOOST_NOINLINE error_category::operator std::error_category const & () co
 // This condition must be the same as the one in error_code.hpp
 #if defined(BOOST_SYSTEM_AVOID_STD_SYSTEM_CATEGORY)
 
-        static const boost::system::detail::std_category system_instance( this, 0x1F4D7 );
+        static const boost::system::detail::std_category system_instance( this, system::detail::id_wrapper<0x1F4D7>() );
         return system_instance;
 
 #else