Commit 70e05c67ce6f044b5b99e01a5d972bbe92c38344 | zig

lib/libcxx/include/__bit_reference+17-18

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -69,7 +68,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
     _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
+        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
 private:
     _LIBCPP_INLINE_VISIBILITY
     __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
 @@ -141,7 +140,7 @@ public:
         {return static_cast<bool>(*__seg_ & __mask_);}
     _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
+        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
 private:
     _LIBCPP_INLINE_VISIBILITY
     _LIBCPP_CONSTEXPR
 @@ -168,7 +167,7 @@ __find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
         __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
         __storage_type __b = *__first.__seg_ & __m;
         if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
         if (__n == __dn)
             return __first + __n;
         __n -= __dn;
 @@ -177,14 +176,14 @@ __find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
     // do middle whole words
     for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
         if (*__first.__seg_)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(*__first.__seg_)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(*__first.__seg_)));
     // do last partial word
     if (__n > 0)
     {
         __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
         __storage_type __b = *__first.__seg_ & __m;
         if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
     }
     return _It(__first.__seg_, static_cast<unsigned>(__n));
 }
 @@ -204,7 +203,7 @@ __find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
         __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
         __storage_type __b = ~*__first.__seg_ & __m;
         if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
         if (__n == __dn)
             return __first + __n;
         __n -= __dn;
 @@ -215,7 +214,7 @@ __find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
     {
         __storage_type __b = ~*__first.__seg_;
         if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
     }
     // do last partial word
     if (__n > 0)
 @@ -223,7 +222,7 @@ __find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
         __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
         __storage_type __b = ~*__first.__seg_ & __m;
         if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
+            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
     }
     return _It(__first.__seg_, static_cast<unsigned>(__n));
 }
 @@ -255,18 +254,18 @@ __count_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type
         __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
         __storage_type __dn = _VSTD::min(__clz_f, __n);
         __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__popcount(*__first.__seg_ & __m);
+        __r = _VSTD::__libcpp_popcount(*__first.__seg_ & __m);
         __n -= __dn;
         ++__first.__seg_;
     }
     // do middle whole words
     for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__popcount(*__first.__seg_);
+        __r += _VSTD::__libcpp_popcount(*__first.__seg_);
     // do last partial word
     if (__n > 0)
     {
         __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__popcount(*__first.__seg_ & __m);
+        __r += _VSTD::__libcpp_popcount(*__first.__seg_ & __m);
     }
     return __r;
 }
 @@ -286,18 +285,18 @@ __count_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_typ
         __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
         __storage_type __dn = _VSTD::min(__clz_f, __n);
         __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__popcount(~*__first.__seg_ & __m);
+        __r = _VSTD::__libcpp_popcount(~*__first.__seg_ & __m);
         __n -= __dn;
         ++__first.__seg_;
     }
     // do middle whole words
     for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__popcount(~*__first.__seg_);
+        __r += _VSTD::__libcpp_popcount(~*__first.__seg_);
     // do last partial word
     if (__n > 0)
     {
         __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__popcount(~*__first.__seg_ & __m);
+        __r += _VSTD::__libcpp_popcount(~*__first.__seg_ & __m);
     }
     return __r;
 }

lib/libcxx/include/__bsd_locale_defaults.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------- __bsd_locale_defaults.h -----------------------===//	2	//===---------------------- __bsd_locale_defaults.h -----------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	// The BSDs have lots of *_l functions. We don't want to define those symbols	9	// The BSDs have lots of *_l functions. We don't want to define those symbols

lib/libcxx/include/__bsd_locale_fallbacks.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------- __bsd_locale_fallbacks.h ----------------------===//	2	//===---------------------- __bsd_locale_fallbacks.h ----------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	// The BSDs have lots of *_l functions. This file provides reimplementations	9	// The BSDs have lots of *_l functions. This file provides reimplementations

lib/libcxx/include/__config+130-157

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- __config ---------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -33,12 +32,16 @@
 #  define _GNUC_VER_NEW 0
 #endif
-#define _LIBCPP_VERSION 8000
+#define _LIBCPP_VERSION 9000
 #ifndef _LIBCPP_ABI_VERSION
 #  define _LIBCPP_ABI_VERSION 1
 #endif
+#ifndef __STDC_HOSTED__
+#  define _LIBCPP_FREESTANDING
+#endif
 #ifndef _LIBCPP_STD_VER
 #  if  __cplusplus <= 201103L
 #    define _LIBCPP_STD_VER 11
 @@ -93,10 +96,12 @@
 // Enable optimized version of __do_get_(un)signed which avoids redundant copies.
 #  define _LIBCPP_ABI_OPTIMIZED_LOCALE_NUM_GET
 // Use the smallest possible integer type to represent the index of the variant.
-// Previously libc++ used "unsigned int" exclusivly.
+// Previously libc++ used "unsigned int" exclusively.
 #  define _LIBCPP_ABI_VARIANT_INDEX_TYPE_OPTIMIZATION
 // Unstable attempt to provide a more optimized std::function
 #  define _LIBCPP_ABI_OPTIMIZED_FUNCTION
+// All the regex constants must be distinct and nonzero.
+#  define _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
 #elif _LIBCPP_ABI_VERSION == 1
 #  if !defined(_LIBCPP_OBJECT_FORMAT_COFF)
 // Enable compiling copies of now inline methods into the dylib to support
 @@ -182,6 +187,10 @@
 #define _LIBCPP_CLANG_VER 0
 #endif
+#if defined(_LIBCPP_COMPILER_GCC) && __cplusplus < 201103L
+#error "libc++ does not support using GCC with C++03. Please enable C++11"
+#endif
 // FIXME: ABI detection should be done via compiler builtin macros. This
 // is just a placeholder until Clang implements such macros. For now assume
 // that Windows compilers pretending to be MSVC++ target the Microsoft ABI,
 @@ -201,6 +210,10 @@
 #  endif
 #endif
+#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
+# define _LIBCPP_ABI_VCRUNTIME
+#endif
 // Need to detect which libc we're using if we're on Linux.
 #if defined(__linux__)
 #  include <features.h>
 @@ -257,7 +270,7 @@
 #  define _LIBCPP_WIN32API
 #  define _LIBCPP_LITTLE_ENDIAN
 #  define _LIBCPP_SHORT_WCHAR   1
-// Both MinGW and native MSVC provide a "MSVC"-like enviroment
+// Both MinGW and native MSVC provide a "MSVC"-like environment
 #  define _LIBCPP_MSVCRT_LIKE
 // If mingw not explicitly detected, assume using MS C runtime only if
 // a MS compatibility version is specified.
 @@ -298,7 +311,7 @@
    // random data even when using sandboxing mechanisms such as chroots,
    // Capsicum, etc.
 #  define _LIBCPP_USING_ARC4_RANDOM
-#elif defined(__Fuchsia__)
+#elif defined(__Fuchsia__) || defined(__wasi__)
 #  define _LIBCPP_USING_GETENTROPY
 #elif defined(__native_client__)
    // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
 @@ -332,7 +345,7 @@
 #  if defined(__FreeBSD__)
 #    define _LIBCPP_HAS_QUICK_EXIT
 #    define _LIBCPP_HAS_C11_FEATURES
-#  elif defined(__Fuchsia__)
+#  elif defined(__Fuchsia__) || defined(__wasi__)
 #    define _LIBCPP_HAS_QUICK_EXIT
 #    define _LIBCPP_HAS_TIMESPEC_GET
 #    define _LIBCPP_HAS_C11_FEATURES
 @@ -400,10 +413,6 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_STRONG_ENUMS
 #endif
-#if !(__has_feature(cxx_decltype))
-#define _LIBCPP_HAS_NO_DECLTYPE
-#endif
 #if __has_feature(cxx_attributes)
 #  define _LIBCPP_NORETURN [[noreturn]]
 #else
 @@ -434,18 +443,6 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_VARIADICS
 #endif
-#if !(__has_feature(cxx_generalized_initializers))
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif
-#if __has_feature(is_base_of)
-#define _LIBCPP_HAS_IS_BASE_OF
-#endif
-#if __has_feature(is_final)
-#define _LIBCPP_HAS_IS_FINAL
-#endif
 // Objective-C++ features (opt-in)
 #if __has_feature(objc_arc)
 #define _LIBCPP_HAS_OBJC_ARC
 @@ -455,10 +452,6 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_OBJC_ARC_WEAK
 #endif
-#if !(__has_feature(cxx_constexpr))
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
 #if !(__has_feature(cxx_relaxed_constexpr))
 #define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
 #endif
 @@ -471,14 +464,6 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_NOEXCEPT
 #endif
-#if __has_feature(underlying_type)
-#define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#endif
-#if __has_feature(is_literal)
-#define _LIBCPP_IS_LITERAL(T) __is_literal(T)
-#endif
 #if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
 #define _LIBCPP_HAS_NO_ASAN
 #endif
 @@ -510,69 +495,20 @@ typedef __char32_t char32_t;
 #define _LIBCPP_NORETURN __attribute__((noreturn))
-#if _GNUC_VER >= 407
-#define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#define _LIBCPP_IS_LITERAL(T) __is_literal_type(T)
-#define _LIBCPP_HAS_IS_FINAL
-#endif
-#if defined(__GNUC__) && _GNUC_VER >= 403
-#define _LIBCPP_HAS_IS_BASE_OF
-#endif
 #if !__EXCEPTIONS && !defined(_LIBCPP_NO_EXCEPTIONS)
 #define _LIBCPP_NO_EXCEPTIONS
 #endif
-// constexpr was added to GCC in 4.6.
-#if _GNUC_VER < 406
-#  define _LIBCPP_HAS_NO_CONSTEXPR
-// Can only use constexpr in c++11 mode.
-#elif !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
-#  define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
 // Determine if GCC supports relaxed constexpr
 #if !defined(__cpp_constexpr) || __cpp_constexpr < 201304L
 #define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
 #endif
-// GCC 5 will support variable templates
+// GCC 5 supports variable templates
 #if !defined(__cpp_variable_templates) || __cpp_variable_templates < 201304L
 #define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES
 #endif
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_NULLPTR
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_HAS_NO_NOEXCEPT
-#else  // __GXX_EXPERIMENTAL_CXX0X__
-#if _GNUC_VER < 403
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#endif
-#if _GNUC_VER < 404
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif  // _GNUC_VER < 404
-#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_NOEXCEPT
-#define _LIBCPP_HAS_NO_NULLPTR
-#endif
-#endif  // __GXX_EXPERIMENTAL_CXX0X__
 #if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
 #define _LIBCPP_HAS_NO_ASAN
 #endif
 @@ -597,16 +533,12 @@ typedef __char32_t char32_t;
 #error "MSVC versions prior to Visual Studio 2015 are not supported"
 #endif
-#define _LIBCPP_HAS_IS_BASE_OF
-#define _LIBCPP_HAS_NO_CONSTEXPR
 #define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
 #define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES
-#define _LIBCPP_HAS_NO_NOEXCEPT
 #define __alignof__ __alignof
 #define _LIBCPP_NORETURN __declspec(noreturn)
 #define _ALIGNAS(x) __declspec(align(x))
 #define _ALIGNAS_TYPE(x) alignas(x)
-#define _LIBCPP_HAS_NO_VARIADICS
 #define _LIBCPP_WEAK
 @@ -623,12 +555,7 @@ typedef __char32_t char32_t;
 #define _ATTRIBUTE(x) __attribute__((x))
 #define _LIBCPP_NORETURN __attribute__((noreturn))
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#define _LIBCPP_HAS_NO_NOEXCEPT
-#define _LIBCPP_HAS_NO_NULLPTR
 #define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_IS_BASE_OF
-#define _LIBCPP_HAS_IS_FINAL
 #define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES
 #if defined(_AIX)
 @@ -659,8 +586,13 @@ typedef __char32_t char32_t;
 #  define _LIBCPP_EXPORTED_FROM_ABI
 #elif defined(_LIBCPP_BUILDING_LIBRARY)
 #  define _LIBCPP_DLL_VIS __declspec(dllexport)
-#  define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
+#  if defined(__MINGW32__)
-#  define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DLL_VIS
+#    define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_DLL_VIS
+#    define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
+#  else
+#    define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
+#    define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DLL_VIS
+#  endif
 #  define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_DLL_VIS
 #  define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllexport)
 #else
 @@ -777,7 +709,7 @@ typedef __char32_t char32_t;
 #else
    // Try to approximate the effect of exclude_from_explicit_instantiation
    // (which is that entities are not assumed to be provided by explicit
-   // template instantitations in the dylib) by always inlining those entities.
+   // template instantiations in the dylib) by always inlining those entities.
 #  define _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION _LIBCPP_ALWAYS_INLINE
 #endif
 @@ -789,6 +721,16 @@ typedef __char32_t char32_t;
 #  endif
 #endif
+#ifndef _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT
+# ifdef _LIBCPP_OBJECT_FORMAT_COFF // Windows binaries can't merge typeinfos.
+# define _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT 0
+#else
+// TODO: This isn't strictly correct on ELF platforms due to llvm.org/PR37398
+// And we should consider defaulting to OFF.
+# define _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT 1
+#endif
+#endif
 #ifndef _LIBCPP_HIDE_FROM_ABI
 #  if _LIBCPP_HIDE_FROM_ABI_PER_TU
 #    define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_INTERNAL_LINKAGE
 @@ -843,22 +785,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
 #  define _NOEXCEPT_(x)
 #endif
-#if defined(_LIBCPP_DEBUG_USE_EXCEPTIONS)
-#  if !defined(_LIBCPP_DEBUG)
-#    error cannot use _LIBCPP_DEBUG_USE_EXCEPTIONS unless _LIBCPP_DEBUG is defined
-#  endif
-#  ifdef _LIBCPP_HAS_NO_NOEXCEPT
-#    define _NOEXCEPT_DEBUG
-#    define _NOEXCEPT_DEBUG_(x)
-#  else
-#    define _NOEXCEPT_DEBUG noexcept(false)
-#    define _NOEXCEPT_DEBUG_(x) noexcept(false)
-#  endif
-#else
-#  define _NOEXCEPT_DEBUG _NOEXCEPT
-#  define _NOEXCEPT_DEBUG_(x) _NOEXCEPT_(x)
-#endif
 #ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
 typedef unsigned short char16_t;
 typedef unsigned int   char32_t;
 @@ -869,30 +795,11 @@ typedef unsigned int   char32_t;
 #endif
 #ifdef _LIBCPP_CXX03_LANG
-#  if __has_extension(c_static_assert)
+# define static_assert(...) _Static_assert(__VA_ARGS__)
-#    define static_assert(__b, __m) _Static_assert(__b, __m)
+# define decltype(...) __decltype(__VA_ARGS__)
-#  else
-extern "C++" {
-template <bool> struct __static_assert_test;
-template <> struct __static_assert_test<true> {};
-template <unsigned> struct __static_assert_check {};
-}
-#    define static_assert(__b, __m) \
-       typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \
-       _LIBCPP_CONCAT(__t, __LINE__)
-#  endif // __has_extension(c_static_assert)
 #endif  // _LIBCPP_CXX03_LANG
-#ifdef _LIBCPP_HAS_NO_DECLTYPE
+#ifdef _LIBCPP_CXX03_LANG
-// GCC 4.6 provides __decltype in all standard modes.
-#  if __has_keyword(__decltype) || _LIBCPP_CLANG_VER >= 304 || _GNUC_VER >= 406
-#    define decltype(__x) __decltype(__x)
-#  else
-#    define decltype(__x) __typeof__(__x)
-#  endif
-#endif
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
 #  define _LIBCPP_CONSTEXPR
 #else
 #  define _LIBCPP_CONSTEXPR constexpr
 @@ -911,9 +818,9 @@ template <unsigned> struct __static_assert_check {};
 #endif
 #ifdef __GNUC__
-#  define _NOALIAS __attribute__((__malloc__))
+#  define _LIBCPP_NOALIAS __attribute__((__malloc__))
 #else
-#  define _NOALIAS
+#  define _LIBCPP_NOALIAS
 #endif
 #if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__) || \
 @@ -966,10 +873,6 @@ template <unsigned> struct __static_assert_check {};
 #define _LIBCPP_EXTERN_TEMPLATE2(...) extern template __VA_ARGS__;
 #endif
-#if defined(__APPLE__) && defined(__LP64__) && !defined(__x86_64__)
-#define _LIBCPP_NONUNIQUE_RTTI_BIT (1ULL << 63)
-#endif
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(_LIBCPP_MSVCRT_LIKE) || \
     defined(__sun__) || defined(__NetBSD__) || defined(__CloudABI__)
 #define _LIBCPP_LOCALE__L_EXTENSIONS 1
 @@ -990,13 +893,10 @@ template <unsigned> struct __static_assert_check {};
 // for align_val_t were added in 19.12, aka VS 2017 version 15.3.
 #if defined(_LIBCPP_MSVCRT) && defined(_MSC_VER) && _MSC_VER < 1912
 #  define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
-#elif defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
+#elif defined(_LIBCPP_ABI_VCRUNTIME) && !defined(__cpp_aligned_new)
-#  define _LIBCPP_DEFER_NEW_TO_VCRUNTIME
+   // We're deferring to Microsoft's STL to provide aligned new et al. We don't
-#  if !defined(__cpp_aligned_new)
+   // have it unless the language feature test macro is defined.
-     // We're defering to Microsoft's STL to provide aligned new et al. We don't
+#  define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
-     // have it unless the language feature test macro is defined.
-#    define _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
-#  endif
 #endif
 #if defined(__APPLE__)
 @@ -1025,8 +925,10 @@ template <unsigned> struct __static_assert_check {};
 #endif
 // Deprecation macros.
-// Deprecations warnings are only enabled when _LIBCPP_ENABLE_DEPRECATION_WARNINGS is defined.
+//
-#if defined(_LIBCPP_ENABLE_DEPRECATION_WARNINGS)
+// Deprecations warnings are always enabled, except when users explicitly opt-out
+// by defining _LIBCPP_DISABLE_DEPRECATION_WARNINGS.
+#if !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
 #  if __has_attribute(deprecated)
 #    define _LIBCPP_DEPRECATED __attribute__ ((deprecated))
 #  elif _LIBCPP_STD_VER > 11
 @@ -1128,6 +1030,12 @@ template <unsigned> struct __static_assert_check {};
 #endif
 #endif
+#if __has_attribute(no_destroy)
+#  define _LIBCPP_NO_DESTROY __attribute__((__no_destroy__))
+#else
+#  define _LIBCPP_NO_DESTROY
+#endif
 #ifndef _LIBCPP_HAS_NO_ASAN
 _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
   const void *, const void *, const void *, const void *);
 @@ -1158,6 +1066,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
     !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 #  if defined(__FreeBSD__) || \
       defined(__Fuchsia__) || \
+      defined(__wasi__) || \
       defined(__NetBSD__) || \
       defined(__linux__) || \
       defined(__GNU__) || \
 @@ -1188,6 +1097,23 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
        _LIBCPP_HAS_NO_THREADS is defined.
 #endif
+// The Apple, glibc, and Bionic implementation of pthreads implements
+// pthread_mutex_destroy as nop for regular mutexes. Additionally, Win32
+// mutexes have no destroy mechanism.
+// TODO(EricWF): Enable this optimization on Apple and Bionic platforms after
+// speaking to their respective stakeholders.
+#if (defined(_LIBCPP_HAS_THREAD_API_PTHREAD) && defined(__GLIBC__)) \
+  || defined(_LIBCPP_HAS_THREAD_API_WIN32)
+# define _LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION
+#endif
+// Destroying a condvar is a nop on Windows.
+// TODO(EricWF): This is potentially true for some pthread implementations
+// as well.
+#if defined(_LIBCPP_HAS_THREAD_API_WIN32)
+# define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
+#endif
 // Systems that use capability-based security (FreeBSD with Capsicum,
 // Nuxi CloudABI) may only provide local filesystem access (using *at()).
 // Functions like open(), rename(), unlink() and stat() should not be
 @@ -1204,7 +1130,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #endif
 #if defined(__BIONIC__) || defined(__CloudABI__) ||                            \
-    defined(__Fuchsia__) || defined(_LIBCPP_HAS_MUSL_LIBC)
+    defined(__Fuchsia__) || defined(__wasi__) || defined(_LIBCPP_HAS_MUSL_LIBC)
 #define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
 #endif
 @@ -1216,13 +1142,22 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #if __has_feature(cxx_atomic) || __has_extension(c_atomic) || __has_keyword(_Atomic)
 #  define _LIBCPP_HAS_C_ATOMIC_IMP
-#elif _GNUC_VER > 407
+#elif defined(_LIBCPP_COMPILER_GCC)
 #  define _LIBCPP_HAS_GCC_ATOMIC_IMP
 #endif
-#if (!defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP)) \
+#if (!defined(_LIBCPP_HAS_C_ATOMIC_IMP) && \
+     !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) && \
+     !defined(_LIBCPP_HAS_EXTERNAL_ATOMIC_IMP)) \
      || defined(_LIBCPP_HAS_NO_THREADS)
-#define _LIBCPP_HAS_NO_ATOMIC_HEADER
+#  define _LIBCPP_HAS_NO_ATOMIC_HEADER
+#else
+#  ifndef _LIBCPP_ATOMIC_FLAG_TYPE
+#    define _LIBCPP_ATOMIC_FLAG_TYPE bool
+#  endif
+#  ifdef _LIBCPP_FREESTANDING
+#    define _LIBCPP_ATOMIC_ONLY_USE_BUILTINS
+#  endif
 #endif
 #ifndef _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
 @@ -1250,6 +1185,10 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #define _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF
 #endif
+#if !__has_builtin(__builtin_is_constant_evaluated) && _GNUC_VER < 900
+#define _LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED
+#endif
 #if !defined(_LIBCPP_HAS_NO_OFF_T_FUNCTIONS)
 #  if defined(_LIBCPP_MSVCRT) || defined(_NEWLIB_VERSION)
 #    define _LIBCPP_HAS_NO_OFF_T_FUNCTIONS
 @@ -1277,6 +1216,21 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #  define _LIBCPP_FALLTHROUGH() ((void)0)
 #endif
+#if __has_attribute(__nodebug__)
+#define _LIBCPP_NODEBUG __attribute__((__nodebug__))
+#else
+#define _LIBCPP_NODEBUG
+#endif
+#ifndef _LIBCPP_NODEBUG_TYPE
+#if __has_attribute(__nodebug__) && \
+    (defined(_LIBCPP_COMPILER_CLANG) && _LIBCPP_CLANG_VER >= 900)
+#define _LIBCPP_NODEBUG_TYPE __attribute__((nodebug))
+#else
+#define _LIBCPP_NODEBUG_TYPE
+#endif
+#endif // !defined(_LIBCPP_NODEBUG_TYPE)
 #if defined(_LIBCPP_ABI_MICROSOFT) && \
     (defined(_LIBCPP_COMPILER_MSVC) || __has_declspec_attribute(empty_bases))
 #  define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
 @@ -1312,7 +1266,8 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #if !defined(_LIBCPP_BUILDING_LIBRARY) &&                                      \
     !defined(_LIBCPP_DISABLE_AVAILABILITY) &&                                  \
     __has_feature(attribute_availability_with_strict) &&                       \
-    __has_feature(attribute_availability_in_templates)
+    __has_feature(attribute_availability_in_templates) &&                      \
+    __has_extension(pragma_clang_attribute_external_declaration)
 #  ifdef __APPLE__
 #    define _LIBCPP_USE_AVAILABILITY_APPLE
 #  endif
 @@ -1355,6 +1310,21 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #  define _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR                               \
      __attribute__((availability(macosx,strict,introduced=10.9)))              \
      __attribute__((availability(ios,strict,introduced=7.0)))
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM                                      \
+     __attribute__((availability(macosx,strict,introduced=10.15)))             \
+     __attribute__((availability(ios,strict,introduced=13.0)))                 \
+     __attribute__((availability(tvos,strict,introduced=13.0)))                \
+     __attribute__((availability(watchos,strict,introduced=6.0)))
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM_PUSH                                 \
+     _Pragma("clang attribute push(__attribute__((availability(macosx,strict,introduced=10.15))), apply_to=any(function,record))") \
+     _Pragma("clang attribute push(__attribute__((availability(ios,strict,introduced=13.0))), apply_to=any(function,record))")     \
+     _Pragma("clang attribute push(__attribute__((availability(tvos,strict,introduced=13.0))), apply_to=any(function,record))")    \
+     _Pragma("clang attribute push(__attribute__((availability(watchos,strict,introduced=6.0))), apply_to=any(function,record))")
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM_POP                                  \
+     _Pragma("clang attribute pop")                                            \
+     _Pragma("clang attribute pop")                                            \
+     _Pragma("clang attribute pop")                                            \
+     _Pragma("clang attribute pop")
 #else
 #  define _LIBCPP_AVAILABILITY_SHARED_MUTEX
 #  define _LIBCPP_AVAILABILITY_BAD_VARIANT_ACCESS
 @@ -1366,6 +1336,9 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
 #  define _LIBCPP_AVAILABILITY_TYPEINFO_VTABLE
 #  define _LIBCPP_AVAILABILITY_LOCALE_CATEGORY
 #  define _LIBCPP_AVAILABILITY_ATOMIC_SHARED_PTR
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM_PUSH
+#  define _LIBCPP_AVAILABILITY_FILESYSTEM_POP
 #endif
 // Define availability that depends on _LIBCPP_NO_EXCEPTIONS.

lib/libcxx/include/__config_site.in+4-4

...	@@ -1,9 +1,8 @@	...	@@ -1,9 +1,8 @@
1	//===----------------------------------------------------------------------===//	1	//===----------------------------------------------------------------------===//
2	//	2	//
3	// The LLVM Compiler Infrastructure	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	//	4	// See https://llvm.org/LICENSE.txt for license information.
5	// This file is dual licensed under the MIT and the University of Illinois Open	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	// Source Licenses. See LICENSE.TXT for details.
7	//	6	//
8	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
9		8
...	@@ -28,6 +27,7 @@	...	@@ -28,6 +27,7 @@
28	#cmakedefine _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL	27	#cmakedefine _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL
29	#cmakedefine _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS	28	#cmakedefine _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
30	#cmakedefine _LIBCPP_NO_VCRUNTIME	29	#cmakedefine _LIBCPP_NO_VCRUNTIME
		30	#cmakedefine01 _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT
31	#cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@	31	#cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@
32		32
33	@_LIBCPP_ABI_DEFINES@	33	@_LIBCPP_ABI_DEFINES@

lib/libcxx/include/__debug+16-39

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- __debug ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -12,6 +11,7 @@
 #define _LIBCPP_DEBUG_H
 #include <__config>
+#include <iosfwd>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 @@ -25,7 +25,6 @@
 #   include <cstdlib>
 #   include <cstdio>
 #   include <cstddef>
-#   include <exception>
 #endif
 #if _LIBCPP_DEBUG_LEVEL >= 1 && !defined(_LIBCPP_ASSERT)
 @@ -50,10 +49,6 @@
 #define _LIBCPP_DEBUG_MODE(...) ((void)0)
 #endif
-#if _LIBCPP_DEBUG_LEVEL < 1
-class _LIBCPP_EXCEPTION_ABI __libcpp_debug_exception;
-#endif
 _LIBCPP_BEGIN_NAMESPACE_STD
 struct _LIBCPP_TEMPLATE_VIS __libcpp_debug_info {
 @@ -63,6 +58,9 @@ struct _LIBCPP_TEMPLATE_VIS __libcpp_debug_info {
   _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
   __libcpp_debug_info(const char* __f, int __l, const char* __p, const char* __m)
     : __file_(__f), __line_(__l), __pred_(__p), __msg_(__m) {}
+  _LIBCPP_FUNC_VIS std::string what() const;
   const char* __file_;
   int __line_;
   const char* __pred_;
 @@ -80,38 +78,11 @@ extern _LIBCPP_EXPORTED_FROM_ABI __libcpp_debug_function_type __libcpp_debug_fun
 _LIBCPP_NORETURN _LIBCPP_FUNC_VIS
 void __libcpp_abort_debug_function(__libcpp_debug_info const&);
-/// __libcpp_throw_debug_function - A debug handler that throws
-///   an instance of __libcpp_debug_exception when called.
- _LIBCPP_NORETURN _LIBCPP_FUNC_VIS
-void __libcpp_throw_debug_function(__libcpp_debug_info const&);
 /// __libcpp_set_debug_function - Set the debug handler to the specified
 ///    function.
 _LIBCPP_FUNC_VIS
 bool __libcpp_set_debug_function(__libcpp_debug_function_type __func);
-// Setup the throwing debug handler during dynamic initialization.
-#if _LIBCPP_DEBUG_LEVEL >= 1 && defined(_LIBCPP_DEBUG_USE_EXCEPTIONS)
-# if defined(_LIBCPP_NO_EXCEPTIONS)
-#   error _LIBCPP_DEBUG_USE_EXCEPTIONS cannot be used when exceptions are disabled.
-# endif
-static bool __init_dummy = __libcpp_set_debug_function(__libcpp_throw_debug_function);
-#endif
-#if _LIBCPP_DEBUG_LEVEL >= 1 || defined(_LIBCPP_BUILDING_LIBRARY)
-class _LIBCPP_EXCEPTION_ABI __libcpp_debug_exception : public exception {
-public:
-  __libcpp_debug_exception() _NOEXCEPT;
-  explicit __libcpp_debug_exception(__libcpp_debug_info const& __i);
-  __libcpp_debug_exception(__libcpp_debug_exception const&);
-  ~__libcpp_debug_exception() _NOEXCEPT;
-  const char* what() const _NOEXCEPT;
-private:
-  struct __libcpp_debug_exception_imp;
-  __libcpp_debug_exception_imp *__imp_;
-};
-#endif
 #if _LIBCPP_DEBUG_LEVEL >= 2 || defined(_LIBCPP_BUILDING_LIBRARY)
 struct _LIBCPP_TYPE_VIS __c_node;
 @@ -251,16 +222,22 @@ public:
     __db_c_const_iterator __c_end() const;
     __db_i_const_iterator __i_end() const;
+    typedef __c_node*(_InsertConstruct)(void*, void*, __c_node*);
+    template <class _Cont>
+    _LIBCPP_INLINE_VISIBILITY static __c_node* __create_C_node(void *__mem, void *__c, __c_node *__next) {
+        return ::new(__mem) _C_node<_Cont>(__c, __next);
+    }
     template <class _Cont>
     _LIBCPP_INLINE_VISIBILITY
     void __insert_c(_Cont* __c)
     {
-        __c_node* __n = __insert_c(static_cast<void*>(__c));
+        __insert_c(static_cast<void*>(__c), &__create_C_node<_Cont>);
-        ::new(__n) _C_node<_Cont>(__n->__c_, __n->__next_);
     }
     void __insert_i(void* __i);
-    __c_node* __insert_c(void* __c);
+    void __insert_c(void* __c, _InsertConstruct* __fn);
     void __erase_c(void* __c);
     void __insert_ic(void* __i, const void* __c);

lib/libcxx/include/__errc+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- __errc ----------------------------------===//	2	//===---------------------------- __errc ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__functional_03+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__functional_base+8-9

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -126,7 +125,7 @@ struct __weak_result_type_imp // bool is true
     : public __maybe_derive_from_unary_function<_Tp>,
       public __maybe_derive_from_binary_function<_Tp>
 {
-    typedef typename _Tp::result_type result_type;
+    typedef _LIBCPP_NODEBUG_TYPE typename _Tp::result_type result_type;
 };
 template <class _Tp>
 @@ -147,19 +146,19 @@ struct __weak_result_type
 template <class _Rp>
 struct __weak_result_type<_Rp ()>
 {
-    typedef _Rp result_type;
+    typedef _LIBCPP_NODEBUG_TYPE  _Rp result_type;
 };
 template <class _Rp>
 struct __weak_result_type<_Rp (&)()>
 {
-    typedef _Rp result_type;
+    typedef _LIBCPP_NODEBUG_TYPE  _Rp result_type;
 };
 template <class _Rp>
 struct __weak_result_type<_Rp (*)()>
 {
-    typedef _Rp result_type;
+    typedef _LIBCPP_NODEBUG_TYPE  _Rp result_type;
 };
 // 1 argument case
 @@ -611,7 +610,7 @@ _LIBCPP_INLINE_VAR constexpr size_t uses_allocator_v = uses_allocator<_Tp, _Allo
 template <class _Tp, class _Alloc, class ..._Args>
 struct __uses_alloc_ctor_imp
 {
-    typedef typename __uncvref<_Alloc>::type _RawAlloc;
+    typedef _LIBCPP_NODEBUG_TYPE typename __uncvref<_Alloc>::type _RawAlloc;
     static const bool __ua = uses_allocator<_Tp, _RawAlloc>::value;
     static const bool __ic =
         is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;

lib/libcxx/include/__functional_base_03+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__hash_table+15-15

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -123,7 +122,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -123,7 +122,7 @@ inline _LIBCPP_INLINE_VISIBILITY
123	size_t	122	size_t
124	__next_hash_pow2(size_t __n)	123	__next_hash_pow2(size_t __n)
125	{	124	{
126	return __n < 2 ? __n : (size_t(1) << (std::numeric_limits<size_t>::digits - __clz(__n-1)));	125	return __n < 2 ? __n : (size_t(1) << (std::numeric_limits<size_t>::digits - __libcpp_clz(__n-1)));
127	}	126	}
128		127
129		128
...	@@ -876,9 +875,9 @@ struct __enforce_unordered_container_requirements {	...	@@ -876,9 +875,9 @@ struct __enforce_unordered_container_requirements {
876	template <class _Key, class _Hash, class _Equal>	875	template <class _Key, class _Hash, class _Equal>
877	#ifndef _LIBCPP_CXX03_LANG	876	#ifndef _LIBCPP_CXX03_LANG
878	_LIBCPP_DIAGNOSE_WARNING(!__invokable<_Equal const&, _Key const&, _Key const&>::value,	877	_LIBCPP_DIAGNOSE_WARNING(!__invokable<_Equal const&, _Key const&, _Key const&>::value,
879	"the specified comparator type does not provide a const call operator")	878	"the specified comparator type does not provide a viable const call operator")
880	_LIBCPP_DIAGNOSE_WARNING(!__invokable<_Hash const&, _Key const&>::value,	879	_LIBCPP_DIAGNOSE_WARNING(!__invokable<_Hash const&, _Key const&>::value,
881	"the specified hash functor does not provide a const call operator")	880	"the specified hash functor does not provide a viable const call operator")
882	#endif	881	#endif
883	typename __enforce_unordered_container_requirements<_Key, _Hash, _Equal>::type	882	typename __enforce_unordered_container_requirements<_Key, _Hash, _Equal>::type
884	__diagnose_unordered_container_requirements(int);	883	__diagnose_unordered_container_requirements(int);
...	@@ -1261,7 +1260,7 @@ public:	...	@@ -1261,7 +1260,7 @@ public:
1261		1260
1262	void swap(__hash_table& __u)	1261	void swap(__hash_table& __u)
1263	#if _LIBCPP_STD_VER <= 11	1262	#if _LIBCPP_STD_VER <= 11
1264	_NOEXCEPT_DEBUG_(	1263	_NOEXCEPT_(
1265	__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value	1264	__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value
1266	&& (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value	1265	&& (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value
1267	\|\| __is_nothrow_swappable<__pointer_allocator>::value)	1266	\|\| __is_nothrow_swappable<__pointer_allocator>::value)
...	@@ -1269,7 +1268,7 @@ public:	...	@@ -1269,7 +1268,7 @@ public:
1269	\|\| __is_nothrow_swappable<__node_allocator>::value)	1268	\|\| __is_nothrow_swappable<__node_allocator>::value)
1270	);	1269	);
1271	#else	1270	#else
1272	_NOEXCEPT_DEBUG_(__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value);	1271	_NOEXCEPT_(__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value);
1273	#endif	1272	#endif
1274		1273
1275	_LIBCPP_INLINE_VISIBILITY	1274	_LIBCPP_INLINE_VISIBILITY
...	@@ -2249,7 +2248,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(	...	@@ -2249,7 +2248,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(
2249	return _InsertReturnType{end(), false, _NodeHandle()};	2248	return _InsertReturnType{end(), false, _NodeHandle()};
2250	pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);	2249	pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);
2251	if (__result.second)	2250	if (__result.second)
2252	__nh.__release();	2251	__nh.__release_ptr();
2253	return _InsertReturnType{__result.first, __result.second, _VSTD::move(__nh)};	2252	return _InsertReturnType{__result.first, __result.second, _VSTD::move(__nh)};
2254	}	2253	}
2255		2254
...	@@ -2264,7 +2263,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(	...	@@ -2264,7 +2263,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_unique(
2264	return end();	2263	return end();
2265	pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);	2264	pair<iterator, bool> __result = __node_insert_unique(__nh.__ptr_);
2266	if (__result.second)	2265	if (__result.second)
2267	__nh.__release();	2266	__nh.__release_ptr();
2268	return __result.first;	2267	return __result.first;
2269	}	2268	}
2270		2269
...	@@ -2328,7 +2327,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(	...	@@ -2328,7 +2327,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(
2328	if (__nh.empty())	2327	if (__nh.empty())
2329	return end();	2328	return end();
2330	iterator __result = __node_insert_multi(__nh.__ptr_);	2329	iterator __result = __node_insert_multi(__nh.__ptr_);
2331	__nh.__release();	2330	__nh.__release_ptr();
2332	return __result;	2331	return __result;
2333	}	2332	}
2334		2333
...	@@ -2342,7 +2341,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(	...	@@ -2342,7 +2341,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_insert_multi(
2342	if (__nh.empty())	2341	if (__nh.empty())
2343	return end();	2342	return end();
2344	iterator __result = __node_insert_multi(__hint, __nh.__ptr_);	2343	iterator __result = __node_insert_multi(__hint, __nh.__ptr_);
2345	__nh.__release();	2344	__nh.__release_ptr();
2346	return __result;	2345	return __result;
2347	}	2346	}
2348		2347
...	@@ -2372,6 +2371,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_merge_multi(	...	@@ -2372,6 +2371,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_handle_merge_multi(
2372	template <class _Tp, class _Hash, class _Equal, class _Alloc>	2371	template <class _Tp, class _Hash, class _Equal, class _Alloc>
2373	void	2372	void
2374	__hash_table<_Tp, _Hash, _Equal, _Alloc>::rehash(size_type __n)	2373	__hash_table<_Tp, _Hash, _Equal, _Alloc>::rehash(size_type __n)
		2374	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
2375	{	2375	{
2376	if (__n == 1)	2376	if (__n == 1)
2377	__n = 2;	2377	__n = 2;
...	@@ -2807,7 +2807,7 @@ template <class _Tp, class _Hash, class _Equal, class _Alloc>	...	@@ -2807,7 +2807,7 @@ template <class _Tp, class _Hash, class _Equal, class _Alloc>
2807	void	2807	void
2808	__hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)	2808	__hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)
2809	#if _LIBCPP_STD_VER <= 11	2809	#if _LIBCPP_STD_VER <= 11
2810	_NOEXCEPT_DEBUG_(	2810	_NOEXCEPT_(
2811	__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value	2811	__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value
2812	&& (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value	2812	&& (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value
2813	\|\| __is_nothrow_swappable<__pointer_allocator>::value)	2813	\|\| __is_nothrow_swappable<__pointer_allocator>::value)
...	@@ -2815,7 +2815,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)	...	@@ -2815,7 +2815,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)
2815	\|\| __is_nothrow_swappable<__node_allocator>::value)	2815	\|\| __is_nothrow_swappable<__node_allocator>::value)
2816	)	2816	)
2817	#else	2817	#else
2818	_NOEXCEPT_DEBUG_(__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value)	2818	_NOEXCEPT_(__is_nothrow_swappable<hasher>::value && __is_nothrow_swappable<key_equal>::value)
2819	#endif	2819	#endif
2820	{	2820	{
2821	_LIBCPP_ASSERT(__node_traits::propagate_on_container_swap::value \|\|	2821	_LIBCPP_ASSERT(__node_traits::propagate_on_container_swap::value \|\|

lib/libcxx/include/__libcpp_version+1-1

...	@@ -1 +1 @@	...	@@ -1 +1 @@
1	8000	1	9000

lib/libcxx/include/__locale+55-25

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -20,6 +19,7 @@
 #include <cctype>
 #include <locale.h>
 #if defined(_LIBCPP_MSVCRT_LIKE)
+# include <cstring>
 # include <support/win32/locale_win32.h>
 #elif defined(_AIX)
 # include <support/ibm/xlocale.h>
 @@ -35,6 +35,9 @@
 # include <xlocale.h>
 #elif defined(__Fuchsia__)
 # include <support/fuchsia/xlocale.h>
+#elif defined(__wasi__)
+// WASI libc uses musl's locales support.
+# include <support/musl/xlocale.h>
 #elif defined(_LIBCPP_HAS_MUSL_LIBC)
 # include <support/musl/xlocale.h>
 #endif
 @@ -64,28 +67,41 @@ private:
 #elif defined(_LIBCPP_MSVCRT_LIKE)
 struct __libcpp_locale_guard {
     __libcpp_locale_guard(locale_t __l) :
-        __status(_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)),
+        __status(_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)) {
-        __locale_collate(setlocale(LC_COLLATE, __l.__get_locale())),
+      // Setting the locale can be expensive even when the locale given is
-        __locale_ctype(setlocale(LC_CTYPE, __l.__get_locale())),
+      // already the current locale, so do an explicit check to see if the
-        __locale_monetary(setlocale(LC_MONETARY, __l.__get_locale())),
+      // current locale is already the one we want.
-        __locale_numeric(setlocale(LC_NUMERIC, __l.__get_locale())),
+      const char* __lc = __setlocale(nullptr);
-        __locale_time(setlocale(LC_TIME, __l.__get_locale()))
+      // If every category is the same, the locale string will simply be the
-        // LC_MESSAGES is not supported on Windows.
+      // locale name, otherwise it will be a semicolon-separated string listing
-    {}
+      // each category.  In the second case, we know at least one category won't
+      // be what we want, so we only have to check the first case.
+      if (strcmp(__l.__get_locale(), __lc) != 0) {
+        __locale_all = _strdup(__lc);
+        if (__locale_all == nullptr)
+          __throw_bad_alloc();
+        __setlocale(__l.__get_locale());
+      }
+    }
     ~__libcpp_locale_guard() {
-        setlocale(LC_COLLATE, __locale_collate);
+      // The CRT documentation doesn't explicitly say, but setlocale() does the
-        setlocale(LC_CTYPE, __locale_ctype);
+      // right thing when given a semicolon-separated list of locale settings
-        setlocale(LC_MONETARY, __locale_monetary);
+      // for the different categories in the same format as returned by
-        setlocale(LC_NUMERIC, __locale_numeric);
+      // setlocale(LC_ALL, nullptr).
-        setlocale(LC_TIME, __locale_time);
+      if (__locale_all != nullptr) {
-        _configthreadlocale(__status);
+        __setlocale(__locale_all);
+        free(__locale_all);
+      }
+      _configthreadlocale(__status);
+    }
+    static const char* __setlocale(const char* __locale) {
+      const char* __new_locale = setlocale(LC_ALL, __locale);
+      if (__new_locale == nullptr)
+        __throw_bad_alloc();
+      return __new_locale;
     }
     int __status;
-    char* __locale_collate;
+    char* __locale_all = nullptr;
-    char* __locale_ctype;
-    char* __locale_monetary;
-    char* __locale_numeric;
-    char* __locale_time;
 };
 #endif
 @@ -255,7 +271,10 @@ public:
         return do_compare(__lo1, __hi1, __lo2, __hi2);
     }
+    // FIXME(EricWF): The _LIBCPP_ALWAYS_INLINE is needed on Windows to work
+    // around a dllimport bug that expects an external instantiation.
     _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_ALWAYS_INLINE
     string_type transform(const char_type* __lo, const char_type* __hi) const
     {
         return do_transform(__lo, __hi);
 @@ -389,6 +408,11 @@ public:
     static const mask punct  = _ISpunct;
     static const mask xdigit = _ISxdigit;
     static const mask blank  = _ISblank;
+#if defined(__mips__)
+    static const mask __regex_word = static_cast<char_class_type>(_ISbit(15));
+#else
+    static const mask __regex_word = 0x80;
+#endif
 #elif defined(_LIBCPP_MSVCRT_LIKE)
     typedef unsigned short mask;
     static const mask space  = _SPACE;
 @@ -401,6 +425,7 @@ public:
     static const mask punct  = _PUNCT;
     static const mask xdigit = _HEX;
     static const mask blank  = _BLANK;
+    static const mask __regex_word = 0x80;
 # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT
 #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
 # ifdef __APPLE__
 @@ -422,8 +447,12 @@ public:
 # if defined(__NetBSD__)
     static const mask blank  = _CTYPE_BL;
+    // NetBSD defines classes up to 0x2000
+    // see sys/ctype_bits.h, _CTYPE_Q
+    static const mask __regex_word = 0x8000;
 # else
     static const mask blank  = _CTYPE_B;
+    static const mask __regex_word = 0x80;
 # endif
 #elif defined(__sun__) || defined(_AIX)
     typedef unsigned int mask;
 @@ -437,6 +466,7 @@ public:
     static const mask punct  = _ISPUNCT;
     static const mask xdigit = _ISXDIGIT;
     static const mask blank  = _ISBLANK;
+    static const mask __regex_word = 0x80;
 #elif defined(_NEWLIB_VERSION)
     // Same type as Newlib's _ctype_ array in newlib/libc/include/ctype.h.
     typedef char mask;
 @@ -450,6 +480,7 @@ public:
     static const mask punct  = _P;
     static const mask xdigit = _X | _N;
     static const mask blank  = _B;
+    static const mask __regex_word = 0x80;
 # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_PRINT
 # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_ALPHA
 # define _LIBCPP_CTYPE_MASK_IS_COMPOSITE_XDIGIT
 @@ -465,6 +496,7 @@ public:
     static const mask punct  = 1<<7;
     static const mask xdigit = 1<<8;
     static const mask blank  = 1<<9;
+    static const mask __regex_word = 1<<10;
 #endif
     static const mask alnum  = alpha | digit;
     static const mask graph  = alnum | punct;
 @@ -1230,8 +1262,6 @@ _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<w
 _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>)
 _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>)
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void __throw_runtime_error(const char*);
 template <size_t _Np>
 struct __narrow_to_utf8
 {

lib/libcxx/include/__mutex_base+19-30

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -37,28 +36,24 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -37,28 +36,24 @@ _LIBCPP_BEGIN_NAMESPACE_STD
37	# endif	36	# endif
38	#endif // _LIBCPP_THREAD_SAFETY_ANNOTATION	37	#endif // _LIBCPP_THREAD_SAFETY_ANNOTATION
39		38
		39
40	class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mutex	40	class _LIBCPP_TYPE_VIS _LIBCPP_THREAD_SAFETY_ANNOTATION(capability("mutex")) mutex
41	{	41	{
42	#ifndef _LIBCPP_CXX03_LANG
43	__libcpp_mutex_t __m_ = _LIBCPP_MUTEX_INITIALIZER;	42	__libcpp_mutex_t __m_ = _LIBCPP_MUTEX_INITIALIZER;
44	#else
45	__libcpp_mutex_t __m_;
46	#endif
47		43
48	public:	44	public:
49	_LIBCPP_INLINE_VISIBILITY	45	_LIBCPP_INLINE_VISIBILITY
50	#ifndef _LIBCPP_CXX03_LANG	46	_LIBCPP_CONSTEXPR mutex() = default;
51	constexpr mutex() = default;	47
		48	mutex(const mutex&) = delete;
		49	mutex& operator=(const mutex&) = delete;
		50
		51	#if defined(_LIBCPP_HAS_TRIVIAL_MUTEX_DESTRUCTION)
		52	~mutex() = default;
52	#else	53	#else
53	mutex() _NOEXCEPT {__m_ = (__libcpp_mutex_t)_LIBCPP_MUTEX_INITIALIZER;}	54	~mutex() _NOEXCEPT;
54	#endif	55	#endif
55	~mutex();
56		56
57	private:
58	mutex(const mutex&);// = delete;
59	mutex& operator=(const mutex&);// = delete;
60
61	public:
62	void lock() _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability());	57	void lock() _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability());
63	bool try_lock() _NOEXCEPT _LIBCPP_THREAD_SAFETY_ANNOTATION(try_acquire_capability(true));	58	bool try_lock() _NOEXCEPT _LIBCPP_THREAD_SAFETY_ANNOTATION(try_acquire_capability(true));
64	void unlock() _NOEXCEPT _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability());	59	void unlock() _NOEXCEPT _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability());
...	@@ -287,26 +282,20 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)	...	@@ -287,26 +282,20 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)
287		282
288	class _LIBCPP_TYPE_VIS condition_variable	283	class _LIBCPP_TYPE_VIS condition_variable
289	{	284	{
290	#ifndef _LIBCPP_CXX03_LANG
291	__libcpp_condvar_t __cv_ = _LIBCPP_CONDVAR_INITIALIZER;	285	__libcpp_condvar_t __cv_ = _LIBCPP_CONDVAR_INITIALIZER;
292	#else
293	__libcpp_condvar_t __cv_;
294	#endif
295
296	public:	286	public:
297	_LIBCPP_INLINE_VISIBILITY	287	_LIBCPP_INLINE_VISIBILITY
298	#ifndef _LIBCPP_CXX03_LANG	288	_LIBCPP_CONSTEXPR condition_variable() _NOEXCEPT = default;
299	constexpr condition_variable() _NOEXCEPT = default;	289
		290	#ifdef _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION
		291	~condition_variable() = default;
300	#else	292	#else
301	condition_variable() _NOEXCEPT {__cv_ = (__libcpp_condvar_t)_LIBCPP_CONDVAR_INITIALIZER;}
302	#endif
303	~condition_variable();	293	~condition_variable();
		294	#endif
304		295
305	private:	296	condition_variable(const condition_variable&) = delete;
306	condition_variable(const condition_variable&); // = delete;	297	condition_variable& operator=(const condition_variable&) = delete;
307	condition_variable& operator=(const condition_variable&); // = delete;
308		298
309	public:
310	void notify_one() _NOEXCEPT;	299	void notify_one() _NOEXCEPT;
311	void notify_all() _NOEXCEPT;	300	void notify_all() _NOEXCEPT;
312		301

lib/libcxx/include/__node_handle+5-7

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -57,7 +56,7 @@ private:	...	@@ -57,7 +56,7 @@ private:
57	optional<allocator_type> __alloc_;	56	optional<allocator_type> __alloc_;
58		57
59	_LIBCPP_INLINE_VISIBILITY	58	_LIBCPP_INLINE_VISIBILITY
60	void __release()	59	void __release_ptr()
61	{	60	{
62	__ptr_ = nullptr;	61	__ptr_ = nullptr;
63	__alloc_ = _VSTD::nullopt;	62	__alloc_ = _VSTD::nullopt;
...	@@ -194,8 +193,7 @@ using __map_node_handle =	...	@@ -194,8 +193,7 @@ using __map_node_handle =
194	__basic_node_handle< _NodeType, _Alloc, __map_node_handle_specifics>;	193	__basic_node_handle< _NodeType, _Alloc, __map_node_handle_specifics>;
195		194
196	template <class _Iterator, class _NodeType>	195	template <class _Iterator, class _NodeType>
197	_LIBCPP_TEMPLATE_VIS	196	struct _LIBCPP_TEMPLATE_VIS __insert_return_type
198	struct __insert_return_type
199	{	197	{
200	_Iterator position;	198	_Iterator position;
201	bool inserted;	199	bool inserted;

lib/libcxx/include/__nullptr+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- __nullptr --------------------------------===//	2	//===--------------------------- __nullptr --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__sso_allocator+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__std_stream+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__string+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- __string ----------------------------------===//	2	//===-------------------------- __string ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/__threading_support+10-9

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -23,6 +22,8 @@	...	@@ -23,6 +22,8 @@
23	# include <__external_threading>	22	# include <__external_threading>
24	#elif !defined(_LIBCPP_HAS_NO_THREADS)	23	#elif !defined(_LIBCPP_HAS_NO_THREADS)
25		24
		25	typedef ::timespec __libcpp_timespec_t;
		26
26	#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)	27	#if defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
27	# include <pthread.h>	28	# include <pthread.h>
28	# include <sched.h>	29	# include <sched.h>
...	@@ -149,7 +150,7 @@ int __libcpp_condvar_wait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m);	...	@@ -149,7 +150,7 @@ int __libcpp_condvar_wait(__libcpp_condvar_t* __cv, __libcpp_mutex_t* __m);
149		150
150	_LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_NO_THREAD_SAFETY_ANALYSIS	151	_LIBCPP_THREAD_ABI_VISIBILITY _LIBCPP_NO_THREAD_SAFETY_ANALYSIS
151	int __libcpp_condvar_timedwait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m,	152	int __libcpp_condvar_timedwait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m,
152	timespec *__ts);	153	__libcpp_timespec_t *__ts);
153		154
154	_LIBCPP_THREAD_ABI_VISIBILITY	155	_LIBCPP_THREAD_ABI_VISIBILITY
155	int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv);	156	int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv);
...	@@ -157,7 +158,7 @@ int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv);	...	@@ -157,7 +158,7 @@ int __libcpp_condvar_destroy(__libcpp_condvar_t* __cv);
157	// Execute once	158	// Execute once
158	_LIBCPP_THREAD_ABI_VISIBILITY	159	_LIBCPP_THREAD_ABI_VISIBILITY
159	int __libcpp_execute_once(__libcpp_exec_once_flag *flag,	160	int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
160	void (*init_routine)(void));	161	void (*init_routine)());
161		162
162	// Thread id	163	// Thread id
163	_LIBCPP_THREAD_ABI_VISIBILITY	164	_LIBCPP_THREAD_ABI_VISIBILITY
...	@@ -288,7 +289,7 @@ int __libcpp_condvar_wait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m)	...	@@ -288,7 +289,7 @@ int __libcpp_condvar_wait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m)
288	}	289	}
289		290
290	int __libcpp_condvar_timedwait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m,	291	int __libcpp_condvar_timedwait(__libcpp_condvar_t __cv, __libcpp_mutex_t __m,
291	timespec *__ts)	292	__libcpp_timespec_t *__ts)
292	{	293	{
293	return pthread_cond_timedwait(__cv, __m, __ts);	294	return pthread_cond_timedwait(__cv, __m, __ts);
294	}	295	}
...	@@ -300,7 +301,7 @@ int __libcpp_condvar_destroy(__libcpp_condvar_t *__cv)	...	@@ -300,7 +301,7 @@ int __libcpp_condvar_destroy(__libcpp_condvar_t *__cv)
300		301
301	// Execute once	302	// Execute once
302	int __libcpp_execute_once(__libcpp_exec_once_flag *flag,	303	int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
303	void (*init_routine)(void)) {	304	void (*init_routine)()) {
304	return pthread_once(flag, init_routine);	305	return pthread_once(flag, init_routine);
305	}	306	}
306		307
...	@@ -357,7 +358,7 @@ void __libcpp_thread_sleep_for(const chrono::nanoseconds& __ns)	...	@@ -357,7 +358,7 @@ void __libcpp_thread_sleep_for(const chrono::nanoseconds& __ns)
357	{	358	{
358	using namespace chrono;	359	using namespace chrono;
359	seconds __s = duration_cast<seconds>(__ns);	360	seconds __s = duration_cast<seconds>(__ns);
360	timespec __ts;	361	__libcpp_timespec_t __ts;
361	typedef decltype(__ts.tv_sec) ts_sec;	362	typedef decltype(__ts.tv_sec) ts_sec;
362	_LIBCPP_CONSTEXPR ts_sec __ts_sec_max = numeric_limits<ts_sec>::max();	363	_LIBCPP_CONSTEXPR ts_sec __ts_sec_max = numeric_limits<ts_sec>::max();
363		364

lib/libcxx/include/__tree+91-127

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -27,6 +26,13 @@ _LIBCPP_PUSH_MACROS	...	@@ -27,6 +26,13 @@ _LIBCPP_PUSH_MACROS
27		26
28	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
29		28
		29	#if defined(__GNUC__) && !defined(__clang__) // gcc.gnu.org/PR37804
		30	template <class, class, class, class> class _LIBCPP_TEMPLATE_VIS map;
		31	template <class, class, class, class> class _LIBCPP_TEMPLATE_VIS multimap;
		32	template <class, class, class> class _LIBCPP_TEMPLATE_VIS set;
		33	template <class, class, class> class _LIBCPP_TEMPLATE_VIS multiset;
		34	#endif
		35
30	template <class _Tp, class _Compare, class _Allocator> class __tree;	36	template <class _Tp, class _Compare, class _Allocator> class __tree;
31	template <class _Tp, class _NodePtr, class _DiffType>	37	template <class _Tp, class _NodePtr, class _DiffType>
32	class _LIBCPP_TEMPLATE_VIS __tree_iterator;	38	class _LIBCPP_TEMPLATE_VIS __tree_iterator;
...	@@ -965,7 +971,7 @@ private:	...	@@ -965,7 +971,7 @@ private:
965	template<class _Tp, class _Compare>	971	template<class _Tp, class _Compare>
966	#ifndef _LIBCPP_CXX03_LANG	972	#ifndef _LIBCPP_CXX03_LANG
967	_LIBCPP_DIAGNOSE_WARNING(!std::__invokable<_Compare const&, _Tp const&, _Tp const&>::value,	973	_LIBCPP_DIAGNOSE_WARNING(!std::__invokable<_Compare const&, _Tp const&, _Tp const&>::value,
968	"the specified comparator type does not provide a const call operator")	974	"the specified comparator type does not provide a viable const call operator")
969	#endif	975	#endif
970	int __diagnose_non_const_comparator();	976	int __diagnose_non_const_comparator();
971		977
...	@@ -1090,8 +1096,8 @@ public:	...	@@ -1090,8 +1096,8 @@ public:
1090	__tree(const value_compare& __comp, const allocator_type& __a);	1096	__tree(const value_compare& __comp, const allocator_type& __a);
1091	__tree(const __tree& __t);	1097	__tree(const __tree& __t);
1092	__tree& operator=(const __tree& __t);	1098	__tree& operator=(const __tree& __t);
1093	template <class _InputIterator>	1099	template <class _ForwardIterator>
1094	void __assign_unique(_InputIterator __first, _InputIterator __last);	1100	void __assign_unique(_ForwardIterator __first, _ForwardIterator __last);
1095	template <class _InputIterator>	1101	template <class _InputIterator>
1096	void __assign_multi(_InputIterator __first, _InputIterator __last);	1102	void __assign_multi(_InputIterator __first, _InputIterator __last);
1097	#ifndef _LIBCPP_CXX03_LANG	1103	#ifndef _LIBCPP_CXX03_LANG
...	@@ -1326,10 +1332,7 @@ public:	...	@@ -1326,10 +1332,7 @@ public:
1326	#endif // !_LIBCPP_CXX03_LANG	1332	#endif // !_LIBCPP_CXX03_LANG
1327		1333
1328	_LIBCPP_INLINE_VISIBILITY	1334	_LIBCPP_INLINE_VISIBILITY
1329	pair<iterator, bool> __node_insert_unique(__node_pointer __nd);	1335	pair<iterator, bool> __node_assign_unique(const __container_value_type& __v, __node_pointer __dest);
1330	_LIBCPP_INLINE_VISIBILITY
1331	iterator __node_insert_unique(const_iterator __p,
1332	__node_pointer __nd);
1333		1336
1334	_LIBCPP_INLINE_VISIBILITY	1337	_LIBCPP_INLINE_VISIBILITY
1335	iterator __node_insert_multi(__node_pointer __nd);	1338	iterator __node_insert_multi(__node_pointer __nd);
...	@@ -1509,8 +1512,50 @@ private:	...	@@ -1509,8 +1512,50 @@ private:
1509	_LIBCPP_INLINE_VISIBILITY	1512	_LIBCPP_INLINE_VISIBILITY
1510	void __move_assign_alloc(__tree&, false_type) _NOEXCEPT {}	1513	void __move_assign_alloc(__tree&, false_type) _NOEXCEPT {}
1511		1514
1512	__node_pointer __detach();	1515	struct _DetachedTreeCache {
1513	static __node_pointer __detach(__node_pointer);	1516	_LIBCPP_INLINE_VISIBILITY
		1517	explicit _DetachedTreeCache(__tree *__t) _NOEXCEPT : __t_(__t),
		1518	__cache_root_(__detach_from_tree(__t)) {
		1519	__advance();
		1520	}
		1521
		1522	_LIBCPP_INLINE_VISIBILITY
		1523	__node_pointer __get() const _NOEXCEPT {
		1524	return __cache_elem_;
		1525	}
		1526
		1527	_LIBCPP_INLINE_VISIBILITY
		1528	void __advance() _NOEXCEPT {
		1529	__cache_elem_ = __cache_root_;
		1530	if (__cache_root_) {
		1531	__cache_root_ = __detach_next(__cache_root_);
		1532	}
		1533	}
		1534
		1535	_LIBCPP_INLINE_VISIBILITY
		1536	~_DetachedTreeCache() {
		1537	__t_->destroy(__cache_elem_);
		1538	if (__cache_root_) {
		1539	while (__cache_root_->__parent_ != nullptr)
		1540	__cache_root_ = static_cast<__node_pointer>(__cache_root_->__parent_);
		1541	__t_->destroy(__cache_root_);
		1542	}
		1543	}
		1544
		1545	_DetachedTreeCache(_DetachedTreeCache const&) = delete;
		1546	_DetachedTreeCache& operator=(_DetachedTreeCache const&) = delete;
		1547
		1548	private:
		1549	_LIBCPP_INLINE_VISIBILITY
		1550	static __node_pointer __detach_from_tree(__tree *__t) _NOEXCEPT;
		1551	_LIBCPP_INLINE_VISIBILITY
		1552	static __node_pointer __detach_next(__node_pointer) _NOEXCEPT;
		1553
		1554	__tree *__t_;
		1555	__node_pointer __cache_root_;
		1556	__node_pointer __cache_elem_;
		1557	};
		1558
1514		1559
1515	template <class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS map;	1560	template <class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS map;
1516	template <class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS multimap;	1561	template <class, class, class, class> friend class _LIBCPP_TEMPLATE_VIS multimap;
...	@@ -1548,13 +1593,13 @@ __tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp,	...	@@ -1548,13 +1593,13 @@ __tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp,
1548	// Precondition: size() != 0	1593	// Precondition: size() != 0
1549	template <class _Tp, class _Compare, class _Allocator>	1594	template <class _Tp, class _Compare, class _Allocator>
1550	typename __tree<_Tp, _Compare, _Allocator>::__node_pointer	1595	typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
1551	__tree<_Tp, _Compare, _Allocator>::__detach()	1596	__tree<_Tp, _Compare, _Allocator>::_DetachedTreeCache::__detach_from_tree(__tree *__t) _NOEXCEPT
1552	{	1597	{
1553	__node_pointer __cache = static_cast<__node_pointer>(__begin_node());	1598	__node_pointer __cache = static_cast<__node_pointer>(__t->__begin_node());
1554	__begin_node() = __end_node();	1599	__t->__begin_node() = __t->__end_node();
1555	__end_node()->__left_->__parent_ = nullptr;	1600	__t->__end_node()->__left_->__parent_ = nullptr;
1556	__end_node()->__left_ = nullptr;	1601	__t->__end_node()->__left_ = nullptr;
1557	size() = 0;	1602	__t->size() = 0;
1558	// __cache->__left_ == nullptr	1603	// __cache->__left_ == nullptr
1559	if (__cache->__right_ != nullptr)	1604	if (__cache->__right_ != nullptr)
1560	__cache = static_cast<__node_pointer>(__cache->__right_);	1605	__cache = static_cast<__node_pointer>(__cache->__right_);
...	@@ -1569,7 +1614,7 @@ __tree<_Tp, _Compare, _Allocator>::__detach()	...	@@ -1569,7 +1614,7 @@ __tree<_Tp, _Compare, _Allocator>::__detach()
1569	// This is no longer a red-black tree	1614	// This is no longer a red-black tree
1570	template <class _Tp, class _Compare, class _Allocator>	1615	template <class _Tp, class _Compare, class _Allocator>
1571	typename __tree<_Tp, _Compare, _Allocator>::__node_pointer	1616	typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
1572	__tree<_Tp, _Compare, _Allocator>::__detach(__node_pointer __cache)	1617	__tree<_Tp, _Compare, _Allocator>::_DetachedTreeCache::__detach_next(__node_pointer __cache) _NOEXCEPT
1573	{	1618	{
1574	if (__cache->__parent_ == nullptr)	1619	if (__cache->__parent_ == nullptr)
1575	return nullptr;	1620	return nullptr;
...	@@ -1603,45 +1648,23 @@ __tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t)	...	@@ -1603,45 +1648,23 @@ __tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t)
1603	}	1648	}
1604		1649
1605	template <class _Tp, class _Compare, class _Allocator>	1650	template <class _Tp, class _Compare, class _Allocator>
1606	template <class _InputIterator>	1651	template <class _ForwardIterator>
1607	void	1652	void
1608	__tree<_Tp, _Compare, _Allocator>::__assign_unique(_InputIterator __first, _InputIterator __last)	1653	__tree<_Tp, _Compare, _Allocator>::__assign_unique(_ForwardIterator __first, _ForwardIterator __last)
1609	{	1654	{
1610	typedef iterator_traits<_InputIterator> _ITraits;	1655	typedef iterator_traits<_ForwardIterator> _ITraits;
1611	typedef typename _ITraits::value_type _ItValueType;	1656	typedef typename _ITraits::value_type _ItValueType;
1612	static_assert((is_same<_ItValueType, __container_value_type>::value),	1657	static_assert((is_same<_ItValueType, __container_value_type>::value),
1613	"__assign_unique may only be called with the containers value type");	1658	"__assign_unique may only be called with the containers value type");
1614		1659	static_assert(__is_forward_iterator<_ForwardIterator>::value,
		1660	"__assign_unique requires a forward iterator");
1615	if (size() != 0)	1661	if (size() != 0)
1616	{	1662	{
1617	__node_pointer __cache = __detach();	1663	_DetachedTreeCache __cache(this);
1618	#ifndef _LIBCPP_NO_EXCEPTIONS	1664	for (; __cache.__get() != nullptr && __first != __last; ++__first) {
1619	try	1665	if (__node_assign_unique(*__first, __cache.__get()).second)
1620	{	1666	__cache.__advance();
1621	#endif // _LIBCPP_NO_EXCEPTIONS
1622	for (; __cache != nullptr && __first != __last; ++__first)
1623	{
1624	__cache->__value_ = *__first;
1625	__node_pointer __next = __detach(__cache);
1626	__node_insert_unique(__cache);
1627	__cache = __next;
1628	}	1667	}
1629	#ifndef _LIBCPP_NO_EXCEPTIONS
1630	}
1631	catch (...)
1632	{
1633	while (__cache->__parent_ != nullptr)
1634	__cache = static_cast<__node_pointer>(__cache->__parent_);
1635	destroy(__cache);
1636	throw;
1637	}
1638	#endif // _LIBCPP_NO_EXCEPTIONS
1639	if (__cache != nullptr)
1640	{
1641	while (__cache->__parent_ != nullptr)
1642	__cache = static_cast<__node_pointer>(__cache->__parent_);
1643	destroy(__cache);
1644	}
1645	}	1668	}
1646	for (; __first != __last; ++__first)	1669	for (; __first != __last; ++__first)
1647	__insert_unique(*__first);	1670	__insert_unique(*__first);
...	@@ -1660,33 +1683,11 @@ __tree<_Tp, _Compare, _Allocator>::__assign_multi(_InputIterator __first, _Input	...	@@ -1660,33 +1683,11 @@ __tree<_Tp, _Compare, _Allocator>::__assign_multi(_InputIterator __first, _Input
1660	" or the nodes value type");	1683	" or the nodes value type");
1661	if (size() != 0)	1684	if (size() != 0)
1662	{	1685	{
1663	__node_pointer __cache = __detach();	1686	_DetachedTreeCache __cache(this);
1664	#ifndef _LIBCPP_NO_EXCEPTIONS	1687	for (; __cache.__get() && __first != __last; ++__first) {
1665	try	1688	__cache.__get()->__value_ = *__first;
1666	{	1689	__node_insert_multi(__cache.__get());
1667	#endif // _LIBCPP_NO_EXCEPTIONS	1690	__cache.__advance();
1668	for (; __cache != nullptr && __first != __last; ++__first)
1669	{
1670	__cache->__value_ = *__first;
1671	__node_pointer __next = __detach(__cache);
1672	__node_insert_multi(__cache);
1673	__cache = __next;
1674	}
1675	#ifndef _LIBCPP_NO_EXCEPTIONS
1676	}
1677	catch (...)
1678	{
1679	while (__cache->__parent_ != nullptr)
1680	__cache = static_cast<__node_pointer>(__cache->__parent_);
1681	destroy(__cache);
1682	throw;
1683	}
1684	#endif // _LIBCPP_NO_EXCEPTIONS
1685	if (__cache != nullptr)
1686	{
1687	while (__cache->__parent_ != nullptr)
1688	__cache = static_cast<__node_pointer>(__cache->__parent_);
1689	destroy(__cache);
1690	}	1691	}
1691	}	1692	}
1692	for (; __first != __last; ++__first)	1693	for (; __first != __last; ++__first)
...	@@ -1784,33 +1785,11 @@ __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type)	...	@@ -1784,33 +1785,11 @@ __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type)
1784	const_iterator __e = end();	1785	const_iterator __e = end();
1785	if (size() != 0)	1786	if (size() != 0)
1786	{	1787	{
1787	__node_pointer __cache = __detach();	1788	_DetachedTreeCache __cache(this);
1788	#ifndef _LIBCPP_NO_EXCEPTIONS	1789	while (__cache.__get() != nullptr && __t.size() != 0) {
1789	try	1790	__cache.__get()->__value_ = _VSTD::move(__t.remove(__t.begin())->__value_);
1790	{	1791	__node_insert_multi(__cache.__get());
1791	#endif // _LIBCPP_NO_EXCEPTIONS	1792	__cache.__advance();
1792	while (__cache != nullptr && __t.size() != 0)
1793	{
1794	__cache->__value_ = _VSTD::move(__t.remove(__t.begin())->__value_);
1795	__node_pointer __next = __detach(__cache);
1796	__node_insert_multi(__cache);
1797	__cache = __next;
1798	}
1799	#ifndef _LIBCPP_NO_EXCEPTIONS
1800	}
1801	catch (...)
1802	{
1803	while (__cache->__parent_ != nullptr)
1804	__cache = static_cast<__node_pointer>(__cache->__parent_);
1805	destroy(__cache);
1806	throw;
1807	}
1808	#endif // _LIBCPP_NO_EXCEPTIONS
1809	if (__cache != nullptr)
1810	{
1811	while (__cache->__parent_ != nullptr)
1812	__cache = static_cast<__node_pointer>(__cache->__parent_);
1813	destroy(__cache);
1814	}	1793	}
1815	}	1794	}
1816	while (__t.size() != 0)	1795	while (__t.size() != 0)
...	@@ -2319,14 +2298,15 @@ __tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, const __co	...	@@ -2319,14 +2298,15 @@ __tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, const __co
2319		2298
2320	template <class _Tp, class _Compare, class _Allocator>	2299	template <class _Tp, class _Compare, class _Allocator>
2321	pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>	2300	pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
2322	__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(__node_pointer __nd)	2301	__tree<_Tp, _Compare, _Allocator>::__node_assign_unique(const __container_value_type& __v, __node_pointer __nd)
2323	{	2302	{
2324	__parent_pointer __parent;	2303	__parent_pointer __parent;
2325	__node_base_pointer& __child = __find_equal(__parent, __nd->__value_);	2304	__node_base_pointer& __child = __find_equal(__parent, _NodeTypes::__get_key(__v));
2326	__node_pointer __r = static_cast<__node_pointer>(__child);	2305	__node_pointer __r = static_cast<__node_pointer>(__child);
2327	bool __inserted = false;	2306	bool __inserted = false;
2328	if (__child == nullptr)	2307	if (__child == nullptr)
2329	{	2308	{
		2309	__nd->__value_ = __v;
2330	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));	2310	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
2331	__r = __nd;	2311	__r = __nd;
2332	__inserted = true;	2312	__inserted = true;
...	@@ -2334,22 +2314,6 @@ __tree<_Tp, _Compare, _Allocator>::__node_insert_unique(__node_pointer __nd)	...	@@ -2334,22 +2314,6 @@ __tree<_Tp, _Compare, _Allocator>::__node_insert_unique(__node_pointer __nd)
2334	return pair<iterator, bool>(iterator(__r), __inserted);	2314	return pair<iterator, bool>(iterator(__r), __inserted);
2335	}	2315	}
2336		2316
2337	template <class _Tp, class _Compare, class _Allocator>
2338	typename __tree<_Tp, _Compare, _Allocator>::iterator
2339	__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(const_iterator __p,
2340	__node_pointer __nd)
2341	{
2342	__parent_pointer __parent;
2343	__node_base_pointer __dummy;
2344	__node_base_pointer& __child = __find_equal(__p, __parent, __nd->__value_);
2345	__node_pointer __r = static_cast<__node_pointer>(__child);
2346	if (__child == nullptr)
2347	{
2348	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
2349	__r = __nd;
2350	}
2351	return iterator(__r);
2352	}
2353		2317
2354	template <class _Tp, class _Compare, class _Allocator>	2318	template <class _Tp, class _Compare, class _Allocator>
2355	typename __tree<_Tp, _Compare, _Allocator>::iterator	2319	typename __tree<_Tp, _Compare, _Allocator>::iterator
...	@@ -2408,7 +2372,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(	...	@@ -2408,7 +2372,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(
2408		2372
2409	__insert_node_at(__parent, __child,	2373	__insert_node_at(__parent, __child,
2410	static_cast<__node_base_pointer>(__ptr));	2374	static_cast<__node_base_pointer>(__ptr));
2411	__nh.__release();	2375	__nh.__release_ptr();
2412	return _InsertReturnType{iterator(__ptr), true, _NodeHandle()};	2376	return _InsertReturnType{iterator(__ptr), true, _NodeHandle()};
2413	}	2377	}
2414		2378
...	@@ -2433,7 +2397,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(	...	@@ -2433,7 +2397,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(
2433	__insert_node_at(__parent, __child,	2397	__insert_node_at(__parent, __child,
2434	static_cast<__node_base_pointer>(__ptr));	2398	static_cast<__node_base_pointer>(__ptr));
2435	__r = __ptr;	2399	__r = __ptr;
2436	__nh.__release();	2400	__nh.__release_ptr();
2437	}	2401	}
2438	return iterator(__r);	2402	return iterator(__r);
2439	}	2403	}
...	@@ -2498,7 +2462,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(_NodeHandle&& __nh	...	@@ -2498,7 +2462,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(_NodeHandle&& __nh
2498	__node_base_pointer& __child = __find_leaf_high(	2462	__node_base_pointer& __child = __find_leaf_high(
2499	__parent, _NodeTypes::__get_key(__ptr->__value_));	2463	__parent, _NodeTypes::__get_key(__ptr->__value_));
2500	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));	2464	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
2501	__nh.__release();	2465	__nh.__release_ptr();
2502	return iterator(__ptr);	2466	return iterator(__ptr);
2503	}	2467	}
2504		2468
...	@@ -2517,7 +2481,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(	...	@@ -2517,7 +2481,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(
2517	__node_base_pointer& __child = __find_leaf(__hint, __parent,	2481	__node_base_pointer& __child = __find_leaf(__hint, __parent,
2518	_NodeTypes::__get_key(__ptr->__value_));	2482	_NodeTypes::__get_key(__ptr->__value_));
2519	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));	2483	__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
2520	__nh.__release();	2484	__nh.__release_ptr();
2521	return iterator(__ptr);	2485	return iterator(__ptr);
2522	}	2486	}
2523		2487

lib/libcxx/include/__tuple+31-37

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------------------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -54,27 +53,24 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<volatile _Tp> : publ
 template <class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_size<const volatile _Tp> : public tuple_size<_Tp> {};
 #endif
-template <size_t _Ip, class _Tp> class _LIBCPP_TEMPLATE_VIS tuple_element;
+template <size_t _Ip, class _Tp> struct _LIBCPP_TEMPLATE_VIS tuple_element;
 template <size_t _Ip, class _Tp>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const _Tp>
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const _Tp>
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
-    typedef typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 template <size_t _Ip, class _Tp>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, volatile _Tp>
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, volatile _Tp>
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
-    typedef typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 template <size_t _Ip, class _Tp>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp>
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp>
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
-    typedef typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 template <class _Tp> struct __tuple_like : false_type {};
 @@ -103,7 +99,7 @@ namespace __detail {
 template<typename _Tp, size_t ..._Extra> struct __repeat;
 template<typename _Tp, _Tp ..._Np, size_t ..._Extra> struct __repeat<__integer_sequence<_Tp, _Np...>, _Extra...> {
-  typedef __integer_sequence<_Tp,
+  typedef _LIBCPP_NODEBUG_TYPE __integer_sequence<_Tp,
                            _Np...,
                            sizeof...(_Np) + _Np...,
                            2 * sizeof...(_Np) + _Np...,
 @@ -257,7 +253,7 @@ template <class ..._Tp> struct __tuple_types {};
 namespace __indexer_detail {
 template <size_t _Idx, class _Tp>
-struct __indexed { using type = _Tp; };
+struct __indexed { using type _LIBCPP_NODEBUG_TYPE = _Tp; };
 template <class _Types, class _Indexes> struct __indexer;
 @@ -272,7 +268,7 @@ __indexed<_Idx, _Tp> __at_index(__indexed<_Idx, _Tp> const&);
 } // namespace __indexer_detail
 template <size_t _Idx, class ..._Types>
-using __type_pack_element = typename decltype(
+using __type_pack_element _LIBCPP_NODEBUG_TYPE = typename decltype(
     __indexer_detail::__at_index<_Idx>(
         __indexer_detail::__indexer<
             __tuple_types<_Types...>,
 @@ -282,11 +278,10 @@ using __type_pack_element = typename decltype(
 #endif
 template <size_t _Ip, class ..._Types>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...>>
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, __tuple_types<_Types...>>
 {
-public:
     static_assert(_Ip < sizeof...(_Types), "tuple_element index out of range");
-    typedef __type_pack_element<_Ip, _Types...> type;
+    typedef _LIBCPP_NODEBUG_TYPE __type_pack_element<_Ip, _Types...> type;
 };
 @@ -306,34 +301,34 @@ struct __apply_cv_mf<false, false, false> {
 };
 template <>
 struct __apply_cv_mf<false, true, false> {
-  template <class _Tp> using __apply = const _Tp;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = const _Tp;
 };
 template <>
 struct __apply_cv_mf<false, false, true> {
-  template <class _Tp> using __apply = volatile _Tp;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = volatile _Tp;
 };
 template <>
 struct __apply_cv_mf<false, true, true> {
-  template <class _Tp> using __apply = const volatile _Tp;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = const volatile _Tp;
 };
 template <>
 struct __apply_cv_mf<true, false, false> {
-  template <class _Tp> using __apply = _Tp&;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = _Tp&;
 };
 template <>
 struct __apply_cv_mf<true, true, false> {
-  template <class _Tp> using __apply = const _Tp&;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = const _Tp&;
 };
 template <>
 struct __apply_cv_mf<true, false, true> {
-  template <class _Tp> using __apply = volatile _Tp&;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE  = volatile _Tp&;
 };
 template <>
 struct __apply_cv_mf<true, true, true> {
-  template <class _Tp> using __apply = const volatile _Tp&;
+  template <class _Tp> using __apply _LIBCPP_NODEBUG_TYPE = const volatile _Tp&;
 };
 template <class _Tp, class _RawTp = typename remove_reference<_Tp>::type>
-using __apply_cv_t = __apply_cv_mf<
+using __apply_cv_t _LIBCPP_NODEBUG_TYPE  = __apply_cv_mf<
     is_lvalue_reference<_Tp>::value,
     is_const<_RawTp>::value,
     is_volatile<_RawTp>::value>;
 @@ -352,7 +347,7 @@ template <template <class...> class _Tuple, class ..._Types, size_t ..._Idx>
 struct __make_tuple_types_flat<_Tuple<_Types...>, __tuple_indices<_Idx...>> {
   // Specialization for pair, tuple, and __tuple_types
   template <class _Tp, class _ApplyFn = __apply_cv_t<_Tp>>
-  using __apply_quals = __tuple_types<
+  using __apply_quals _LIBCPP_NODEBUG_TYPE = __tuple_types<
       typename _ApplyFn::template __apply<__type_pack_element<_Idx, _Types...>>...
     >;
 };
 @@ -380,19 +375,19 @@ struct __make_tuple_types
 template <class ..._Types, size_t _Ep>
 struct __make_tuple_types<tuple<_Types...>, _Ep, 0, true> {
-  typedef __tuple_types<_Types...> type;
+  typedef _LIBCPP_NODEBUG_TYPE __tuple_types<_Types...> type;
 };
 template <class ..._Types, size_t _Ep>
 struct __make_tuple_types<__tuple_types<_Types...>, _Ep, 0, true> {
-  typedef __tuple_types<_Types...> type;
+  typedef _LIBCPP_NODEBUG_TYPE __tuple_types<_Types...> type;
 };
 template <bool ..._Preds>
 struct __all_dummy;
 template <bool ..._Pred>
-using __all = is_same<__all_dummy<_Pred...>, __all_dummy<((void)_Pred, true)...>>;
+using __all = _IsSame<__all_dummy<_Pred...>, __all_dummy<((void)_Pred, true)...>>;
 struct __tuple_sfinae_base {
   template <template <class, class...> class _Trait,
 @@ -457,15 +452,14 @@ struct __tuple_assignable<_Tp, _Up, true, true>
 template <size_t _Ip, class ..._Tp>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, tuple<_Tp...> >
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, tuple<_Tp...> >
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
-    typedef typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
 };
 #if _LIBCPP_STD_VER > 11
 template <size_t _Ip, class ..._Tp>
-using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type;
+using tuple_element_t _LIBCPP_NODEBUG_TYPE  = typename tuple_element <_Ip, _Tp...>::type;
 #endif
 template <bool _IsTuple, class _SizeTrait, size_t _Expected>
 @@ -477,7 +471,7 @@ struct __tuple_like_with_size_imp<true, _SizeTrait, _Expected>
 template <class _Tuple, size_t _ExpectedSize,
           class _RawTuple = typename __uncvref<_Tuple>::type>
-using __tuple_like_with_size = __tuple_like_with_size_imp<
+using __tuple_like_with_size _LIBCPP_NODEBUG_TYPE = __tuple_like_with_size_imp<
                                    __tuple_like<_RawTuple>::value,
                                    tuple_size<_RawTuple>, _ExpectedSize
                               >;

lib/libcxx/include/__undef_macros+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------ __undef_macros ------------------------------===//	2	//===------------------------ __undef_macros ------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/algorithm+215-244

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- algorithm ---------------------------------===//	2	//===-------------------------- algorithm ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -781,11 +780,23 @@ __half_positive(_Tp __value)	...	@@ -781,11 +780,23 @@ __half_positive(_Tp __value)
781	template <class _Compare>	780	template <class _Compare>
782	struct __debug_less	781	struct __debug_less
783	{	782	{
784	_Compare __comp_;	783	_Compare &__comp_;
		784	_LIBCPP_CONSTEXPR_AFTER_CXX17
785	__debug_less(_Compare& __c) : __comp_(__c) {}	785	__debug_less(_Compare& __c) : __comp_(__c) {}
786		786
787	template <class _Tp, class _Up>	787	template <class _Tp, class _Up>
788	bool operator()(const _Tp& __x, const _Up& __y)	788	_LIBCPP_CONSTEXPR_AFTER_CXX17
		789	bool operator()(const _Tp& __x, const _Up& __y)
		790	{
		791	bool __r = __comp_(__x, __y);
		792	if (__r)
		793	__do_compare_assert(0, __y, __x);
		794	return __r;
		795	}
		796
		797	template <class _Tp, class _Up>
		798	_LIBCPP_CONSTEXPR_AFTER_CXX17
		799	bool operator()(_Tp& __x, _Up& __y)
789	{	800	{
790	bool __r = __comp_(__x, __y);	801	bool __r = __comp_(__x, __y);
791	if (__r)	802	if (__r)
...	@@ -794,25 +805,39 @@ struct __debug_less	...	@@ -794,25 +805,39 @@ struct __debug_less
794	}	805	}
795		806
796	template <class _LHS, class _RHS>	807	template <class _LHS, class _RHS>
		808	_LIBCPP_CONSTEXPR_AFTER_CXX17
797	inline _LIBCPP_INLINE_VISIBILITY	809	inline _LIBCPP_INLINE_VISIBILITY
798	decltype((void)_VSTD::declval<_Compare&>()(	810	decltype((void)_VSTD::declval<_Compare&>()(
799	_VSTD::declval<_LHS const&>(), _VSTD::declval<_RHS const&>()))	811	_VSTD::declval<_LHS &>(), _VSTD::declval<_RHS &>()))
800	__do_compare_assert(int, _LHS const& __l, _RHS const& __r) {	812	__do_compare_assert(int, _LHS & __l, _RHS & __r) {
801	_LIBCPP_ASSERT(!__comp_(__l, __r),	813	_LIBCPP_ASSERT(!__comp_(__l, __r),
802	"Comparator does not induce a strict weak ordering");	814	"Comparator does not induce a strict weak ordering");
803	}	815	}
804		816
805	template <class _LHS, class _RHS>	817	template <class _LHS, class _RHS>
		818	_LIBCPP_CONSTEXPR_AFTER_CXX17
806	inline _LIBCPP_INLINE_VISIBILITY	819	inline _LIBCPP_INLINE_VISIBILITY
807	void __do_compare_assert(long, _LHS const&, _RHS const&) {}	820	void __do_compare_assert(long, _LHS &, _RHS &) {}
808	};	821	};
809		822
810	#endif // _LIBCPP_DEBUG	823	#endif // _LIBCPP_DEBUG
		824
		825	template <class _Comp>
		826	struct __comp_ref_type {
		827	// Pass the comparator by lvalue reference. Or in debug mode, using a
		828	// debugging wrapper that stores a reference.
		829	#ifndef _LIBCPP_DEBUG
		830	typedef typename add_lvalue_reference<_Comp>::type type;
		831	#else
		832	typedef __debug_less<_Comp> type;
		833	#endif
		834	};
811		835
812	// all_of	836	// all_of
813		837
814	template <class _InputIterator, class _Predicate>	838	template <class _InputIterator, class _Predicate>
815	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	839	_LIBCPP_NODISCARD_EXT inline
		840	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
816	bool	841	bool
817	all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)	842	all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
818	{	843	{
...	@@ -825,7 +850,8 @@ all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)	...	@@ -825,7 +850,8 @@ all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
825	// any_of	850	// any_of
826		851
827	template <class _InputIterator, class _Predicate>	852	template <class _InputIterator, class _Predicate>
828	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	853	_LIBCPP_NODISCARD_EXT inline
		854	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
829	bool	855	bool
830	any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)	856	any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
831	{	857	{
...	@@ -838,7 +864,8 @@ any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)	...	@@ -838,7 +864,8 @@ any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
838	// none_of	864	// none_of
839		865
840	template <class _InputIterator, class _Predicate>	866	template <class _InputIterator, class _Predicate>
841	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	867	_LIBCPP_NODISCARD_EXT inline
		868	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
842	bool	869	bool
843	none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)	870	none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
844	{	871	{
...	@@ -883,7 +910,8 @@ for_each_n(_InputIterator __first, _Size __orig_n, _Function __f)	...	@@ -883,7 +910,8 @@ for_each_n(_InputIterator __first, _Size __orig_n, _Function __f)
883	// find	910	// find
884		911
885	template <class _InputIterator, class _Tp>	912	template <class _InputIterator, class _Tp>
886	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	913	_LIBCPP_NODISCARD_EXT inline
		914	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
887	_InputIterator	915	_InputIterator
888	find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)	916	find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
889	{	917	{
...	@@ -896,7 +924,8 @@ find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)	...	@@ -896,7 +924,8 @@ find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
896	// find_if	924	// find_if
897		925
898	template <class _InputIterator, class _Predicate>	926	template <class _InputIterator, class _Predicate>
899	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	927	_LIBCPP_NODISCARD_EXT inline
		928	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
900	_InputIterator	929	_InputIterator
901	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)	930	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
902	{	931	{
...	@@ -909,7 +938,8 @@ find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)	...	@@ -909,7 +938,8 @@ find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
909	// find_if_not	938	// find_if_not
910		939
911	template<class _InputIterator, class _Predicate>	940	template<class _InputIterator, class _Predicate>
912	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	941	_LIBCPP_NODISCARD_EXT inline
		942	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
913	_InputIterator	943	_InputIterator
914	find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred)	944	find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred)
915	{	945	{
...	@@ -1044,7 +1074,8 @@ __find_end(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,	...	@@ -1044,7 +1074,8 @@ __find_end(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
1044	}	1074	}
1045		1075
1046	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	1076	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
1047	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1077	_LIBCPP_NODISCARD_EXT inline
		1078	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1048	_ForwardIterator1	1079	_ForwardIterator1
1049	find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1080	find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1050	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)	1081	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
...	@@ -1056,7 +1087,8 @@ find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1056,7 +1087,8 @@ find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1056	}	1087	}
1057		1088
1058	template <class _ForwardIterator1, class _ForwardIterator2>	1089	template <class _ForwardIterator1, class _ForwardIterator2>
1059	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1090	_LIBCPP_NODISCARD_EXT inline
		1091	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1060	_ForwardIterator1	1092	_ForwardIterator1
1061	find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1093	find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1062	_ForwardIterator2 __first2, _ForwardIterator2 __last2)	1094	_ForwardIterator2 __first2, _ForwardIterator2 __last2)
...	@@ -1082,7 +1114,8 @@ __find_first_of_ce(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1082,7 +1114,8 @@ __find_first_of_ce(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1082		1114
1083		1115
1084	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	1116	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
1085	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1117	_LIBCPP_NODISCARD_EXT inline
		1118	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1086	_ForwardIterator1	1119	_ForwardIterator1
1087	find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1120	find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1088	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)	1121	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
...	@@ -1091,7 +1124,8 @@ find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1091,7 +1124,8 @@ find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1091	}	1124	}
1092		1125
1093	template <class _ForwardIterator1, class _ForwardIterator2>	1126	template <class _ForwardIterator1, class _ForwardIterator2>
1094	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1127	_LIBCPP_NODISCARD_EXT inline
		1128	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1095	_ForwardIterator1	1129	_ForwardIterator1
1096	find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1130	find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1097	_ForwardIterator2 __first2, _ForwardIterator2 __last2)	1131	_ForwardIterator2 __first2, _ForwardIterator2 __last2)
...	@@ -1104,7 +1138,8 @@ find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1104,7 +1138,8 @@ find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1104	// adjacent_find	1138	// adjacent_find
1105		1139
1106	template <class _ForwardIterator, class _BinaryPredicate>	1140	template <class _ForwardIterator, class _BinaryPredicate>
1107	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1141	_LIBCPP_NODISCARD_EXT inline
		1142	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1108	_ForwardIterator	1143	_ForwardIterator
1109	adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)	1144	adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
1110	{	1145	{
...	@@ -1122,7 +1157,8 @@ adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicat	...	@@ -1122,7 +1157,8 @@ adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicat
1122	}	1157	}
1123		1158
1124	template <class _ForwardIterator>	1159	template <class _ForwardIterator>
1125	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1160	_LIBCPP_NODISCARD_EXT inline
		1161	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1126	_ForwardIterator	1162	_ForwardIterator
1127	adjacent_find(_ForwardIterator __first, _ForwardIterator __last)	1163	adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
1128	{	1164	{
...	@@ -1133,7 +1169,8 @@ adjacent_find(_ForwardIterator __first, _ForwardIterator __last)	...	@@ -1133,7 +1169,8 @@ adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
1133	// count	1169	// count
1134		1170
1135	template <class _InputIterator, class _Tp>	1171	template <class _InputIterator, class _Tp>
1136	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1172	_LIBCPP_NODISCARD_EXT inline
		1173	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1137	typename iterator_traits<_InputIterator>::difference_type	1174	typename iterator_traits<_InputIterator>::difference_type
1138	count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)	1175	count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
1139	{	1176	{
...	@@ -1147,7 +1184,8 @@ count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)	...	@@ -1147,7 +1184,8 @@ count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
1147	// count_if	1184	// count_if
1148		1185
1149	template <class _InputIterator, class _Predicate>	1186	template <class _InputIterator, class _Predicate>
1150	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1187	_LIBCPP_NODISCARD_EXT inline
		1188	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1151	typename iterator_traits<_InputIterator>::difference_type	1189	typename iterator_traits<_InputIterator>::difference_type
1152	count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)	1190	count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
1153	{	1191	{
...	@@ -1161,7 +1199,8 @@ count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)	...	@@ -1161,7 +1199,8 @@ count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
1161	// mismatch	1199	// mismatch
1162		1200
1163	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>	1201	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
1164	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1202	_LIBCPP_NODISCARD_EXT inline
		1203	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1165	pair<_InputIterator1, _InputIterator2>	1204	pair<_InputIterator1, _InputIterator2>
1166	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	1205	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1167	_InputIterator2 __first2, _BinaryPredicate __pred)	1206	_InputIterator2 __first2, _BinaryPredicate __pred)
...	@@ -1173,7 +1212,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -1173,7 +1212,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1173	}	1212	}
1174		1213
1175	template <class _InputIterator1, class _InputIterator2>	1214	template <class _InputIterator1, class _InputIterator2>
1176	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1215	_LIBCPP_NODISCARD_EXT inline
		1216	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1177	pair<_InputIterator1, _InputIterator2>	1217	pair<_InputIterator1, _InputIterator2>
1178	mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)	1218	mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
1179	{	1219	{
...	@@ -1184,7 +1224,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __fi	...	@@ -1184,7 +1224,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __fi
1184		1224
1185	#if _LIBCPP_STD_VER > 11	1225	#if _LIBCPP_STD_VER > 11
1186	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>	1226	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
1187	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1227	_LIBCPP_NODISCARD_EXT inline
		1228	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1188	pair<_InputIterator1, _InputIterator2>	1229	pair<_InputIterator1, _InputIterator2>
1189	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	1230	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1190	_InputIterator2 __first2, _InputIterator2 __last2,	1231	_InputIterator2 __first2, _InputIterator2 __last2,
...	@@ -1197,7 +1238,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -1197,7 +1238,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1197	}	1238	}
1198		1239
1199	template <class _InputIterator1, class _InputIterator2>	1240	template <class _InputIterator1, class _InputIterator2>
1200	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1241	_LIBCPP_NODISCARD_EXT inline
		1242	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1201	pair<_InputIterator1, _InputIterator2>	1243	pair<_InputIterator1, _InputIterator2>
1202	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	1244	mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1203	_InputIterator2 __first2, _InputIterator2 __last2)	1245	_InputIterator2 __first2, _InputIterator2 __last2)
...	@@ -1211,7 +1253,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -1211,7 +1253,8 @@ mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
1211	// equal	1253	// equal
1212		1254
1213	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>	1255	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
1214	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1256	_LIBCPP_NODISCARD_EXT inline
		1257	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1215	bool	1258	bool
1216	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred)	1259	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred)
1217	{	1260	{
...	@@ -1222,7 +1265,8 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first	...	@@ -1222,7 +1265,8 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first
1222	}	1265	}
1223		1266
1224	template <class _InputIterator1, class _InputIterator2>	1267	template <class _InputIterator1, class _InputIterator2>
1225	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1268	_LIBCPP_NODISCARD_EXT inline
		1269	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1226	bool	1270	bool
1227	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)	1271	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
1228	{	1272	{
...	@@ -1260,7 +1304,8 @@ __equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,	...	@@ -1260,7 +1304,8 @@ __equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
1260	}	1304	}
1261		1305
1262	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>	1306	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
1263	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1307	_LIBCPP_NODISCARD_EXT inline
		1308	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1264	bool	1309	bool
1265	equal(_InputIterator1 __first1, _InputIterator1 __last1,	1310	equal(_InputIterator1 __first1, _InputIterator1 __last1,
1266	_InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred )	1311	_InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred )
...	@@ -1272,7 +1317,8 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -1272,7 +1317,8 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1,
1272	}	1317	}
1273		1318
1274	template <class _InputIterator1, class _InputIterator2>	1319	template <class _InputIterator1, class _InputIterator2>
1275	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1320	_LIBCPP_NODISCARD_EXT inline
		1321	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1276	bool	1322	bool
1277	equal(_InputIterator1 __first1, _InputIterator1 __last1,	1323	equal(_InputIterator1 __first1, _InputIterator1 __last1,
1278	_InputIterator2 __first2, _InputIterator2 __last2)	1324	_InputIterator2 __first2, _InputIterator2 __last2)
...	@@ -1288,7 +1334,7 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -1288,7 +1334,7 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1,
1288	// is_permutation	1334	// is_permutation
1289		1335
1290	template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	1336	template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
1291	_LIBCPP_CONSTEXPR_AFTER_CXX17 bool	1337	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
1292	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1338	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1293	_ForwardIterator2 __first2, _BinaryPredicate __pred)	1339	_ForwardIterator2 __first2, _BinaryPredicate __pred)
1294	{	1340	{
...	@@ -1335,7 +1381,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1335,7 +1381,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1335	}	1381	}
1336		1382
1337	template<class _ForwardIterator1, class _ForwardIterator2>	1383	template<class _ForwardIterator1, class _ForwardIterator2>
1338	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1384	_LIBCPP_NODISCARD_EXT inline
		1385	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1339	bool	1386	bool
1340	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1387	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1341	_ForwardIterator2 __first2)	1388	_ForwardIterator2 __first2)
...	@@ -1414,7 +1461,8 @@ __is_permutation(_RandomAccessIterator1 __first1, _RandomAccessIterator2 __last1	...	@@ -1414,7 +1461,8 @@ __is_permutation(_RandomAccessIterator1 __first1, _RandomAccessIterator2 __last1
1414	}	1461	}
1415		1462
1416	template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	1463	template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
1417	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1464	_LIBCPP_NODISCARD_EXT inline
		1465	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1418	bool	1466	bool
1419	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1467	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1420	_ForwardIterator2 __first2, _ForwardIterator2 __last2,	1468	_ForwardIterator2 __first2, _ForwardIterator2 __last2,
...	@@ -1427,7 +1475,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1427,7 +1475,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1427	}	1475	}
1428		1476
1429	template<class _ForwardIterator1, class _ForwardIterator2>	1477	template<class _ForwardIterator1, class _ForwardIterator2>
1430	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1478	_LIBCPP_NODISCARD_EXT inline
		1479	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1431	bool	1480	bool
1432	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1481	is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1433	_ForwardIterator2 __first2, _ForwardIterator2 __last2)	1482	_ForwardIterator2 __first2, _ForwardIterator2 __last2)
...	@@ -1445,7 +1494,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1445,7 +1494,8 @@ is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1445	// __search is in <functional>	1494	// __search is in <functional>
1446		1495
1447	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>	1496	template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
1448	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1497	_LIBCPP_NODISCARD_EXT inline
		1498	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1449	_ForwardIterator1	1499	_ForwardIterator1
1450	search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1500	search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1451	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)	1501	_ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
...	@@ -1458,7 +1508,8 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1458,7 +1508,8 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1458	}	1508	}
1459		1509
1460	template <class _ForwardIterator1, class _ForwardIterator2>	1510	template <class _ForwardIterator1, class _ForwardIterator2>
1461	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1511	_LIBCPP_NODISCARD_EXT inline
		1512	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1462	_ForwardIterator1	1513	_ForwardIterator1
1463	search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	1514	search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1464	_ForwardIterator2 __first2, _ForwardIterator2 __last2)	1515	_ForwardIterator2 __first2, _ForwardIterator2 __last2)
...	@@ -1471,7 +1522,7 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,	...	@@ -1471,7 +1522,7 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
1471		1522
1472	#if _LIBCPP_STD_VER > 14	1523	#if _LIBCPP_STD_VER > 14
1473	template <class _ForwardIterator, class _Searcher>	1524	template <class _ForwardIterator, class _Searcher>
1474	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1525	_LIBCPP_NODISCARD_EXT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1475	_ForwardIterator search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher &__s)	1526	_ForwardIterator search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher &__s)
1476	{ return __s(__f, __l).first; }	1527	{ return __s(__f, __l).first; }
1477	#endif	1528	#endif
...	@@ -1556,7 +1607,8 @@ __search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,	...	@@ -1556,7 +1607,8 @@ __search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,
1556	}	1607	}
1557		1608
1558	template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>	1609	template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
1559	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1610	_LIBCPP_NODISCARD_EXT inline
		1611	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1560	_ForwardIterator	1612	_ForwardIterator
1561	search_n(_ForwardIterator __first, _ForwardIterator __last,	1613	search_n(_ForwardIterator __first, _ForwardIterator __last,
1562	_Size __count, const _Tp& __value_, _BinaryPredicate __pred)	1614	_Size __count, const _Tp& __value_, _BinaryPredicate __pred)
...	@@ -1567,7 +1619,8 @@ search_n(_ForwardIterator __first, _ForwardIterator __last,	...	@@ -1567,7 +1619,8 @@ search_n(_ForwardIterator __first, _ForwardIterator __last,
1567	}	1619	}
1568		1620
1569	template <class _ForwardIterator, class _Size, class _Tp>	1621	template <class _ForwardIterator, class _Size, class _Tp>
1570	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	1622	_LIBCPP_NODISCARD_EXT inline
		1623	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1571	_ForwardIterator	1624	_ForwardIterator
1572	search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_)	1625	search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_)
1573	{	1626	{
...	@@ -1611,6 +1664,18 @@ __unwrap_iter(__wrap_iter<_Tp*> __i)	...	@@ -1611,6 +1664,18 @@ __unwrap_iter(__wrap_iter<_Tp*> __i)
1611	return __i.base();	1664	return __i.base();
1612	}	1665	}
1613		1666
		1667	template <class _Tp>
		1668	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
		1669	typename enable_if
		1670	<
		1671	is_trivially_copy_assignable<_Tp>::value,
		1672	const _Tp*
		1673	>::type
		1674	__unwrap_iter(__wrap_iter<const _Tp*> __i)
		1675	{
		1676	return __i.base();
		1677	}
		1678
1614	#else	1679	#else
1615		1680
1616	template <class _Tp>	1681	template <class _Tp>
...	@@ -1984,7 +2049,7 @@ generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)	...	@@ -1984,7 +2049,7 @@ generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
1984	// generate_n	2049	// generate_n
1985		2050
1986	template <class _OutputIterator, class _Size, class _Generator>	2051	template <class _OutputIterator, class _Size, class _Generator>
1987	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2052	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
1988	_OutputIterator	2053	_OutputIterator
1989	generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)	2054	generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)
1990	{	2055	{
...	@@ -1998,7 +2063,7 @@ generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)	...	@@ -1998,7 +2063,7 @@ generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)
1998	// remove	2063	// remove
1999		2064
2000	template <class _ForwardIterator, class _Tp>	2065	template <class _ForwardIterator, class _Tp>
2001	_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	2066	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
2002	remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	2067	remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
2003	{	2068	{
2004	__first = _VSTD::find(__first, __last, __value_);	2069	__first = _VSTD::find(__first, __last, __value_);
...	@@ -2020,7 +2085,7 @@ remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	...	@@ -2020,7 +2085,7 @@ remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
2020	// remove_if	2085	// remove_if
2021		2086
2022	template <class _ForwardIterator, class _Predicate>	2087	template <class _ForwardIterator, class _Predicate>
2023	_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	2088	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
2024	remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)	2089	remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
2025	{	2090	{
2026	__first = _VSTD::find_if<_ForwardIterator, typename add_lvalue_reference<_Predicate>::type>	2091	__first = _VSTD::find_if<_ForwardIterator, typename add_lvalue_reference<_Predicate>::type>
...	@@ -2079,7 +2144,7 @@ remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __	...	@@ -2079,7 +2144,7 @@ remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __
2079	// unique	2144	// unique
2080		2145
2081	template <class _ForwardIterator, class _BinaryPredicate>	2146	template <class _ForwardIterator, class _BinaryPredicate>
2082	_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	2147	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
2083	unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)	2148	unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
2084	{	2149	{
2085	__first = _VSTD::adjacent_find<_ForwardIterator, typename add_lvalue_reference<_BinaryPredicate>::type>	2150	__first = _VSTD::adjacent_find<_ForwardIterator, typename add_lvalue_reference<_BinaryPredicate>::type>
...	@@ -2098,7 +2163,8 @@ unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pre	...	@@ -2098,7 +2163,8 @@ unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pre
2098	}	2163	}
2099		2164
2100	template <class _ForwardIterator>	2165	template <class _ForwardIterator>
2101	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	2166	_LIBCPP_NODISCARD_EXT inline
		2167	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
2102	_ForwardIterator	2168	_ForwardIterator
2103	unique(_ForwardIterator __first, _ForwardIterator __last)	2169	unique(_ForwardIterator __first, _ForwardIterator __last)
2104	{	2170	{
...	@@ -2421,7 +2487,8 @@ rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterato	...	@@ -2421,7 +2487,8 @@ rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterato
2421	// min_element	2487	// min_element
2422		2488
2423	template <class _ForwardIterator, class _Compare>	2489	template <class _ForwardIterator, class _Compare>
2424	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2490	_LIBCPP_NODISCARD_EXT inline
		2491	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2425	_ForwardIterator	2492	_ForwardIterator
2426	min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	2493	min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2427	{	2494	{
...	@@ -2438,7 +2505,8 @@ min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	...	@@ -2438,7 +2505,8 @@ min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2438	}	2505	}
2439		2506
2440	template <class _ForwardIterator>	2507	template <class _ForwardIterator>
2441	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2508	_LIBCPP_NODISCARD_EXT inline
		2509	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2442	_ForwardIterator	2510	_ForwardIterator
2443	min_element(_ForwardIterator __first, _ForwardIterator __last)	2511	min_element(_ForwardIterator __first, _ForwardIterator __last)
2444	{	2512	{
...	@@ -2449,7 +2517,8 @@ min_element(_ForwardIterator __first, _ForwardIterator __last)	...	@@ -2449,7 +2517,8 @@ min_element(_ForwardIterator __first, _ForwardIterator __last)
2449	// min	2517	// min
2450		2518
2451	template <class _Tp, class _Compare>	2519	template <class _Tp, class _Compare>
2452	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2520	_LIBCPP_NODISCARD_EXT inline
		2521	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2453	const _Tp&	2522	const _Tp&
2454	min(const _Tp& __a, const _Tp& __b, _Compare __comp)	2523	min(const _Tp& __a, const _Tp& __b, _Compare __comp)
2455	{	2524	{
...	@@ -2457,7 +2526,8 @@ min(const _Tp& __a, const _Tp& __b, _Compare __comp)	...	@@ -2457,7 +2526,8 @@ min(const _Tp& __a, const _Tp& __b, _Compare __comp)
2457	}	2526	}
2458		2527
2459	template <class _Tp>	2528	template <class _Tp>
2460	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2529	_LIBCPP_NODISCARD_EXT inline
		2530	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2461	const _Tp&	2531	const _Tp&
2462	min(const _Tp& __a, const _Tp& __b)	2532	min(const _Tp& __a, const _Tp& __b)
2463	{	2533	{
...	@@ -2467,7 +2537,8 @@ min(const _Tp& __a, const _Tp& __b)	...	@@ -2467,7 +2537,8 @@ min(const _Tp& __a, const _Tp& __b)
2467	#ifndef _LIBCPP_CXX03_LANG	2537	#ifndef _LIBCPP_CXX03_LANG
2468		2538
2469	template<class _Tp, class _Compare>	2539	template<class _Tp, class _Compare>
2470	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2540	_LIBCPP_NODISCARD_EXT inline
		2541	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2471	_Tp	2542	_Tp
2472	min(initializer_list<_Tp> __t, _Compare __comp)	2543	min(initializer_list<_Tp> __t, _Compare __comp)
2473	{	2544	{
...	@@ -2475,7 +2546,8 @@ min(initializer_list<_Tp> __t, _Compare __comp)	...	@@ -2475,7 +2546,8 @@ min(initializer_list<_Tp> __t, _Compare __comp)
2475	}	2546	}
2476		2547
2477	template<class _Tp>	2548	template<class _Tp>
2478	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2549	_LIBCPP_NODISCARD_EXT inline
		2550	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2479	_Tp	2551	_Tp
2480	min(initializer_list<_Tp> __t)	2552	min(initializer_list<_Tp> __t)
2481	{	2553	{
...	@@ -2487,7 +2559,8 @@ min(initializer_list<_Tp> __t)	...	@@ -2487,7 +2559,8 @@ min(initializer_list<_Tp> __t)
2487	// max_element	2559	// max_element
2488		2560
2489	template <class _ForwardIterator, class _Compare>	2561	template <class _ForwardIterator, class _Compare>
2490	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2562	_LIBCPP_NODISCARD_EXT inline
		2563	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2491	_ForwardIterator	2564	_ForwardIterator
2492	max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	2565	max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2493	{	2566	{
...	@@ -2505,7 +2578,8 @@ max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	...	@@ -2505,7 +2578,8 @@ max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2505		2578
2506		2579
2507	template <class _ForwardIterator>	2580	template <class _ForwardIterator>
2508	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2581	_LIBCPP_NODISCARD_EXT inline
		2582	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2509	_ForwardIterator	2583	_ForwardIterator
2510	max_element(_ForwardIterator __first, _ForwardIterator __last)	2584	max_element(_ForwardIterator __first, _ForwardIterator __last)
2511	{	2585	{
...	@@ -2516,7 +2590,8 @@ max_element(_ForwardIterator __first, _ForwardIterator __last)	...	@@ -2516,7 +2590,8 @@ max_element(_ForwardIterator __first, _ForwardIterator __last)
2516	// max	2590	// max
2517		2591
2518	template <class _Tp, class _Compare>	2592	template <class _Tp, class _Compare>
2519	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2593	_LIBCPP_NODISCARD_EXT inline
		2594	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2520	const _Tp&	2595	const _Tp&
2521	max(const _Tp& __a, const _Tp& __b, _Compare __comp)	2596	max(const _Tp& __a, const _Tp& __b, _Compare __comp)
2522	{	2597	{
...	@@ -2524,7 +2599,8 @@ max(const _Tp& __a, const _Tp& __b, _Compare __comp)	...	@@ -2524,7 +2599,8 @@ max(const _Tp& __a, const _Tp& __b, _Compare __comp)
2524	}	2599	}
2525		2600
2526	template <class _Tp>	2601	template <class _Tp>
2527	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2602	_LIBCPP_NODISCARD_EXT inline
		2603	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2528	const _Tp&	2604	const _Tp&
2529	max(const _Tp& __a, const _Tp& __b)	2605	max(const _Tp& __a, const _Tp& __b)
2530	{	2606	{
...	@@ -2534,7 +2610,8 @@ max(const _Tp& __a, const _Tp& __b)	...	@@ -2534,7 +2610,8 @@ max(const _Tp& __a, const _Tp& __b)
2534	#ifndef _LIBCPP_CXX03_LANG	2610	#ifndef _LIBCPP_CXX03_LANG
2535		2611
2536	template<class _Tp, class _Compare>	2612	template<class _Tp, class _Compare>
2537	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2613	_LIBCPP_NODISCARD_EXT inline
		2614	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2538	_Tp	2615	_Tp
2539	max(initializer_list<_Tp> __t, _Compare __comp)	2616	max(initializer_list<_Tp> __t, _Compare __comp)
2540	{	2617	{
...	@@ -2542,7 +2619,8 @@ max(initializer_list<_Tp> __t, _Compare __comp)	...	@@ -2542,7 +2619,8 @@ max(initializer_list<_Tp> __t, _Compare __comp)
2542	}	2619	}
2543		2620
2544	template<class _Tp>	2621	template<class _Tp>
2545	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2622	_LIBCPP_NODISCARD_EXT inline
		2623	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2546	_Tp	2624	_Tp
2547	max(initializer_list<_Tp> __t)	2625	max(initializer_list<_Tp> __t)
2548	{	2626	{
...	@@ -2554,7 +2632,8 @@ max(initializer_list<_Tp> __t)	...	@@ -2554,7 +2632,8 @@ max(initializer_list<_Tp> __t)
2554	#if _LIBCPP_STD_VER > 14	2632	#if _LIBCPP_STD_VER > 14
2555	// clamp	2633	// clamp
2556	template<class _Tp, class _Compare>	2634	template<class _Tp, class _Compare>
2557	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR	2635	_LIBCPP_NODISCARD_EXT inline
		2636	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
2558	const _Tp&	2637	const _Tp&
2559	clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi, _Compare __comp)	2638	clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi, _Compare __comp)
2560	{	2639	{
...	@@ -2564,7 +2643,8 @@ clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi, _Compare __comp)	...	@@ -2564,7 +2643,8 @@ clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi, _Compare __comp)
2564	}	2643	}
2565		2644
2566	template<class _Tp>	2645	template<class _Tp>
2567	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR	2646	_LIBCPP_NODISCARD_EXT inline
		2647	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
2568	const _Tp&	2648	const _Tp&
2569	clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi)	2649	clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi)
2570	{	2650	{
...	@@ -2575,7 +2655,7 @@ clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi)	...	@@ -2575,7 +2655,7 @@ clamp(const _Tp& __v, const _Tp& __lo, const _Tp& __hi)
2575	// minmax_element	2655	// minmax_element
2576		2656
2577	template <class _ForwardIterator, class _Compare>	2657	template <class _ForwardIterator, class _Compare>
2578	_LIBCPP_CONSTEXPR_AFTER_CXX11	2658	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX11
2579	std::pair<_ForwardIterator, _ForwardIterator>	2659	std::pair<_ForwardIterator, _ForwardIterator>
2580	minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	2660	minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2581	{	2661	{
...	@@ -2625,7 +2705,8 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __com	...	@@ -2625,7 +2705,8 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __com
2625	}	2705	}
2626		2706
2627	template <class _ForwardIterator>	2707	template <class _ForwardIterator>
2628	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2708	_LIBCPP_NODISCARD_EXT inline
		2709	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2629	std::pair<_ForwardIterator, _ForwardIterator>	2710	std::pair<_ForwardIterator, _ForwardIterator>
2630	minmax_element(_ForwardIterator __first, _ForwardIterator __last)	2711	minmax_element(_ForwardIterator __first, _ForwardIterator __last)
2631	{	2712	{
...	@@ -2636,7 +2717,8 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last)	...	@@ -2636,7 +2717,8 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last)
2636	// minmax	2717	// minmax
2637		2718
2638	template<class _Tp, class _Compare>	2719	template<class _Tp, class _Compare>
2639	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2720	_LIBCPP_NODISCARD_EXT inline
		2721	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2640	pair<const _Tp&, const _Tp&>	2722	pair<const _Tp&, const _Tp&>
2641	minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)	2723	minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
2642	{	2724	{
...	@@ -2645,7 +2727,8 @@ minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)	...	@@ -2645,7 +2727,8 @@ minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
2645	}	2727	}
2646		2728
2647	template<class _Tp>	2729	template<class _Tp>
2648	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2730	_LIBCPP_NODISCARD_EXT inline
		2731	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2649	pair<const _Tp&, const _Tp&>	2732	pair<const _Tp&, const _Tp&>
2650	minmax(const _Tp& __a, const _Tp& __b)	2733	minmax(const _Tp& __a, const _Tp& __b)
2651	{	2734	{
...	@@ -2655,7 +2738,8 @@ minmax(const _Tp& __a, const _Tp& __b)	...	@@ -2655,7 +2738,8 @@ minmax(const _Tp& __a, const _Tp& __b)
2655	#ifndef _LIBCPP_CXX03_LANG	2738	#ifndef _LIBCPP_CXX03_LANG
2656		2739
2657	template<class _Tp, class _Compare>	2740	template<class _Tp, class _Compare>
2658	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2741	_LIBCPP_NODISCARD_EXT inline
		2742	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2659	pair<_Tp, _Tp>	2743	pair<_Tp, _Tp>
2660	minmax(initializer_list<_Tp> __t, _Compare __comp)	2744	minmax(initializer_list<_Tp> __t, _Compare __comp)
2661	{	2745	{
...	@@ -2692,7 +2776,8 @@ minmax(initializer_list<_Tp> __t, _Compare __comp)	...	@@ -2692,7 +2776,8 @@ minmax(initializer_list<_Tp> __t, _Compare __comp)
2692	}	2776	}
2693		2777
2694	template<class _Tp>	2778	template<class _Tp>
2695	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11	2779	_LIBCPP_NODISCARD_EXT inline
		2780	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
2696	pair<_Tp, _Tp>	2781	pair<_Tp, _Tp>
2697	minmax(initializer_list<_Tp> __t)	2782	minmax(initializer_list<_Tp> __t)
2698	{	2783	{
...	@@ -2936,7 +3021,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK	...	@@ -2936,7 +3021,7 @@ _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
2936	typedef __independent_bits_engine<_URNG, _UIntType> _Eng;	3021	typedef __independent_bits_engine<_URNG, _UIntType> _Eng;
2937	if (_Rp == 0)	3022	if (_Rp == 0)
2938	return static_cast<result_type>(_Eng(__g, _Dt)());	3023	return static_cast<result_type>(_Eng(__g, _Dt)());
2939	size_t __w = _Dt - __clz(_Rp) - 1;	3024	size_t __w = _Dt - __libcpp_clz(_Rp) - 1;
2940	if ((_Rp & (std::numeric_limits<_UIntType>::max() >> (_Dt - __w))) != 0)	3025	if ((_Rp & (std::numeric_limits<_UIntType>::max() >> (_Dt - __w))) != 0)
2941	++__w;	3026	++__w;
2942	_Eng __e(__g, __w);	3027	_Eng __e(__g, __w);
...	@@ -2990,7 +3075,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)	...	@@ -2990,7 +3075,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
2990	{	3075	{
2991	_Dp __uid;	3076	_Dp __uid;
2992	__rs_default __g = __rs_get();	3077	__rs_default __g = __rs_get();
2993	for (--__last, --__d; __first < __last; ++__first, --__d)	3078	for (--__last, (void) --__d; __first < __last; ++__first, (void) --__d)
2994	{	3079	{
2995	difference_type __i = __uid(__g, _Pp(0, __d));	3080	difference_type __i = __uid(__g, _Pp(0, __d));
2996	if (__i != difference_type(0))	3081	if (__i != difference_type(0))
...	@@ -3012,7 +3097,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,	...	@@ -3012,7 +3097,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
3012	difference_type __d = __last - __first;	3097	difference_type __d = __last - __first;
3013	if (__d > 1)	3098	if (__d > 1)
3014	{	3099	{
3015	for (--__last; __first < __last; ++__first, --__d)	3100	for (--__last; __first < __last; ++__first, (void) --__d)
3016	{	3101	{
3017	difference_type __i = __rand(__d);	3102	difference_type __i = __rand(__d);
3018	if (__i != difference_type(0))	3103	if (__i != difference_type(0))
...	@@ -3096,11 +3181,7 @@ _SampleIterator sample(_PopulationIterator __first,	...	@@ -3096,11 +3181,7 @@ _SampleIterator sample(_PopulationIterator __first,
3096		3181
3097	template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>	3182	template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>
3098	void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,	3183	void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
3099	#ifndef _LIBCPP_CXX03_LANG
3100	_UniformRandomNumberGenerator&& __g)	3184	_UniformRandomNumberGenerator&& __g)
3101	#else
3102	_UniformRandomNumberGenerator& __g)
3103	#endif
3104	{	3185	{
3105	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;	3186	typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
3106	typedef uniform_int_distribution<ptrdiff_t> _Dp;	3187	typedef uniform_int_distribution<ptrdiff_t> _Dp;
...	@@ -3119,7 +3200,7 @@ template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>	...	@@ -3119,7 +3200,7 @@ template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>
3119	}	3200	}
3120		3201
3121	template <class _InputIterator, class _Predicate>	3202	template <class _InputIterator, class _Predicate>
3122	_LIBCPP_CONSTEXPR_AFTER_CXX17 bool	3203	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 bool
3123	is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)	3204	is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
3124	{	3205	{
3125	for (; __first != __last; ++__first)	3206	for (; __first != __last; ++__first)
...	@@ -3527,7 +3608,7 @@ stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate _	...	@@ -3527,7 +3608,7 @@ stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate _
3527	// is_sorted_until	3608	// is_sorted_until
3528		3609
3529	template <class _ForwardIterator, class _Compare>	3610	template <class _ForwardIterator, class _Compare>
3530	_LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator	3611	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _ForwardIterator
3531	is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	3612	is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
3532	{	3613	{
3533	if (__first != __last)	3614	if (__first != __last)
...	@@ -3544,7 +3625,8 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __co	...	@@ -3544,7 +3625,8 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __co
3544	}	3625	}
3545		3626
3546	template<class _ForwardIterator>	3627	template<class _ForwardIterator>
3547	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	3628	_LIBCPP_NODISCARD_EXT inline
		3629	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
3548	_ForwardIterator	3630	_ForwardIterator
3549	is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)	3631	is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
3550	{	3632	{
...	@@ -3554,7 +3636,8 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)	...	@@ -3554,7 +3636,8 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
3554	// is_sorted	3636	// is_sorted
3555		3637
3556	template <class _ForwardIterator, class _Compare>	3638	template <class _ForwardIterator, class _Compare>
3557	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	3639	_LIBCPP_NODISCARD_EXT inline
		3640	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
3558	bool	3641	bool
3559	is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	3642	is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
3560	{	3643	{
...	@@ -3562,7 +3645,8 @@ is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)	...	@@ -3562,7 +3645,8 @@ is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
3562	}	3645	}
3563		3646
3564	template<class _ForwardIterator>	3647	template<class _ForwardIterator>
3565	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	3648	_LIBCPP_NODISCARD_EXT inline
		3649	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
3566	bool	3650	bool
3567	is_sorted(_ForwardIterator __first, _ForwardIterator __last)	3651	is_sorted(_ForwardIterator __first, _ForwardIterator __last)
3568	{	3652	{
...	@@ -4009,14 +4093,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -4009,14 +4093,8 @@ inline _LIBCPP_INLINE_VISIBILITY
4009	void	4093	void
4010	sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4094	sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4011	{	4095	{
4012	#ifdef _LIBCPP_DEBUG	4096	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4013	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;	4097	_VSTD::__sort<_Comp_ref>(__first, __last, _Comp_ref(__comp));
4014	__debug_less<_Compare> __c(__comp);
4015	__sort<_Comp_ref>(__first, __last, __c);
4016	#else // _LIBCPP_DEBUG
4017	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4018	__sort<_Comp_ref>(__first, __last, __comp);
4019	#endif // _LIBCPP_DEBUG
4020	}	4098	}
4021		4099
4022	template <class _RandomAccessIterator>	4100	template <class _RandomAccessIterator>
...	@@ -4111,7 +4189,8 @@ __lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va	...	@@ -4111,7 +4189,8 @@ __lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
4111	}	4189	}
4112		4190
4113	template <class _ForwardIterator, class _Tp, class _Compare>	4191	template <class _ForwardIterator, class _Tp, class _Compare>
4114	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4192	_LIBCPP_NODISCARD_EXT inline
		4193	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4115	_ForwardIterator	4194	_ForwardIterator
4116	lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)	4195	lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
4117	{	4196	{
...	@@ -4120,7 +4199,8 @@ lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu	...	@@ -4120,7 +4199,8 @@ lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu
4120	}	4199	}
4121		4200
4122	template <class _ForwardIterator, class _Tp>	4201	template <class _ForwardIterator, class _Tp>
4123	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4202	_LIBCPP_NODISCARD_EXT inline
		4203	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4124	_ForwardIterator	4204	_ForwardIterator
4125	lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	4205	lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
4126	{	4206	{
...	@@ -4153,7 +4233,8 @@ __upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va	...	@@ -4153,7 +4233,8 @@ __upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
4153	}	4233	}
4154		4234
4155	template <class _ForwardIterator, class _Tp, class _Compare>	4235	template <class _ForwardIterator, class _Tp, class _Compare>
4156	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4236	_LIBCPP_NODISCARD_EXT inline
		4237	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4157	_ForwardIterator	4238	_ForwardIterator
4158	upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)	4239	upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
4159	{	4240	{
...	@@ -4162,7 +4243,8 @@ upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu	...	@@ -4162,7 +4243,8 @@ upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu
4162	}	4243	}
4163		4244
4164	template <class _ForwardIterator, class _Tp>	4245	template <class _ForwardIterator, class _Tp>
4165	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4246	_LIBCPP_NODISCARD_EXT inline
		4247	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4166	_ForwardIterator	4248	_ForwardIterator
4167	upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	4249	upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
4168	{	4250	{
...	@@ -4207,22 +4289,18 @@ __equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va	...	@@ -4207,22 +4289,18 @@ __equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
4207	}	4289	}
4208		4290
4209	template <class _ForwardIterator, class _Tp, class _Compare>	4291	template <class _ForwardIterator, class _Tp, class _Compare>
4210	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4292	_LIBCPP_NODISCARD_EXT inline
		4293	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4211	pair<_ForwardIterator, _ForwardIterator>	4294	pair<_ForwardIterator, _ForwardIterator>
4212	equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)	4295	equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
4213	{	4296	{
4214	#ifdef _LIBCPP_DEBUG	4297	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4215	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4216	__debug_less<_Compare> __c(__comp);
4217	return __equal_range<_Comp_ref>(__first, __last, __value_, __c);
4218	#else // _LIBCPP_DEBUG
4219	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4220	return __equal_range<_Comp_ref>(__first, __last, __value_, __comp);	4298	return __equal_range<_Comp_ref>(__first, __last, __value_, __comp);
4221	#endif // _LIBCPP_DEBUG
4222	}	4299	}
4223		4300
4224	template <class _ForwardIterator, class _Tp>	4301	template <class _ForwardIterator, class _Tp>
4225	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4302	_LIBCPP_NODISCARD_EXT inline
		4303	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4226	pair<_ForwardIterator, _ForwardIterator>	4304	pair<_ForwardIterator, _ForwardIterator>
4227	equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	4305	equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
4228	{	4306	{
...	@@ -4242,22 +4320,18 @@ __binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __	...	@@ -4242,22 +4320,18 @@ __binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __
4242	}	4320	}
4243		4321
4244	template <class _ForwardIterator, class _Tp, class _Compare>	4322	template <class _ForwardIterator, class _Tp, class _Compare>
4245	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4323	_LIBCPP_NODISCARD_EXT inline
		4324	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4246	bool	4325	bool
4247	binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)	4326	binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
4248	{	4327	{
4249	#ifdef _LIBCPP_DEBUG	4328	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4250	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4251	__debug_less<_Compare> __c(__comp);
4252	return __binary_search<_Comp_ref>(__first, __last, __value_, __c);
4253	#else // _LIBCPP_DEBUG
4254	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4255	return __binary_search<_Comp_ref>(__first, __last, __value_, __comp);	4329	return __binary_search<_Comp_ref>(__first, __last, __value_, __comp);
4256	#endif // _LIBCPP_DEBUG
4257	}	4330	}
4258		4331
4259	template <class _ForwardIterator, class _Tp>	4332	template <class _ForwardIterator, class _Tp>
4260	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4333	_LIBCPP_NODISCARD_EXT inline
		4334	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4261	bool	4335	bool
4262	binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)	4336	binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
4263	{	4337	{
...	@@ -4296,14 +4370,8 @@ _OutputIterator	...	@@ -4296,14 +4370,8 @@ _OutputIterator
4296	merge(_InputIterator1 __first1, _InputIterator1 __last1,	4370	merge(_InputIterator1 __first1, _InputIterator1 __last1,
4297	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)	4371	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
4298	{	4372	{
4299	#ifdef _LIBCPP_DEBUG	4373	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4300	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4301	__debug_less<_Compare> __c(__comp);
4302	return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
4303	#else // _LIBCPP_DEBUG
4304	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4305	return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);	4374	return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
4306	#endif // _LIBCPP_DEBUG
4307	}	4375	}
4308		4376
4309	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	4377	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -4478,17 +4546,9 @@ inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _	...	@@ -4478,17 +4546,9 @@ inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _
4478	difference_type __buf_size = _VSTD::min(__len1, __len2);	4546	difference_type __buf_size = _VSTD::min(__len1, __len2);
4479	pair<value_type*, ptrdiff_t> __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size);	4547	pair<value_type*, ptrdiff_t> __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size);
4480	unique_ptr<value_type, __return_temporary_buffer> __h(__buf.first);	4548	unique_ptr<value_type, __return_temporary_buffer> __h(__buf.first);
4481		4549	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4482	#ifdef _LIBCPP_DEBUG
4483	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4484	__debug_less<_Compare> __c(__comp);
4485	return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __c, __len1, __len2,
4486	__buf.first, __buf.second);
4487	#else // _LIBCPP_DEBUG
4488	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4489	return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __comp, __len1, __len2,	4550	return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __comp, __len1, __len2,
4490	__buf.first, __buf.second);	4551	__buf.first, __buf.second);
4491	#endif // _LIBCPP_DEBUG
4492	}	4552	}
4493		4553
4494	template <class _BidirectionalIterator>	4554	template <class _BidirectionalIterator>
...	@@ -4690,14 +4750,8 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compar	...	@@ -4690,14 +4750,8 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compar
4690	__buf = _VSTD::get_temporary_buffer<value_type>(__len);	4750	__buf = _VSTD::get_temporary_buffer<value_type>(__len);
4691	__h.reset(__buf.first);	4751	__h.reset(__buf.first);
4692	}	4752	}
4693	#ifdef _LIBCPP_DEBUG	4753	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4694	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4695	__debug_less<_Compare> __c(__comp);
4696	__stable_sort<_Comp_ref>(__first, __last, __c, __len, __buf.first, __buf.second);
4697	#else // _LIBCPP_DEBUG
4698	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4699	__stable_sort<_Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second);	4754	__stable_sort<_Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second);
4700	#endif // _LIBCPP_DEBUG
4701	}	4755	}
4702		4756
4703	template <class _RandomAccessIterator>	4757	template <class _RandomAccessIterator>
...	@@ -4711,7 +4765,7 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)	...	@@ -4711,7 +4765,7 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
4711	// is_heap_until	4765	// is_heap_until
4712		4766
4713	template <class _RandomAccessIterator, class _Compare>	4767	template <class _RandomAccessIterator, class _Compare>
4714	_LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator	4768	_LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_AFTER_CXX17 _RandomAccessIterator
4715	is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4769	is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4716	{	4770	{
4717	typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::difference_type difference_type;	4771	typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
...	@@ -4738,7 +4792,8 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp	...	@@ -4738,7 +4792,8 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Comp
4738	}	4792	}
4739		4793
4740	template<class _RandomAccessIterator>	4794	template<class _RandomAccessIterator>
4741	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4795	_LIBCPP_NODISCARD_EXT inline
		4796	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4742	_RandomAccessIterator	4797	_RandomAccessIterator
4743	is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)	4798	is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
4744	{	4799	{
...	@@ -4748,7 +4803,8 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)	...	@@ -4748,7 +4803,8 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
4748	// is_heap	4803	// is_heap
4749		4804
4750	template <class _RandomAccessIterator, class _Compare>	4805	template <class _RandomAccessIterator, class _Compare>
4751	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4806	_LIBCPP_NODISCARD_EXT inline
		4807	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4752	bool	4808	bool
4753	is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4809	is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4754	{	4810	{
...	@@ -4756,7 +4812,8 @@ is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __	...	@@ -4756,7 +4812,8 @@ is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __
4756	}	4812	}
4757		4813
4758	template<class _RandomAccessIterator>	4814	template<class _RandomAccessIterator>
4759	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	4815	_LIBCPP_NODISCARD_EXT inline
		4816	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4760	bool	4817	bool
4761	is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)	4818	is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
4762	{	4819	{
...	@@ -4797,14 +4854,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -4797,14 +4854,8 @@ inline _LIBCPP_INLINE_VISIBILITY
4797	void	4854	void
4798	push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4855	push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4799	{	4856	{
4800	#ifdef _LIBCPP_DEBUG	4857	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4801	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4802	__debug_less<_Compare> __c(__comp);
4803	__sift_up<_Comp_ref>(__first, __last, __c, __last - __first);
4804	#else // _LIBCPP_DEBUG
4805	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4806	__sift_up<_Comp_ref>(__first, __last, __comp, __last - __first);	4858	__sift_up<_Comp_ref>(__first, __last, __comp, __last - __first);
4807	#endif // _LIBCPP_DEBUG
4808	}	4859	}
4809		4860
4810	template <class _RandomAccessIterator>	4861	template <class _RandomAccessIterator>
...	@@ -4890,14 +4941,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -4890,14 +4941,8 @@ inline _LIBCPP_INLINE_VISIBILITY
4890	void	4941	void
4891	pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4942	pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4892	{	4943	{
4893	#ifdef _LIBCPP_DEBUG	4944	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4894	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4895	__debug_less<_Compare> __c(__comp);
4896	__pop_heap<_Comp_ref>(__first, __last, __c, __last - __first);
4897	#else // _LIBCPP_DEBUG
4898	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4899	__pop_heap<_Comp_ref>(__first, __last, __comp, __last - __first);	4945	__pop_heap<_Comp_ref>(__first, __last, __comp, __last - __first);
4900	#endif // _LIBCPP_DEBUG
4901	}	4946	}
4902		4947
4903	template <class _RandomAccessIterator>	4948	template <class _RandomAccessIterator>
...	@@ -4931,14 +4976,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -4931,14 +4976,8 @@ inline _LIBCPP_INLINE_VISIBILITY
4931	void	4976	void
4932	make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	4977	make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4933	{	4978	{
4934	#ifdef _LIBCPP_DEBUG	4979	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4935	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4936	__debug_less<_Compare> __c(__comp);
4937	__make_heap<_Comp_ref>(__first, __last, __c);
4938	#else // _LIBCPP_DEBUG
4939	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4940	__make_heap<_Comp_ref>(__first, __last, __comp);	4980	__make_heap<_Comp_ref>(__first, __last, __comp);
4941	#endif // _LIBCPP_DEBUG
4942	}	4981	}
4943		4982
4944	template <class _RandomAccessIterator>	4983	template <class _RandomAccessIterator>
...	@@ -4965,14 +5004,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -4965,14 +5004,8 @@ inline _LIBCPP_INLINE_VISIBILITY
4965	void	5004	void
4966	sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)	5005	sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
4967	{	5006	{
4968	#ifdef _LIBCPP_DEBUG	5007	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
4969	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
4970	__debug_less<_Compare> __c(__comp);
4971	__sort_heap<_Comp_ref>(__first, __last, __c);
4972	#else // _LIBCPP_DEBUG
4973	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
4974	__sort_heap<_Comp_ref>(__first, __last, __comp);	5008	__sort_heap<_Comp_ref>(__first, __last, __comp);
4975	#endif // _LIBCPP_DEBUG
4976	}	5009	}
4977		5010
4978	template <class _RandomAccessIterator>	5011	template <class _RandomAccessIterator>
...	@@ -5009,14 +5042,8 @@ void	...	@@ -5009,14 +5042,8 @@ void
5009	partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,	5042	partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
5010	_Compare __comp)	5043	_Compare __comp)
5011	{	5044	{
5012	#ifdef _LIBCPP_DEBUG	5045	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5013	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5014	__debug_less<_Compare> __c(__comp);
5015	__partial_sort<_Comp_ref>(__first, __middle, __last, __c);
5016	#else // _LIBCPP_DEBUG
5017	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5018	__partial_sort<_Comp_ref>(__first, __middle, __last, __comp);	5046	__partial_sort<_Comp_ref>(__first, __middle, __last, __comp);
5019	#endif // _LIBCPP_DEBUG
5020	}	5047	}
5021		5048
5022	template <class _RandomAccessIterator>	5049	template <class _RandomAccessIterator>
...	@@ -5059,14 +5086,8 @@ _RandomAccessIterator	...	@@ -5059,14 +5086,8 @@ _RandomAccessIterator
5059	partial_sort_copy(_InputIterator __first, _InputIterator __last,	5086	partial_sort_copy(_InputIterator __first, _InputIterator __last,
5060	_RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)	5087	_RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
5061	{	5088	{
5062	#ifdef _LIBCPP_DEBUG	5089	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5063	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5064	__debug_less<_Compare> __c(__comp);
5065	return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __c);
5066	#else // _LIBCPP_DEBUG
5067	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5068	return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __comp);	5090	return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __comp);
5069	#endif // _LIBCPP_DEBUG
5070	}	5091	}
5071		5092
5072	template <class _InputIterator, class _RandomAccessIterator>	5093	template <class _InputIterator, class _RandomAccessIterator>
...	@@ -5273,14 +5294,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -5273,14 +5294,8 @@ inline _LIBCPP_INLINE_VISIBILITY
5273	void	5294	void
5274	nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)	5295	nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)
5275	{	5296	{
5276	#ifdef _LIBCPP_DEBUG	5297	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5277	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5278	__debug_less<_Compare> __c(__comp);
5279	__nth_element<_Comp_ref>(__first, __nth, __last, __c);
5280	#else // _LIBCPP_DEBUG
5281	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5282	__nth_element<_Comp_ref>(__first, __nth, __last, __comp);	5298	__nth_element<_Comp_ref>(__first, __nth, __last, __comp);
5283	#endif // _LIBCPP_DEBUG
5284	}	5299	}
5285		5300
5286	template <class _RandomAccessIterator>	5301	template <class _RandomAccessIterator>
...	@@ -5309,23 +5324,19 @@ __includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __	...	@@ -5309,23 +5324,19 @@ __includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __
5309	}	5324	}
5310		5325
5311	template <class _InputIterator1, class _InputIterator2, class _Compare>	5326	template <class _InputIterator1, class _InputIterator2, class _Compare>
5312	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	5327	_LIBCPP_NODISCARD_EXT inline
		5328	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
5313	bool	5329	bool
5314	includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,	5330	includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
5315	_Compare __comp)	5331	_Compare __comp)
5316	{	5332	{
5317	#ifdef _LIBCPP_DEBUG	5333	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5318	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5319	__debug_less<_Compare> __c(__comp);
5320	return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
5321	#else // _LIBCPP_DEBUG
5322	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5323	return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);	5334	return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
5324	#endif // _LIBCPP_DEBUG
5325	}	5335	}
5326		5336
5327	template <class _InputIterator1, class _InputIterator2>	5337	template <class _InputIterator1, class _InputIterator2>
5328	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	5338	_LIBCPP_NODISCARD_EXT inline
		5339	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
5329	bool	5340	bool
5330	includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2)	5341	includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2)
5331	{	5342	{
...	@@ -5367,14 +5378,8 @@ _OutputIterator	...	@@ -5367,14 +5378,8 @@ _OutputIterator
5367	set_union(_InputIterator1 __first1, _InputIterator1 __last1,	5378	set_union(_InputIterator1 __first1, _InputIterator1 __last1,
5368	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)	5379	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
5369	{	5380	{
5370	#ifdef _LIBCPP_DEBUG	5381	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5371	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5372	__debug_less<_Compare> __c(__comp);
5373	return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
5374	#else // _LIBCPP_DEBUG
5375	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5376	return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);	5382	return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
5377	#endif // _LIBCPP_DEBUG
5378	}	5383	}
5379		5384
5380	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	5385	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -5419,14 +5424,8 @@ _OutputIterator	...	@@ -5419,14 +5424,8 @@ _OutputIterator
5419	set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,	5424	set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
5420	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)	5425	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
5421	{	5426	{
5422	#ifdef _LIBCPP_DEBUG	5427	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5423	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5424	__debug_less<_Compare> __c(__comp);
5425	return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
5426	#else // _LIBCPP_DEBUG
5427	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5428	return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);	5428	return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
5429	#endif // _LIBCPP_DEBUG
5430	}	5429	}
5431		5430
5432	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	5431	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -5473,14 +5472,8 @@ _OutputIterator	...	@@ -5473,14 +5472,8 @@ _OutputIterator
5473	set_difference(_InputIterator1 __first1, _InputIterator1 __last1,	5472	set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
5474	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)	5473	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
5475	{	5474	{
5476	#ifdef _LIBCPP_DEBUG	5475	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5477	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5478	__debug_less<_Compare> __c(__comp);
5479	return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
5480	#else // _LIBCPP_DEBUG
5481	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5482	return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);	5476	return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
5483	#endif // _LIBCPP_DEBUG
5484	}	5477	}
5485		5478
5486	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	5479	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -5532,14 +5525,8 @@ _OutputIterator	...	@@ -5532,14 +5525,8 @@ _OutputIterator
5532	set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,	5525	set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
5533	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)	5526	_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
5534	{	5527	{
5535	#ifdef _LIBCPP_DEBUG	5528	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5536	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5537	__debug_less<_Compare> __c(__comp);
5538	return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
5539	#else // _LIBCPP_DEBUG
5540	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5541	return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);	5529	return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
5542	#endif // _LIBCPP_DEBUG
5543	}	5530	}
5544		5531
5545	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	5532	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -5571,23 +5558,19 @@ __lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,	...	@@ -5571,23 +5558,19 @@ __lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
5571	}	5558	}
5572		5559
5573	template <class _InputIterator1, class _InputIterator2, class _Compare>	5560	template <class _InputIterator1, class _InputIterator2, class _Compare>
5574	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	5561	_LIBCPP_NODISCARD_EXT inline
		5562	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
5575	bool	5563	bool
5576	lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,	5564	lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
5577	_InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)	5565	_InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
5578	{	5566	{
5579	#ifdef _LIBCPP_DEBUG	5567	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5580	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5581	__debug_less<_Compare> __c(__comp);
5582	return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
5583	#else // _LIBCPP_DEBUG
5584	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5585	return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);	5568	return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
5586	#endif // _LIBCPP_DEBUG
5587	}	5569	}
5588		5570
5589	template <class _InputIterator1, class _InputIterator2>	5571	template <class _InputIterator1, class _InputIterator2>
5590	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17	5572	_LIBCPP_NODISCARD_EXT inline
		5573	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
5591	bool	5574	bool
5592	lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,	5575	lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
5593	_InputIterator2 __first2, _InputIterator2 __last2)	5576	_InputIterator2 __first2, _InputIterator2 __last2)
...	@@ -5631,14 +5614,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -5631,14 +5614,8 @@ inline _LIBCPP_INLINE_VISIBILITY
5631	bool	5614	bool
5632	next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)	5615	next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
5633	{	5616	{
5634	#ifdef _LIBCPP_DEBUG	5617	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5635	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5636	__debug_less<_Compare> __c(__comp);
5637	return __next_permutation<_Comp_ref>(__first, __last, __c);
5638	#else // _LIBCPP_DEBUG
5639	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5640	return __next_permutation<_Comp_ref>(__first, __last, __comp);	5618	return __next_permutation<_Comp_ref>(__first, __last, __comp);
5641	#endif // _LIBCPP_DEBUG
5642	}	5619	}
5643		5620
5644	template <class _BidirectionalIterator>	5621	template <class _BidirectionalIterator>
...	@@ -5684,14 +5661,8 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -5684,14 +5661,8 @@ inline _LIBCPP_INLINE_VISIBILITY
5684	bool	5661	bool
5685	prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)	5662	prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
5686	{	5663	{
5687	#ifdef _LIBCPP_DEBUG	5664	typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
5688	typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
5689	__debug_less<_Compare> __c(__comp);
5690	return __prev_permutation<_Comp_ref>(__first, __last, __c);
5691	#else // _LIBCPP_DEBUG
5692	typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
5693	return __prev_permutation<_Comp_ref>(__first, __last, __comp);	5665	return __prev_permutation<_Comp_ref>(__first, __last, __comp);
5694	#endif // _LIBCPP_DEBUG
5695	}	5666	}
5696		5667
5697	template <class _BidirectionalIterator>	5668	template <class _BidirectionalIterator>

lib/libcxx/include/any+4-5

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------ any -----------------------------------===//	2	//===------------------------------ any -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -508,7 +507,7 @@ any::any(_ValueType && __v) : __h(nullptr)	...	@@ -508,7 +507,7 @@ any::any(_ValueType && __v) : __h(nullptr)
508	template <class _ValueType, class ..._Args, class _Tp, class>	507	template <class _ValueType, class ..._Args, class _Tp, class>
509	any::any(in_place_type_t<_ValueType>, _Args&&... __args) {	508	any::any(in_place_type_t<_ValueType>, _Args&&... __args) {
510	__any_imp::_Handler<_Tp>::__create(*this, _VSTD::forward<_Args>(__args)...);	509	__any_imp::_Handler<_Tp>::__create(*this, _VSTD::forward<_Args>(__args)...);
511	};	510	}
512		511
513	template <class _ValueType, class _Up, class ..._Args, class _Tp, class>	512	template <class _ValueType, class _Up, class ..._Args, class _Tp, class>
514	any::any(in_place_type_t<_ValueType>, initializer_list<_Up> __il, _Args&&... __args) {	513	any::any(in_place_type_t<_ValueType>, initializer_list<_Up> __il, _Args&&... __args) {

lib/libcxx/include/array+17-19

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- array -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -92,7 +91,7 @@ template <class T, size_t N >
   void swap(array<T,N>& x, array<T,N>& y) noexcept(noexcept(x.swap(y))); // C++17
 template <class T> struct tuple_size;
-template <size_t I, class T> class tuple_element;
+template <size_t I, class T> struct tuple_element;
 template <class T, size_t N> struct tuple_size<array<T, N>>;
 template <size_t I, class T, size_t N> struct tuple_element<I, array<T, N>>;
 template <size_t I, class T, size_t N> T& get(array<T, N>&) noexcept; // constexpr in C++14
 @@ -191,17 +190,17 @@ struct _LIBCPP_TEMPLATE_VIS array
     // element access:
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
-    reference operator[](size_type __n)             {return __elems_[__n];}
+    reference operator[](size_type __n)             _NOEXCEPT {return __elems_[__n];}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const_reference operator[](size_type __n) const {return __elems_[__n];}
+    const_reference operator[](size_type __n) const _NOEXCEPT {return __elems_[__n];}
     _LIBCPP_CONSTEXPR_AFTER_CXX14       reference at(size_type __n);
     _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference at(size_type __n) const;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference front()             {return __elems_[0];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference front()             _NOEXCEPT {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference front() const {return __elems_[0];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference front() const _NOEXCEPT {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference back()              {return __elems_[_Size - 1];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 reference back()              _NOEXCEPT {return __elems_[_Size - 1];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference back() const  {return __elems_[_Size - 1];}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference back() const  _NOEXCEPT {return __elems_[_Size - 1];}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
     value_type* data() _NOEXCEPT {return __elems_;}
 @@ -304,13 +303,13 @@ struct _LIBCPP_TEMPLATE_VIS array<_Tp, 0>
     // element access:
     _LIBCPP_INLINE_VISIBILITY
-    reference operator[](size_type) {
+    reference operator[](size_type) _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::operator[] on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const_reference operator[](size_type) const {
+    const_reference operator[](size_type) const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::operator[] on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
 @@ -328,25 +327,25 @@ struct _LIBCPP_TEMPLATE_VIS array<_Tp, 0>
     }
     _LIBCPP_INLINE_VISIBILITY
-    reference front() {
+    reference front() _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::front() on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
     _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const {
+    const_reference front() const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::front() on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
     _LIBCPP_INLINE_VISIBILITY
-    reference back() {
+    reference back() _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::back() on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
     _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const {
+    const_reference back() const _NOEXCEPT {
       _LIBCPP_ASSERT(false, "cannot call array<T, 0>::back() on a zero-sized array");
       _LIBCPP_UNREACHABLE();
     }
 @@ -434,10 +433,9 @@ struct _LIBCPP_TEMPLATE_VIS tuple_size<array<_Tp, _Size> >
     : public integral_constant<size_t, _Size> {};
 template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, array<_Tp, _Size> >
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, array<_Tp, _Size> >
 {
     static_assert(_Ip < _Size, "Index out of bounds in std::tuple_element<> (std::array)");
-public:
     typedef _Tp type;
 };

lib/libcxx/include/atomic+811-257

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- atomic -----------------------------------===//	2	//===--------------------------- atomic -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -21,17 +20,24 @@ namespace std	...	@@ -21,17 +20,24 @@ namespace std
21		20
22	#define __cpp_lib_atomic_is_always_lock_free // as specified by SG10	21	#define __cpp_lib_atomic_is_always_lock_free // as specified by SG10
23		22
24	// order and consistency	23	// order and consistency
25		24
26	typedef enum memory_order	25	enum memory_order: unspecified // enum class in C++20
27	{	26	{
28	memory_order_relaxed,	27	relaxed,
29	memory_order_consume, // load-consume	28	consume, // load-consume
30	memory_order_acquire, // load-acquire	29	acquire, // load-acquire
31	memory_order_release, // store-release	30	release, // store-release
32	memory_order_acq_rel, // store-release load-acquire	31	acq_rel, // store-release load-acquire
33	memory_order_seq_cst // store-release load-acquire	32	seq_cst // store-release load-acquire
34	} memory_order;	33	};
		34
		35	inline constexpr auto memory_order_relaxed = memory_order::relaxed;
		36	inline constexpr auto memory_order_consume = memory_order::consume;
		37	inline constexpr auto memory_order_acquire = memory_order::acquire;
		38	inline constexpr auto memory_order_release = memory_order::release;
		39	inline constexpr auto memory_order_acq_rel = memory_order::acq_rel;
		40	inline constexpr auto memory_order_seq_cst = memory_order::seq_cst;
35		41
36	template <class T> T kill_dependency(T y) noexcept;	42	template <class T> T kill_dependency(T y) noexcept;
37		43
...	@@ -551,13 +557,13 @@ void atomic_signal_fence(memory_order m) noexcept;	...	@@ -551,13 +557,13 @@ void atomic_signal_fence(memory_order m) noexcept;
551	#endif	557	#endif
552		558
553	#ifdef _LIBCPP_HAS_NO_THREADS	559	#ifdef _LIBCPP_HAS_NO_THREADS
554	#error <atomic> is not supported on this single threaded system	560	# error <atomic> is not supported on this single threaded system
555	#endif	561	#endif
556	#if !defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP)	562	#ifdef _LIBCPP_HAS_NO_ATOMIC_HEADER
557	#error <atomic> is not implemented	563	# error <atomic> is not implemented
558	#endif	564	#endif
559	#ifdef kill_dependency	565	#ifdef kill_dependency
560	#error C++ standard library is incompatible with <stdatomic.h>	566	# error C++ standard library is incompatible with <stdatomic.h>
561	#endif	567	#endif
562		568
563	#define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \	569	#define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \
...	@@ -578,49 +584,94 @@ void atomic_signal_fence(memory_order m) noexcept;	...	@@ -578,49 +584,94 @@ void atomic_signal_fence(memory_order m) noexcept;
578		584
579	_LIBCPP_BEGIN_NAMESPACE_STD	585	_LIBCPP_BEGIN_NAMESPACE_STD
580		586
581	typedef enum memory_order	587	// Figure out what the underlying type for `memory_order` would be if it were
582	{	588	// declared as an unscoped enum (accounting for -fshort-enums). Use this result
583	memory_order_relaxed, memory_order_consume, memory_order_acquire,	589	// to pin the underlying type in C++20.
584	memory_order_release, memory_order_acq_rel, memory_order_seq_cst	590	enum __legacy_memory_order {
		591	__mo_relaxed,
		592	__mo_consume,
		593	__mo_acquire,
		594	__mo_release,
		595	__mo_acq_rel,
		596	__mo_seq_cst
		597	};
		598
		599	typedef underlying_type<__legacy_memory_order>::type __memory_order_underlying_t;
		600
		601	#if _LIBCPP_STD_VER > 17
		602
		603	enum class memory_order : __memory_order_underlying_t {
		604	relaxed = __mo_relaxed,
		605	consume = __mo_consume,
		606	acquire = __mo_acquire,
		607	release = __mo_release,
		608	acq_rel = __mo_acq_rel,
		609	seq_cst = __mo_seq_cst
		610	};
		611
		612	inline constexpr auto memory_order_relaxed = memory_order::relaxed;
		613	inline constexpr auto memory_order_consume = memory_order::consume;
		614	inline constexpr auto memory_order_acquire = memory_order::acquire;
		615	inline constexpr auto memory_order_release = memory_order::release;
		616	inline constexpr auto memory_order_acq_rel = memory_order::acq_rel;
		617	inline constexpr auto memory_order_seq_cst = memory_order::seq_cst;
		618
		619	#else
		620
		621	typedef enum memory_order {
		622	memory_order_relaxed = __mo_relaxed,
		623	memory_order_consume = __mo_consume,
		624	memory_order_acquire = __mo_acquire,
		625	memory_order_release = __mo_release,
		626	memory_order_acq_rel = __mo_acq_rel,
		627	memory_order_seq_cst = __mo_seq_cst,
585	} memory_order;	628	} memory_order;
586		629
587	#if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP)	630	#endif // _LIBCPP_STD_VER > 17
588	namespace __gcc_atomic {	631
589	template <typename _Tp>	632	static_assert((is_same<underlying_type<memory_order>::type, __memory_order_underlying_t>::value),
590	struct __gcc_atomic_t {	633	"unexpected underlying type for std::memory_order");
		634
		635	#if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) \|\| \
		636	defined(_LIBCPP_ATOMIC_ONLY_USE_BUILTINS)
		637
		638	// [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because
		639	// the default operator= in an object is not volatile, a byte-by-byte copy
		640	// is required.
		641	template <typename _Tp, typename _Tv> _LIBCPP_INLINE_VISIBILITY
		642	typename enable_if<is_assignable<_Tp&, _Tv>::value>::type
		643	__cxx_atomic_assign_volatile(_Tp& __a_value, _Tv const& __val) {
		644	__a_value = __val;
		645	}
		646	template <typename _Tp, typename _Tv> _LIBCPP_INLINE_VISIBILITY
		647	typename enable_if<is_assignable<_Tp&, _Tv>::value>::type
		648	__cxx_atomic_assign_volatile(_Tp volatile& __a_value, _Tv volatile const& __val) {
		649	volatile char* __to = reinterpret_cast<volatile char*>(&__a_value);
		650	volatile char* __end = __to + sizeof(_Tp);
		651	volatile const char* __from = reinterpret_cast<volatile const char*>(&__val);
		652	while (__to != __end)
		653	__to++ = __from++;
		654	}
591		655
592	#if _GNUC_VER >= 501
593	static_assert(is_trivially_copyable<_Tp>::value,
594	"std::atomic<Tp> requires that 'Tp' be a trivially copyable type");
595	#endif	656	#endif
596		657
		658	#if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP)
		659
		660	template <typename _Tp>
		661	struct __cxx_atomic_base_impl {
		662
597	_LIBCPP_INLINE_VISIBILITY	663	_LIBCPP_INLINE_VISIBILITY
598	#ifndef _LIBCPP_CXX03_LANG	664	#ifndef _LIBCPP_CXX03_LANG
599	__gcc_atomic_t() _NOEXCEPT = default;	665	__cxx_atomic_base_impl() _NOEXCEPT = default;
600	#else	666	#else
601	__gcc_atomic_t() _NOEXCEPT : __a_value() {}	667	__cxx_atomic_base_impl() _NOEXCEPT : __a_value() {}
602	#endif // _LIBCPP_CXX03_LANG	668	#endif // _LIBCPP_CXX03_LANG
603	_LIBCPP_CONSTEXPR explicit __gcc_atomic_t(_Tp value) _NOEXCEPT	669	_LIBCPP_CONSTEXPR explicit __cxx_atomic_base_impl(_Tp value) _NOEXCEPT
604	: __a_value(value) {}	670	: __a_value(value) {}
605	_Tp __a_value;	671	_Tp __a_value;
606	};	672	};
607	#define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x>
608
609	template <typename _Tp> _Tp __create();
610
611	template <typename _Tp, typename _Td>
612	typename enable_if<sizeof(_Tp()->__a_value = __create<_Td>()), char>::type
613	__test_atomic_assignable(int);
614	template <typename _Tp, typename _Up>
615	__two __test_atomic_assignable(...);
616
617	template <typename _Tp, typename _Td>
618	struct __can_assign {
619	static const bool value =
620	sizeof(__test_atomic_assignable<_Tp, _Td>(1)) == sizeof(char);
621	};
622		673
623	static inline _LIBCPP_CONSTEXPR int __to_gcc_order(memory_order __order) {	674	_LIBCPP_INLINE_VISIBILITY inline _LIBCPP_CONSTEXPR int __to_gcc_order(memory_order __order) {
624	// Avoid switch statement to make this a constexpr.	675	// Avoid switch statement to make this a constexpr.
625	return __order == memory_order_relaxed ? __ATOMIC_RELAXED:	676	return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
626	(__order == memory_order_acquire ? __ATOMIC_ACQUIRE:	677	(__order == memory_order_acquire ? __ATOMIC_ACQUIRE:
...	@@ -630,7 +681,7 @@ static inline _LIBCPP_CONSTEXPR int __to_gcc_order(memory_order __order) {	...	@@ -630,7 +681,7 @@ static inline _LIBCPP_CONSTEXPR int __to_gcc_order(memory_order __order) {
630	__ATOMIC_CONSUME))));	681	__ATOMIC_CONSUME))));
631	}	682	}
632		683
633	static inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory_order __order) {	684	_LIBCPP_INLINE_VISIBILITY inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory_order __order) {
634	// Avoid switch statement to make this a constexpr.	685	// Avoid switch statement to make this a constexpr.
635	return __order == memory_order_relaxed ? __ATOMIC_RELAXED:	686	return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
636	(__order == memory_order_acquire ? __ATOMIC_ACQUIRE:	687	(__order == memory_order_acquire ? __ATOMIC_ACQUIRE:
...	@@ -640,133 +691,125 @@ static inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory_order __order)	...	@@ -640,133 +691,125 @@ static inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory_order __order)
640	__ATOMIC_CONSUME))));	691	__ATOMIC_CONSUME))));
641	}	692	}
642		693
643	} // namespace __gcc_atomic
644
645	template <typename _Tp>
646	static inline
647	typename enable_if<
648	__gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value>::type
649	__c11_atomic_init(volatile _Atomic(_Tp)* __a, _Tp __val) {
650	__a->__a_value = __val;
651	}
652
653	template <typename _Tp>	694	template <typename _Tp>
654	static inline	695	_LIBCPP_INLINE_VISIBILITY
655	typename enable_if<	696	void __cxx_atomic_init(volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp __val) {
656	!__gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value &&	697	__cxx_atomic_assign_volatile(__a->__a_value, __val);
657	__gcc_atomic::__can_assign< _Atomic(_Tp)*, _Tp>::value>::type
658	__c11_atomic_init(volatile _Atomic(_Tp)* __a, _Tp __val) {
659	// [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because
660	// the default operator= in an object is not volatile, a byte-by-byte copy
661	// is required.
662	volatile char* to = reinterpret_cast<volatile char*>(&__a->__a_value);
663	volatile char* end = to + sizeof(_Tp);
664	char* from = reinterpret_cast<char*>(&__val);
665	while (to != end) {
666	to++ = from++;
667	}
668	}	698	}
669		699
670	template <typename _Tp>	700	template <typename _Tp>
671	static inline void __c11_atomic_init(_Atomic(_Tp)* __a, _Tp __val) {	701	_LIBCPP_INLINE_VISIBILITY
		702	void __cxx_atomic_init(__cxx_atomic_base_impl<_Tp>* __a, _Tp __val) {
672	__a->__a_value = __val;	703	__a->__a_value = __val;
673	}	704	}
674		705
675	static inline void __c11_atomic_thread_fence(memory_order __order) {	706	_LIBCPP_INLINE_VISIBILITY inline
676	__atomic_thread_fence(__gcc_atomic::__to_gcc_order(__order));	707	void __cxx_atomic_thread_fence(memory_order __order) {
		708	__atomic_thread_fence(__to_gcc_order(__order));
677	}	709	}
678		710
679	static inline void __c11_atomic_signal_fence(memory_order __order) {	711	_LIBCPP_INLINE_VISIBILITY inline
680	__atomic_signal_fence(__gcc_atomic::__to_gcc_order(__order));	712	void __cxx_atomic_signal_fence(memory_order __order) {
		713	__atomic_signal_fence(__to_gcc_order(__order));
681	}	714	}
682		715
683	template <typename _Tp>	716	template <typename _Tp>
684	static inline void __c11_atomic_store(volatile _Atomic(_Tp)* __a, _Tp __val,	717	_LIBCPP_INLINE_VISIBILITY
685	memory_order __order) {	718	void __cxx_atomic_store(volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp __val,
686	return __atomic_store(&__a->__a_value, &__val,	719	memory_order __order) {
687	__gcc_atomic::__to_gcc_order(__order));	720	__atomic_store(&__a->__a_value, &__val,
		721	__to_gcc_order(__order));
688	}	722	}
689		723
690	template <typename _Tp>	724	template <typename _Tp>
691	static inline void __c11_atomic_store(_Atomic(_Tp)* __a, _Tp __val,	725	_LIBCPP_INLINE_VISIBILITY
692	memory_order __order) {	726	void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp>* __a, _Tp __val,
		727	memory_order __order) {
693	__atomic_store(&__a->__a_value, &__val,	728	__atomic_store(&__a->__a_value, &__val,
694	__gcc_atomic::__to_gcc_order(__order));	729	__to_gcc_order(__order));
695	}	730	}
696		731
697	template <typename _Tp>	732	template <typename _Tp>
698	static inline _Tp __c11_atomic_load(const volatile _Atomic(_Tp)* __a,	733	_LIBCPP_INLINE_VISIBILITY
699	memory_order __order) {	734	_Tp __cxx_atomic_load(const volatile __cxx_atomic_base_impl<_Tp>* __a,
		735	memory_order __order) {
700	_Tp __ret;	736	_Tp __ret;
701	__atomic_load(&__a->__a_value, &__ret,	737	__atomic_load(&__a->__a_value, &__ret,
702	__gcc_atomic::__to_gcc_order(__order));	738	__to_gcc_order(__order));
703	return __ret;	739	return __ret;
704	}	740	}
705		741
706	template <typename _Tp>	742	template <typename _Tp>
707	static inline _Tp __c11_atomic_load(const _Atomic(_Tp)* __a, memory_order __order) {	743	_LIBCPP_INLINE_VISIBILITY
		744	_Tp __cxx_atomic_load(const __cxx_atomic_base_impl<_Tp>* __a, memory_order __order) {
708	_Tp __ret;	745	_Tp __ret;
709	__atomic_load(&__a->__a_value, &__ret,	746	__atomic_load(&__a->__a_value, &__ret,
710	__gcc_atomic::__to_gcc_order(__order));	747	__to_gcc_order(__order));
711	return __ret;	748	return __ret;
712	}	749	}
713		750
714	template <typename _Tp>	751	template <typename _Tp>
715	static inline _Tp __c11_atomic_exchange(volatile _Atomic(_Tp)* __a,	752	_LIBCPP_INLINE_VISIBILITY
716	_Tp __value, memory_order __order) {	753	_Tp __cxx_atomic_exchange(volatile __cxx_atomic_base_impl<_Tp>* __a,
		754	_Tp __value, memory_order __order) {
717	_Tp __ret;	755	_Tp __ret;
718	__atomic_exchange(&__a->__a_value, &__value, &__ret,	756	__atomic_exchange(&__a->__a_value, &__value, &__ret,
719	__gcc_atomic::__to_gcc_order(__order));	757	__to_gcc_order(__order));
720	return __ret;	758	return __ret;
721	}	759	}
722		760
723	template <typename _Tp>	761	template <typename _Tp>
724	static inline _Tp __c11_atomic_exchange(_Atomic(_Tp)* __a, _Tp __value,	762	_LIBCPP_INLINE_VISIBILITY
725	memory_order __order) {	763	_Tp __cxx_atomic_exchange(__cxx_atomic_base_impl<_Tp>* __a, _Tp __value,
		764	memory_order __order) {
726	_Tp __ret;	765	_Tp __ret;
727	__atomic_exchange(&__a->__a_value, &__value, &__ret,	766	__atomic_exchange(&__a->__a_value, &__value, &__ret,
728	__gcc_atomic::__to_gcc_order(__order));	767	__to_gcc_order(__order));
729	return __ret;	768	return __ret;
730	}	769	}
731		770
732	template <typename _Tp>	771	template <typename _Tp>
733	static inline bool __c11_atomic_compare_exchange_strong(	772	_LIBCPP_INLINE_VISIBILITY
734	volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,	773	bool __cxx_atomic_compare_exchange_strong(
		774	volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp* __expected, _Tp __value,
735	memory_order __success, memory_order __failure) {	775	memory_order __success, memory_order __failure) {
736	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,	776	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
737	false,	777	false,
738	__gcc_atomic::__to_gcc_order(__success),	778	__to_gcc_order(__success),
739	__gcc_atomic::__to_gcc_failure_order(__failure));	779	__to_gcc_failure_order(__failure));
740	}	780	}
741		781
742	template <typename _Tp>	782	template <typename _Tp>
743	static inline bool __c11_atomic_compare_exchange_strong(	783	_LIBCPP_INLINE_VISIBILITY
744	_Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,	784	bool __cxx_atomic_compare_exchange_strong(
		785	__cxx_atomic_base_impl<_Tp>* __a, _Tp* __expected, _Tp __value, memory_order __success,
745	memory_order __failure) {	786	memory_order __failure) {
746	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,	787	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
747	false,	788	false,
748	__gcc_atomic::__to_gcc_order(__success),	789	__to_gcc_order(__success),
749	__gcc_atomic::__to_gcc_failure_order(__failure));	790	__to_gcc_failure_order(__failure));
750	}	791	}
751		792
752	template <typename _Tp>	793	template <typename _Tp>
753	static inline bool __c11_atomic_compare_exchange_weak(	794	_LIBCPP_INLINE_VISIBILITY
754	volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,	795	bool __cxx_atomic_compare_exchange_weak(
		796	volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp* __expected, _Tp __value,
755	memory_order __success, memory_order __failure) {	797	memory_order __success, memory_order __failure) {
756	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,	798	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
757	true,	799	true,
758	__gcc_atomic::__to_gcc_order(__success),	800	__to_gcc_order(__success),
759	__gcc_atomic::__to_gcc_failure_order(__failure));	801	__to_gcc_failure_order(__failure));
760	}	802	}
761		803
762	template <typename _Tp>	804	template <typename _Tp>
763	static inline bool __c11_atomic_compare_exchange_weak(	805	_LIBCPP_INLINE_VISIBILITY
764	_Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,	806	bool __cxx_atomic_compare_exchange_weak(
		807	__cxx_atomic_base_impl<_Tp>* __a, _Tp* __expected, _Tp __value, memory_order __success,
765	memory_order __failure) {	808	memory_order __failure) {
766	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,	809	return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
767	true,	810	true,
768	__gcc_atomic::__to_gcc_order(__success),	811	__to_gcc_order(__success),
769	__gcc_atomic::__to_gcc_failure_order(__failure));	812	__to_gcc_failure_order(__failure));
770	}	813	}
771		814
772	template <typename _Tp>	815	template <typename _Tp>
...	@@ -783,80 +826,264 @@ template <typename _Tp, int n>	...	@@ -783,80 +826,264 @@ template <typename _Tp, int n>
783	struct __skip_amt<_Tp[n]> { };	826	struct __skip_amt<_Tp[n]> { };
784		827
785	template <typename _Tp, typename _Td>	828	template <typename _Tp, typename _Td>
786	static inline _Tp __c11_atomic_fetch_add(volatile _Atomic(_Tp)* __a,	829	_LIBCPP_INLINE_VISIBILITY
787	_Td __delta, memory_order __order) {	830	_Tp __cxx_atomic_fetch_add(volatile __cxx_atomic_base_impl<_Tp>* __a,
		831	_Td __delta, memory_order __order) {
788	return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,	832	return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
789	__gcc_atomic::__to_gcc_order(__order));	833	__to_gcc_order(__order));
790	}	834	}
791		835
792	template <typename _Tp, typename _Td>	836	template <typename _Tp, typename _Td>
793	static inline _Tp __c11_atomic_fetch_add(_Atomic(_Tp)* __a, _Td __delta,	837	_LIBCPP_INLINE_VISIBILITY
794	memory_order __order) {	838	_Tp __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta,
		839	memory_order __order) {
795	return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,	840	return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
796	__gcc_atomic::__to_gcc_order(__order));	841	__to_gcc_order(__order));
797	}	842	}
798		843
799	template <typename _Tp, typename _Td>	844	template <typename _Tp, typename _Td>
800	static inline _Tp __c11_atomic_fetch_sub(volatile _Atomic(_Tp)* __a,	845	_LIBCPP_INLINE_VISIBILITY
801	_Td __delta, memory_order __order) {	846	_Tp __cxx_atomic_fetch_sub(volatile __cxx_atomic_base_impl<_Tp>* __a,
		847	_Td __delta, memory_order __order) {
802	return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,	848	return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
803	__gcc_atomic::__to_gcc_order(__order));	849	__to_gcc_order(__order));
804	}	850	}
805		851
806	template <typename _Tp, typename _Td>	852	template <typename _Tp, typename _Td>
807	static inline _Tp __c11_atomic_fetch_sub(_Atomic(_Tp)* __a, _Td __delta,	853	_LIBCPP_INLINE_VISIBILITY
808	memory_order __order) {	854	_Tp __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta,
		855	memory_order __order) {
809	return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,	856	return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
810	__gcc_atomic::__to_gcc_order(__order));	857	__to_gcc_order(__order));
811	}	858	}
812		859
813	template <typename _Tp>	860	template <typename _Tp>
814	static inline _Tp __c11_atomic_fetch_and(volatile _Atomic(_Tp)* __a,	861	_LIBCPP_INLINE_VISIBILITY
815	_Tp __pattern, memory_order __order) {	862	_Tp __cxx_atomic_fetch_and(volatile __cxx_atomic_base_impl<_Tp>* __a,
		863	_Tp __pattern, memory_order __order) {
816	return __atomic_fetch_and(&__a->__a_value, __pattern,	864	return __atomic_fetch_and(&__a->__a_value, __pattern,
817	__gcc_atomic::__to_gcc_order(__order));	865	__to_gcc_order(__order));
818	}	866	}
819		867
820	template <typename _Tp>	868	template <typename _Tp>
821	static inline _Tp __c11_atomic_fetch_and(_Atomic(_Tp)* __a,	869	_LIBCPP_INLINE_VISIBILITY
822	_Tp __pattern, memory_order __order) {	870	_Tp __cxx_atomic_fetch_and(__cxx_atomic_base_impl<_Tp>* __a,
		871	_Tp __pattern, memory_order __order) {
823	return __atomic_fetch_and(&__a->__a_value, __pattern,	872	return __atomic_fetch_and(&__a->__a_value, __pattern,
824	__gcc_atomic::__to_gcc_order(__order));	873	__to_gcc_order(__order));
825	}	874	}
826		875
827	template <typename _Tp>	876	template <typename _Tp>
828	static inline _Tp __c11_atomic_fetch_or(volatile _Atomic(_Tp)* __a,	877	_LIBCPP_INLINE_VISIBILITY
829	_Tp __pattern, memory_order __order) {	878	_Tp __cxx_atomic_fetch_or(volatile __cxx_atomic_base_impl<_Tp>* __a,
		879	_Tp __pattern, memory_order __order) {
830	return __atomic_fetch_or(&__a->__a_value, __pattern,	880	return __atomic_fetch_or(&__a->__a_value, __pattern,
831	__gcc_atomic::__to_gcc_order(__order));	881	__to_gcc_order(__order));
832	}	882	}
833		883
834	template <typename _Tp>	884	template <typename _Tp>
835	static inline _Tp __c11_atomic_fetch_or(_Atomic(_Tp)* __a, _Tp __pattern,	885	_LIBCPP_INLINE_VISIBILITY
836	memory_order __order) {	886	_Tp __cxx_atomic_fetch_or(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern,
		887	memory_order __order) {
837	return __atomic_fetch_or(&__a->__a_value, __pattern,	888	return __atomic_fetch_or(&__a->__a_value, __pattern,
838	__gcc_atomic::__to_gcc_order(__order));	889	__to_gcc_order(__order));
839	}	890	}
840		891
841	template <typename _Tp>	892	template <typename _Tp>
842	static inline _Tp __c11_atomic_fetch_xor(volatile _Atomic(_Tp)* __a,	893	_LIBCPP_INLINE_VISIBILITY
843	_Tp __pattern, memory_order __order) {	894	_Tp __cxx_atomic_fetch_xor(volatile __cxx_atomic_base_impl<_Tp>* __a,
		895	_Tp __pattern, memory_order __order) {
844	return __atomic_fetch_xor(&__a->__a_value, __pattern,	896	return __atomic_fetch_xor(&__a->__a_value, __pattern,
845	__gcc_atomic::__to_gcc_order(__order));	897	__to_gcc_order(__order));
846	}	898	}
847		899
848	template <typename _Tp>	900	template <typename _Tp>
849	static inline _Tp __c11_atomic_fetch_xor(_Atomic(_Tp)* __a, _Tp __pattern,	901	_LIBCPP_INLINE_VISIBILITY
850	memory_order __order) {	902	_Tp __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern,
		903	memory_order __order) {
851	return __atomic_fetch_xor(&__a->__a_value, __pattern,	904	return __atomic_fetch_xor(&__a->__a_value, __pattern,
852	__gcc_atomic::__to_gcc_order(__order));	905	__to_gcc_order(__order));
		906	}
		907
		908	#define __cxx_atomic_is_lock_free(__s) __atomic_is_lock_free(__s, 0)
		909
		910	#elif defined(_LIBCPP_HAS_C_ATOMIC_IMP)
		911
		912	template <typename _Tp>
		913	struct __cxx_atomic_base_impl {
		914
		915	_LIBCPP_INLINE_VISIBILITY
		916	#ifndef _LIBCPP_CXX03_LANG
		917	__cxx_atomic_base_impl() _NOEXCEPT = default;
		918	#else
		919	__cxx_atomic_base_impl() _NOEXCEPT : __a_value() {}
		920	#endif // _LIBCPP_CXX03_LANG
		921	_LIBCPP_CONSTEXPR explicit __cxx_atomic_base_impl(_Tp value) _NOEXCEPT
		922	: __a_value(value) {}
		923	_Atomic(_Tp) __a_value;
		924	};
		925
		926	#define __cxx_atomic_is_lock_free(__s) __c11_atomic_is_lock_free(__s)
		927
		928	_LIBCPP_INLINE_VISIBILITY inline
		929	void __cxx_atomic_thread_fence(memory_order __order) _NOEXCEPT {
		930	__c11_atomic_thread_fence(static_cast<__memory_order_underlying_t>(__order));
		931	}
		932
		933	_LIBCPP_INLINE_VISIBILITY inline
		934	void __cxx_atomic_signal_fence(memory_order __order) _NOEXCEPT {
		935	__c11_atomic_signal_fence(static_cast<__memory_order_underlying_t>(__order));
		936	}
		937
		938	template<class _Tp>
		939	_LIBCPP_INLINE_VISIBILITY
		940	void __cxx_atomic_init(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __val) _NOEXCEPT {
		941	__c11_atomic_init(&__a->__a_value, __val);
		942	}
		943	template<class _Tp>
		944	_LIBCPP_INLINE_VISIBILITY
		945	void __cxx_atomic_init(__cxx_atomic_base_impl<_Tp> * __a, _Tp __val) _NOEXCEPT {
		946	__c11_atomic_init(&__a->__a_value, __val);
		947	}
		948
		949	template<class _Tp>
		950	_LIBCPP_INLINE_VISIBILITY
		951	void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __val, memory_order __order) _NOEXCEPT {
		952	__c11_atomic_store(&__a->__a_value, __val, static_cast<__memory_order_underlying_t>(__order));
		953	}
		954	template<class _Tp>
		955	_LIBCPP_INLINE_VISIBILITY
		956	void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp> * __a, _Tp __val, memory_order __order) _NOEXCEPT {
		957	__c11_atomic_store(&__a->__a_value, __val, static_cast<__memory_order_underlying_t>(__order));
		958	}
		959
		960	template<class _Tp>
		961	_LIBCPP_INLINE_VISIBILITY
		962	_Tp __cxx_atomic_load(__cxx_atomic_base_impl<_Tp> const volatile* __a, memory_order __order) _NOEXCEPT {
		963	using __ptr_type = typename remove_const<decltype(__a->__a_value)>::type*;
		964	return __c11_atomic_load(const_cast<__ptr_type>(&__a->__a_value), static_cast<__memory_order_underlying_t>(__order));
		965	}
		966	template<class _Tp>
		967	_LIBCPP_INLINE_VISIBILITY
		968	_Tp __cxx_atomic_load(__cxx_atomic_base_impl<_Tp> const* __a, memory_order __order) _NOEXCEPT {
		969	using __ptr_type = typename remove_const<decltype(__a->__a_value)>::type*;
		970	return __c11_atomic_load(const_cast<__ptr_type>(&__a->__a_value), static_cast<__memory_order_underlying_t>(__order));
		971	}
		972
		973	template<class _Tp>
		974	_LIBCPP_INLINE_VISIBILITY
		975	_Tp __cxx_atomic_exchange(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __value, memory_order __order) _NOEXCEPT {
		976	return __c11_atomic_exchange(&__a->__a_value, __value, static_cast<__memory_order_underlying_t>(__order));
		977	}
		978	template<class _Tp>
		979	_LIBCPP_INLINE_VISIBILITY
		980	_Tp __cxx_atomic_exchange(__cxx_atomic_base_impl<_Tp> * __a, _Tp __value, memory_order __order) _NOEXCEPT {
		981	return __c11_atomic_exchange(&__a->__a_value, __value, static_cast<__memory_order_underlying_t>(__order));
		982	}
		983
		984	template<class _Tp>
		985	_LIBCPP_INLINE_VISIBILITY
		986	bool __cxx_atomic_compare_exchange_strong(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp* __expected, _Tp __value, memory_order __success, memory_order __failure) _NOEXCEPT {
		987	return __c11_atomic_compare_exchange_strong(&__a->__a_value, __expected, __value, static_cast<__memory_order_underlying_t>(__success), static_cast<__memory_order_underlying_t>(__failure));
		988	}
		989	template<class _Tp>
		990	_LIBCPP_INLINE_VISIBILITY
		991	bool __cxx_atomic_compare_exchange_strong(__cxx_atomic_base_impl<_Tp> * __a, _Tp* __expected, _Tp __value, memory_order __success, memory_order __failure) _NOEXCEPT {
		992	return __c11_atomic_compare_exchange_strong(&__a->__a_value, __expected, __value, static_cast<__memory_order_underlying_t>(__success), static_cast<__memory_order_underlying_t>(__failure));
		993	}
		994
		995	template<class _Tp>
		996	_LIBCPP_INLINE_VISIBILITY
		997	bool __cxx_atomic_compare_exchange_weak(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp* __expected, _Tp __value, memory_order __success, memory_order __failure) _NOEXCEPT {
		998	return __c11_atomic_compare_exchange_weak(&__a->__a_value, __expected, __value, static_cast<__memory_order_underlying_t>(__success), static_cast<__memory_order_underlying_t>(__failure));
		999	}
		1000	template<class _Tp>
		1001	_LIBCPP_INLINE_VISIBILITY
		1002	bool __cxx_atomic_compare_exchange_weak(__cxx_atomic_base_impl<_Tp> * __a, _Tp* __expected, _Tp __value, memory_order __success, memory_order __failure) _NOEXCEPT {
		1003	return __c11_atomic_compare_exchange_weak(&__a->__a_value, __expected, __value, static_cast<__memory_order_underlying_t>(__success), static_cast<__memory_order_underlying_t>(__failure));
		1004	}
		1005
		1006	template<class _Tp>
		1007	_LIBCPP_INLINE_VISIBILITY
		1008	_Tp __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __delta, memory_order __order) _NOEXCEPT {
		1009	return __c11_atomic_fetch_add(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1010	}
		1011	template<class _Tp>
		1012	_LIBCPP_INLINE_VISIBILITY
		1013	_Tp __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp> * __a, _Tp __delta, memory_order __order) _NOEXCEPT {
		1014	return __c11_atomic_fetch_add(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1015	}
		1016
		1017	template<class _Tp>
		1018	_LIBCPP_INLINE_VISIBILITY
		1019	_Tp* __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp> volatile __a, ptrdiff_t __delta, memory_order __order) _NOEXCEPT {
		1020	return __c11_atomic_fetch_add(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
853	}	1021	}
854	#endif // _LIBCPP_HAS_GCC_ATOMIC_IMP	1022	template<class _Tp>
		1023	_LIBCPP_INLINE_VISIBILITY
		1024	_Tp* __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp> __a, ptrdiff_t __delta, memory_order __order) _NOEXCEPT {
		1025	return __c11_atomic_fetch_add(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1026	}
		1027
		1028	template<class _Tp>
		1029	_LIBCPP_INLINE_VISIBILITY
		1030	_Tp __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __delta, memory_order __order) _NOEXCEPT {
		1031	return __c11_atomic_fetch_sub(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1032	}
		1033	template<class _Tp>
		1034	_LIBCPP_INLINE_VISIBILITY
		1035	_Tp __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp> * __a, _Tp __delta, memory_order __order) _NOEXCEPT {
		1036	return __c11_atomic_fetch_sub(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1037	}
		1038	template<class _Tp>
		1039	_LIBCPP_INLINE_VISIBILITY
		1040	_Tp* __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp> volatile __a, ptrdiff_t __delta, memory_order __order) _NOEXCEPT {
		1041	return __c11_atomic_fetch_sub(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1042	}
		1043	template<class _Tp>
		1044	_LIBCPP_INLINE_VISIBILITY
		1045	_Tp* __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp> __a, ptrdiff_t __delta, memory_order __order) _NOEXCEPT {
		1046	return __c11_atomic_fetch_sub(&__a->__a_value, __delta, static_cast<__memory_order_underlying_t>(__order));
		1047	}
		1048
		1049	template<class _Tp>
		1050	_LIBCPP_INLINE_VISIBILITY
		1051	_Tp __cxx_atomic_fetch_and(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1052	return __c11_atomic_fetch_and(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1053	}
		1054	template<class _Tp>
		1055	_LIBCPP_INLINE_VISIBILITY
		1056	_Tp __cxx_atomic_fetch_and(__cxx_atomic_base_impl<_Tp> * __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1057	return __c11_atomic_fetch_and(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1058	}
		1059
		1060	template<class _Tp>
		1061	_LIBCPP_INLINE_VISIBILITY
		1062	_Tp __cxx_atomic_fetch_or(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1063	return __c11_atomic_fetch_or(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1064	}
		1065	template<class _Tp>
		1066	_LIBCPP_INLINE_VISIBILITY
		1067	_Tp __cxx_atomic_fetch_or(__cxx_atomic_base_impl<_Tp> * __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1068	return __c11_atomic_fetch_or(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1069	}
		1070
		1071	template<class _Tp>
		1072	_LIBCPP_INLINE_VISIBILITY
		1073	_Tp __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1074	return __c11_atomic_fetch_xor(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1075	}
		1076	template<class _Tp>
		1077	_LIBCPP_INLINE_VISIBILITY
		1078	_Tp __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp> * __a, _Tp __pattern, memory_order __order) _NOEXCEPT {
		1079	return __c11_atomic_fetch_xor(&__a->__a_value, __pattern, static_cast<__memory_order_underlying_t>(__order));
		1080	}
		1081
		1082	#endif // _LIBCPP_HAS_GCC_ATOMIC_IMP, _LIBCPP_HAS_C_ATOMIC_IMP
855		1083
856	template <class _Tp>	1084	template <class _Tp>
857	inline _LIBCPP_INLINE_VISIBILITY	1085	_LIBCPP_INLINE_VISIBILITY
858	_Tp	1086	_Tp kill_dependency(_Tp __y) _NOEXCEPT
859	kill_dependency(_Tp __y) _NOEXCEPT
860	{	1087	{
861	return __y;	1088	return __y;
862	}	1089	}
...	@@ -872,7 +1099,7 @@ kill_dependency(_Tp __y) _NOEXCEPT	...	@@ -872,7 +1099,7 @@ kill_dependency(_Tp __y) _NOEXCEPT
872	# define ATOMIC_LONG_LOCK_FREE __CLANG_ATOMIC_LONG_LOCK_FREE	1099	# define ATOMIC_LONG_LOCK_FREE __CLANG_ATOMIC_LONG_LOCK_FREE
873	# define ATOMIC_LLONG_LOCK_FREE __CLANG_ATOMIC_LLONG_LOCK_FREE	1100	# define ATOMIC_LLONG_LOCK_FREE __CLANG_ATOMIC_LLONG_LOCK_FREE
874	# define ATOMIC_POINTER_LOCK_FREE __CLANG_ATOMIC_POINTER_LOCK_FREE	1101	# define ATOMIC_POINTER_LOCK_FREE __CLANG_ATOMIC_POINTER_LOCK_FREE
875	#else	1102	#elif defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
876	# define ATOMIC_BOOL_LOCK_FREE __GCC_ATOMIC_BOOL_LOCK_FREE	1103	# define ATOMIC_BOOL_LOCK_FREE __GCC_ATOMIC_BOOL_LOCK_FREE
877	# define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE	1104	# define ATOMIC_CHAR_LOCK_FREE __GCC_ATOMIC_CHAR_LOCK_FREE
878	# define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE	1105	# define ATOMIC_CHAR16_T_LOCK_FREE __GCC_ATOMIC_CHAR16_T_LOCK_FREE
...	@@ -885,12 +1112,352 @@ kill_dependency(_Tp __y) _NOEXCEPT	...	@@ -885,12 +1112,352 @@ kill_dependency(_Tp __y) _NOEXCEPT
885	# define ATOMIC_POINTER_LOCK_FREE __GCC_ATOMIC_POINTER_LOCK_FREE	1112	# define ATOMIC_POINTER_LOCK_FREE __GCC_ATOMIC_POINTER_LOCK_FREE
886	#endif	1113	#endif
887		1114
		1115	#ifdef _LIBCPP_ATOMIC_ONLY_USE_BUILTINS
		1116
		1117	template<typename _Tp>
		1118	struct __cxx_atomic_lock_impl {
		1119
		1120	_LIBCPP_INLINE_VISIBILITY
		1121	__cxx_atomic_lock_impl() _NOEXCEPT
		1122	: __a_value(), __a_lock(0) {}
		1123	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR explicit
		1124	__cxx_atomic_lock_impl(_Tp value) _NOEXCEPT
		1125	: __a_value(value), __a_lock(0) {}
		1126
		1127	_Tp __a_value;
		1128	mutable __cxx_atomic_base_impl<_LIBCPP_ATOMIC_FLAG_TYPE> __a_lock;
		1129
		1130	_LIBCPP_INLINE_VISIBILITY void __lock() const volatile {
		1131	while(1 == __cxx_atomic_exchange(&__a_lock, _LIBCPP_ATOMIC_FLAG_TYPE(true), memory_order_acquire))
		1132	/spin/;
		1133	}
		1134	_LIBCPP_INLINE_VISIBILITY void __lock() const {
		1135	while(1 == __cxx_atomic_exchange(&__a_lock, _LIBCPP_ATOMIC_FLAG_TYPE(true), memory_order_acquire))
		1136	/spin/;
		1137	}
		1138	_LIBCPP_INLINE_VISIBILITY void __unlock() const volatile {
		1139	__cxx_atomic_store(&__a_lock, _LIBCPP_ATOMIC_FLAG_TYPE(false), memory_order_release);
		1140	}
		1141	_LIBCPP_INLINE_VISIBILITY void __unlock() const {
		1142	__cxx_atomic_store(&__a_lock, _LIBCPP_ATOMIC_FLAG_TYPE(false), memory_order_release);
		1143	}
		1144	_LIBCPP_INLINE_VISIBILITY _Tp __read() const volatile {
		1145	__lock();
		1146	_Tp __old;
		1147	__cxx_atomic_assign_volatile(__old, __a_value);
		1148	__unlock();
		1149	return __old;
		1150	}
		1151	_LIBCPP_INLINE_VISIBILITY _Tp __read() const {
		1152	__lock();
		1153	_Tp __old = __a_value;
		1154	__unlock();
		1155	return __old;
		1156	}
		1157	};
		1158
		1159	template <typename _Tp>
		1160	_LIBCPP_INLINE_VISIBILITY
		1161	void __cxx_atomic_init(volatile __cxx_atomic_lock_impl<_Tp>* __a, _Tp __val) {
		1162	__cxx_atomic_assign_volatile(__a->__a_value, __val);
		1163	}
		1164	template <typename _Tp>
		1165	_LIBCPP_INLINE_VISIBILITY
		1166	void __cxx_atomic_init(__cxx_atomic_lock_impl<_Tp>* __a, _Tp __val) {
		1167	__a->__a_value = __val;
		1168	}
		1169
		1170	template <typename _Tp>
		1171	_LIBCPP_INLINE_VISIBILITY
		1172	void __cxx_atomic_store(volatile __cxx_atomic_lock_impl<_Tp>* __a, _Tp __val, memory_order) {
		1173	__a->__lock();
		1174	__cxx_atomic_assign_volatile(__a->__a_value, __val);
		1175	__a->__unlock();
		1176	}
		1177	template <typename _Tp>
		1178	_LIBCPP_INLINE_VISIBILITY
		1179	void __cxx_atomic_store(__cxx_atomic_lock_impl<_Tp>* __a, _Tp __val, memory_order) {
		1180	__a->__lock();
		1181	__a->__a_value = __val;
		1182	__a->__unlock();
		1183	}
		1184
		1185	template <typename _Tp>
		1186	_LIBCPP_INLINE_VISIBILITY
		1187	_Tp __cxx_atomic_load(const volatile __cxx_atomic_lock_impl<_Tp>* __a, memory_order) {
		1188	return __a->__read();
		1189	}
		1190	template <typename _Tp>
		1191	_LIBCPP_INLINE_VISIBILITY
		1192	_Tp __cxx_atomic_load(const __cxx_atomic_lock_impl<_Tp>* __a, memory_order) {
		1193	return __a->__read();
		1194	}
		1195
		1196	template <typename _Tp>
		1197	_LIBCPP_INLINE_VISIBILITY
		1198	_Tp __cxx_atomic_exchange(volatile __cxx_atomic_lock_impl<_Tp>* __a, _Tp __value, memory_order) {
		1199	__a->__lock();
		1200	_Tp __old;
		1201	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1202	__cxx_atomic_assign_volatile(__a->__a_value, __value);
		1203	__a->__unlock();
		1204	return __old;
		1205	}
		1206	template <typename _Tp>
		1207	_LIBCPP_INLINE_VISIBILITY
		1208	_Tp __cxx_atomic_exchange(__cxx_atomic_lock_impl<_Tp>* __a, _Tp __value, memory_order) {
		1209	__a->__lock();
		1210	_Tp __old = __a->__a_value;
		1211	__a->__a_value = __value;
		1212	__a->__unlock();
		1213	return __old;
		1214	}
		1215
		1216	template <typename _Tp>
		1217	_LIBCPP_INLINE_VISIBILITY
		1218	bool __cxx_atomic_compare_exchange_strong(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1219	_Tp* __expected, _Tp __value, memory_order, memory_order) {
		1220	__a->__lock();
		1221	_Tp temp;
		1222	__cxx_atomic_assign_volatile(temp, __a->__a_value);
		1223	bool __ret = temp == *__expected;
		1224	if(__ret)
		1225	__cxx_atomic_assign_volatile(__a->__a_value, __value);
		1226	else
		1227	__cxx_atomic_assign_volatile(*__expected, __a->__a_value);
		1228	__a->__unlock();
		1229	return __ret;
		1230	}
		1231	template <typename _Tp>
		1232	_LIBCPP_INLINE_VISIBILITY
		1233	bool __cxx_atomic_compare_exchange_strong(__cxx_atomic_lock_impl<_Tp>* __a,
		1234	_Tp* __expected, _Tp __value, memory_order, memory_order) {
		1235	__a->__lock();
		1236	bool __ret = __a->__a_value == *__expected;
		1237	if(__ret)
		1238	__a->__a_value = __value;
		1239	else
		1240	*__expected = __a->__a_value;
		1241	__a->__unlock();
		1242	return __ret;
		1243	}
		1244
		1245	template <typename _Tp>
		1246	_LIBCPP_INLINE_VISIBILITY
		1247	bool __cxx_atomic_compare_exchange_weak(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1248	_Tp* __expected, _Tp __value, memory_order, memory_order) {
		1249	__a->__lock();
		1250	_Tp temp;
		1251	__cxx_atomic_assign_volatile(temp, __a->__a_value);
		1252	bool __ret = temp == *__expected;
		1253	if(__ret)
		1254	__cxx_atomic_assign_volatile(__a->__a_value, __value);
		1255	else
		1256	__cxx_atomic_assign_volatile(*__expected, __a->__a_value);
		1257	__a->__unlock();
		1258	return __ret;
		1259	}
		1260	template <typename _Tp>
		1261	_LIBCPP_INLINE_VISIBILITY
		1262	bool __cxx_atomic_compare_exchange_weak(__cxx_atomic_lock_impl<_Tp>* __a,
		1263	_Tp* __expected, _Tp __value, memory_order, memory_order) {
		1264	__a->__lock();
		1265	bool __ret = __a->__a_value == *__expected;
		1266	if(__ret)
		1267	__a->__a_value = __value;
		1268	else
		1269	*__expected = __a->__a_value;
		1270	__a->__unlock();
		1271	return __ret;
		1272	}
		1273
		1274	template <typename _Tp, typename _Td>
		1275	_LIBCPP_INLINE_VISIBILITY
		1276	_Tp __cxx_atomic_fetch_add(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1277	_Td __delta, memory_order) {
		1278	__a->__lock();
		1279	_Tp __old;
		1280	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1281	__cxx_atomic_assign_volatile(__a->__a_value, _Tp(__old + __delta));
		1282	__a->__unlock();
		1283	return __old;
		1284	}
		1285	template <typename _Tp, typename _Td>
		1286	_LIBCPP_INLINE_VISIBILITY
		1287	_Tp __cxx_atomic_fetch_add(__cxx_atomic_lock_impl<_Tp>* __a,
		1288	_Td __delta, memory_order) {
		1289	__a->__lock();
		1290	_Tp __old = __a->__a_value;
		1291	__a->__a_value += __delta;
		1292	__a->__unlock();
		1293	return __old;
		1294	}
		1295
		1296	template <typename _Tp, typename _Td>
		1297	_LIBCPP_INLINE_VISIBILITY
		1298	_Tp* __cxx_atomic_fetch_add(volatile __cxx_atomic_lock_impl<_Tp> __a,
		1299	ptrdiff_t __delta, memory_order) {
		1300	__a->__lock();
		1301	_Tp* __old;
		1302	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1303	__cxx_atomic_assign_volatile(__a->__a_value, __old + __delta);
		1304	__a->__unlock();
		1305	return __old;
		1306	}
		1307	template <typename _Tp, typename _Td>
		1308	_LIBCPP_INLINE_VISIBILITY
		1309	_Tp* __cxx_atomic_fetch_add(__cxx_atomic_lock_impl<_Tp> __a,
		1310	ptrdiff_t __delta, memory_order) {
		1311	__a->__lock();
		1312	_Tp* __old = __a->__a_value;
		1313	__a->__a_value += __delta;
		1314	__a->__unlock();
		1315	return __old;
		1316	}
		1317
		1318	template <typename _Tp, typename _Td>
		1319	_LIBCPP_INLINE_VISIBILITY
		1320	_Tp __cxx_atomic_fetch_sub(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1321	_Td __delta, memory_order) {
		1322	__a->__lock();
		1323	_Tp __old;
		1324	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1325	__cxx_atomic_assign_volatile(__a->__a_value, _Tp(__old - __delta));
		1326	__a->__unlock();
		1327	return __old;
		1328	}
		1329	template <typename _Tp, typename _Td>
		1330	_LIBCPP_INLINE_VISIBILITY
		1331	_Tp __cxx_atomic_fetch_sub(__cxx_atomic_lock_impl<_Tp>* __a,
		1332	_Td __delta, memory_order) {
		1333	__a->__lock();
		1334	_Tp __old = __a->__a_value;
		1335	__a->__a_value -= __delta;
		1336	__a->__unlock();
		1337	return __old;
		1338	}
		1339
		1340	template <typename _Tp>
		1341	_LIBCPP_INLINE_VISIBILITY
		1342	_Tp __cxx_atomic_fetch_and(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1343	_Tp __pattern, memory_order) {
		1344	__a->__lock();
		1345	_Tp __old;
		1346	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1347	__cxx_atomic_assign_volatile(__a->__a_value, _Tp(__old & __pattern));
		1348	__a->__unlock();
		1349	return __old;
		1350	}
		1351	template <typename _Tp>
		1352	_LIBCPP_INLINE_VISIBILITY
		1353	_Tp __cxx_atomic_fetch_and(__cxx_atomic_lock_impl<_Tp>* __a,
		1354	_Tp __pattern, memory_order) {
		1355	__a->__lock();
		1356	_Tp __old = __a->__a_value;
		1357	__a->__a_value &= __pattern;
		1358	__a->__unlock();
		1359	return __old;
		1360	}
		1361
		1362	template <typename _Tp>
		1363	_LIBCPP_INLINE_VISIBILITY
		1364	_Tp __cxx_atomic_fetch_or(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1365	_Tp __pattern, memory_order) {
		1366	__a->__lock();
		1367	_Tp __old;
		1368	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1369	__cxx_atomic_assign_volatile(__a->__a_value, _Tp(__old \| __pattern));
		1370	__a->__unlock();
		1371	return __old;
		1372	}
		1373	template <typename _Tp>
		1374	_LIBCPP_INLINE_VISIBILITY
		1375	_Tp __cxx_atomic_fetch_or(__cxx_atomic_lock_impl<_Tp>* __a,
		1376	_Tp __pattern, memory_order) {
		1377	__a->__lock();
		1378	_Tp __old = __a->__a_value;
		1379	__a->__a_value \|= __pattern;
		1380	__a->__unlock();
		1381	return __old;
		1382	}
		1383
		1384	template <typename _Tp>
		1385	_LIBCPP_INLINE_VISIBILITY
		1386	_Tp __cxx_atomic_fetch_xor(volatile __cxx_atomic_lock_impl<_Tp>* __a,
		1387	_Tp __pattern, memory_order) {
		1388	__a->__lock();
		1389	_Tp __old;
		1390	__cxx_atomic_assign_volatile(__old, __a->__a_value);
		1391	__cxx_atomic_assign_volatile(__a->__a_value, _Tp(__old ^ __pattern));
		1392	__a->__unlock();
		1393	return __old;
		1394	}
		1395	template <typename _Tp>
		1396	_LIBCPP_INLINE_VISIBILITY
		1397	_Tp __cxx_atomic_fetch_xor(__cxx_atomic_lock_impl<_Tp>* __a,
		1398	_Tp __pattern, memory_order) {
		1399	__a->__lock();
		1400	_Tp __old = __a->__a_value;
		1401	__a->__a_value ^= __pattern;
		1402	__a->__unlock();
		1403	return __old;
		1404	}
		1405
		1406	#ifdef __cpp_lib_atomic_is_always_lock_free
		1407
		1408	template<typename _Tp> struct __cxx_is_always_lock_free {
		1409	enum { __value = __atomic_always_lock_free(sizeof(_Tp), 0) }; };
		1410
		1411	#else
		1412
		1413	template<typename _Tp> struct __cxx_is_always_lock_free { enum { __value = false }; };
		1414	// Implementations must match the C ATOMIC_*_LOCK_FREE macro values.
		1415	template<> struct __cxx_is_always_lock_free<bool> { enum { __value = 2 == ATOMIC_BOOL_LOCK_FREE }; };
		1416	template<> struct __cxx_is_always_lock_free<char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
		1417	template<> struct __cxx_is_always_lock_free<signed char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
		1418	template<> struct __cxx_is_always_lock_free<unsigned char> { enum { __value = 2 == ATOMIC_CHAR_LOCK_FREE }; };
		1419	template<> struct __cxx_is_always_lock_free<char16_t> { enum { __value = 2 == ATOMIC_CHAR16_T_LOCK_FREE }; };
		1420	template<> struct __cxx_is_always_lock_free<char32_t> { enum { __value = 2 == ATOMIC_CHAR32_T_LOCK_FREE }; };
		1421	template<> struct __cxx_is_always_lock_free<wchar_t> { enum { __value = 2 == ATOMIC_WCHAR_T_LOCK_FREE }; };
		1422	template<> struct __cxx_is_always_lock_free<short> { enum { __value = 2 == ATOMIC_SHORT_LOCK_FREE }; };
		1423	template<> struct __cxx_is_always_lock_free<unsigned short> { enum { __value = 2 == ATOMIC_SHORT_LOCK_FREE }; };
		1424	template<> struct __cxx_is_always_lock_free<int> { enum { __value = 2 == ATOMIC_INT_LOCK_FREE }; };
		1425	template<> struct __cxx_is_always_lock_free<unsigned int> { enum { __value = 2 == ATOMIC_INT_LOCK_FREE }; };
		1426	template<> struct __cxx_is_always_lock_free<long> { enum { __value = 2 == ATOMIC_LONG_LOCK_FREE }; };
		1427	template<> struct __cxx_is_always_lock_free<unsigned long> { enum { __value = 2 == ATOMIC_LONG_LOCK_FREE }; };
		1428	template<> struct __cxx_is_always_lock_free<long long> { enum { __value = 2 == ATOMIC_LLONG_LOCK_FREE }; };
		1429	template<> struct __cxx_is_always_lock_free<unsigned long long> { enum { __value = 2 == ATOMIC_LLONG_LOCK_FREE }; };
		1430	template<typename _Tp> struct __cxx_is_always_lock_free<_Tp*> { enum { __value = 2 == ATOMIC_POINTER_LOCK_FREE }; };
		1431	template<> struct __cxx_is_always_lock_free<std::nullptr_t> { enum { __value = 2 == ATOMIC_POINTER_LOCK_FREE }; };
		1432
		1433	#endif //__cpp_lib_atomic_is_always_lock_free
		1434
		1435	template <typename _Tp,
		1436	typename _Base = typename conditional<__cxx_is_always_lock_free<_Tp>::__value,
		1437	__cxx_atomic_base_impl<_Tp>,
		1438	__cxx_atomic_lock_impl<_Tp> >::type>
		1439	#else
		1440	template <typename _Tp,
		1441	typename _Base = __cxx_atomic_base_impl<_Tp> >
		1442	#endif //_LIBCPP_ATOMIC_ONLY_USE_BUILTINS
		1443	struct __cxx_atomic_impl : public _Base {
		1444
		1445	#if _GNUC_VER >= 501
		1446	static_assert(is_trivially_copyable<_Tp>::value,
		1447	"std::atomic<Tp> requires that 'Tp' be a trivially copyable type");
		1448	#endif
		1449
		1450	_LIBCPP_INLINE_VISIBILITY __cxx_atomic_impl() _NOEXCEPT _LIBCPP_DEFAULT
		1451	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR explicit __cxx_atomic_impl(_Tp value) _NOEXCEPT
		1452	: _Base(value) {}
		1453	};
		1454
888	// general atomic<T>	1455	// general atomic<T>
889		1456
890	template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>	1457	template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
891	struct __atomic_base // false	1458	struct __atomic_base // false
892	{	1459	{
893	mutable _Atomic(_Tp) __a_;	1460	mutable __cxx_atomic_impl<_Tp> __a_;
894		1461
895	#if defined(__cpp_lib_atomic_is_always_lock_free)	1462	#if defined(__cpp_lib_atomic_is_always_lock_free)
896	static _LIBCPP_CONSTEXPR bool is_always_lock_free = __atomic_always_lock_free(sizeof(__a_), 0);	1463	static _LIBCPP_CONSTEXPR bool is_always_lock_free = __atomic_always_lock_free(sizeof(__a_), 0);
...	@@ -898,88 +1465,79 @@ struct __atomic_base // false	...	@@ -898,88 +1465,79 @@ struct __atomic_base // false
898		1465
899	_LIBCPP_INLINE_VISIBILITY	1466	_LIBCPP_INLINE_VISIBILITY
900	bool is_lock_free() const volatile _NOEXCEPT	1467	bool is_lock_free() const volatile _NOEXCEPT
901	{	1468	{return __cxx_atomic_is_lock_free(sizeof(_Tp));}
902	#if defined(_LIBCPP_HAS_C_ATOMIC_IMP)
903	return __c11_atomic_is_lock_free(sizeof(_Tp));
904	#else
905	return __atomic_is_lock_free(sizeof(_Tp), 0);
906	#endif
907	}
908	_LIBCPP_INLINE_VISIBILITY	1469	_LIBCPP_INLINE_VISIBILITY
909	bool is_lock_free() const _NOEXCEPT	1470	bool is_lock_free() const _NOEXCEPT
910	{return static_cast<__atomic_base const volatile*>(this)->is_lock_free();}	1471	{return static_cast<__atomic_base const volatile*>(this)->is_lock_free();}
911	_LIBCPP_INLINE_VISIBILITY	1472	_LIBCPP_INLINE_VISIBILITY
912	void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1473	void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
913	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)	1474	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
914	{__c11_atomic_store(&__a_, __d, __m);}	1475	{__cxx_atomic_store(&__a_, __d, __m);}
915	_LIBCPP_INLINE_VISIBILITY	1476	_LIBCPP_INLINE_VISIBILITY
916	void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1477	void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
917	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)	1478	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
918	{__c11_atomic_store(&__a_, __d, __m);}	1479	{__cxx_atomic_store(&__a_, __d, __m);}
919	_LIBCPP_INLINE_VISIBILITY	1480	_LIBCPP_INLINE_VISIBILITY
920	_Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT	1481	_Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
921	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)	1482	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
922	{return __c11_atomic_load(&__a_, __m);}	1483	{return __cxx_atomic_load(&__a_, __m);}
923	_LIBCPP_INLINE_VISIBILITY	1484	_LIBCPP_INLINE_VISIBILITY
924	_Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT	1485	_Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT
925	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)	1486	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
926	{return __c11_atomic_load(&__a_, __m);}	1487	{return __cxx_atomic_load(&__a_, __m);}
927	_LIBCPP_INLINE_VISIBILITY	1488	_LIBCPP_INLINE_VISIBILITY
928	operator _Tp() const volatile _NOEXCEPT {return load();}	1489	operator _Tp() const volatile _NOEXCEPT {return load();}
929	_LIBCPP_INLINE_VISIBILITY	1490	_LIBCPP_INLINE_VISIBILITY
930	operator _Tp() const _NOEXCEPT {return load();}	1491	operator _Tp() const _NOEXCEPT {return load();}
931	_LIBCPP_INLINE_VISIBILITY	1492	_LIBCPP_INLINE_VISIBILITY
932	_Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1493	_Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
933	{return __c11_atomic_exchange(&__a_, __d, __m);}	1494	{return __cxx_atomic_exchange(&__a_, __d, __m);}
934	_LIBCPP_INLINE_VISIBILITY	1495	_LIBCPP_INLINE_VISIBILITY
935	_Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1496	_Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
936	{return __c11_atomic_exchange(&__a_, __d, __m);}	1497	{return __cxx_atomic_exchange(&__a_, __d, __m);}
937	_LIBCPP_INLINE_VISIBILITY	1498	_LIBCPP_INLINE_VISIBILITY
938	bool compare_exchange_weak(_Tp& __e, _Tp __d,	1499	bool compare_exchange_weak(_Tp& __e, _Tp __d,
939	memory_order __s, memory_order __f) volatile _NOEXCEPT	1500	memory_order __s, memory_order __f) volatile _NOEXCEPT
940	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)	1501	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
941	{return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}	1502	{return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
942	_LIBCPP_INLINE_VISIBILITY	1503	_LIBCPP_INLINE_VISIBILITY
943	bool compare_exchange_weak(_Tp& __e, _Tp __d,	1504	bool compare_exchange_weak(_Tp& __e, _Tp __d,
944	memory_order __s, memory_order __f) _NOEXCEPT	1505	memory_order __s, memory_order __f) _NOEXCEPT
945	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)	1506	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
946	{return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}	1507	{return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
947	_LIBCPP_INLINE_VISIBILITY	1508	_LIBCPP_INLINE_VISIBILITY
948	bool compare_exchange_strong(_Tp& __e, _Tp __d,	1509	bool compare_exchange_strong(_Tp& __e, _Tp __d,
949	memory_order __s, memory_order __f) volatile _NOEXCEPT	1510	memory_order __s, memory_order __f) volatile _NOEXCEPT
950	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)	1511	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
951	{return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}	1512	{return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
952	_LIBCPP_INLINE_VISIBILITY	1513	_LIBCPP_INLINE_VISIBILITY
953	bool compare_exchange_strong(_Tp& __e, _Tp __d,	1514	bool compare_exchange_strong(_Tp& __e, _Tp __d,
954	memory_order __s, memory_order __f) _NOEXCEPT	1515	memory_order __s, memory_order __f) _NOEXCEPT
955	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)	1516	_LIBCPP_CHECK_EXCHANGE_MEMORY_ORDER(__s, __f)
956	{return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}	1517	{return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
957	_LIBCPP_INLINE_VISIBILITY	1518	_LIBCPP_INLINE_VISIBILITY
958	bool compare_exchange_weak(_Tp& __e, _Tp __d,	1519	bool compare_exchange_weak(_Tp& __e, _Tp __d,
959	memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1520	memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
960	{return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}	1521	{return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
961	_LIBCPP_INLINE_VISIBILITY	1522	_LIBCPP_INLINE_VISIBILITY
962	bool compare_exchange_weak(_Tp& __e, _Tp __d,	1523	bool compare_exchange_weak(_Tp& __e, _Tp __d,
963	memory_order __m = memory_order_seq_cst) _NOEXCEPT	1524	memory_order __m = memory_order_seq_cst) _NOEXCEPT
964	{return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}	1525	{return __cxx_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
965	_LIBCPP_INLINE_VISIBILITY	1526	_LIBCPP_INLINE_VISIBILITY
966	bool compare_exchange_strong(_Tp& __e, _Tp __d,	1527	bool compare_exchange_strong(_Tp& __e, _Tp __d,
967	memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1528	memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
968	{return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}	1529	{return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
969	_LIBCPP_INLINE_VISIBILITY	1530	_LIBCPP_INLINE_VISIBILITY
970	bool compare_exchange_strong(_Tp& __e, _Tp __d,	1531	bool compare_exchange_strong(_Tp& __e, _Tp __d,
971	memory_order __m = memory_order_seq_cst) _NOEXCEPT	1532	memory_order __m = memory_order_seq_cst) _NOEXCEPT
972	{return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}	1533	{return __cxx_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
973		1534
974	_LIBCPP_INLINE_VISIBILITY	1535	_LIBCPP_INLINE_VISIBILITY
975	#ifndef _LIBCPP_CXX03_LANG	1536	__atomic_base() _NOEXCEPT _LIBCPP_DEFAULT
976	__atomic_base() _NOEXCEPT = default;	1537
977	#else	1538	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
978	__atomic_base() _NOEXCEPT : __a_() {}	1539	__atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {}
979	#endif // _LIBCPP_CXX03_LANG
980		1540
981	_LIBCPP_INLINE_VISIBILITY
982	_LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {}
983	#ifndef _LIBCPP_CXX03_LANG	1541	#ifndef _LIBCPP_CXX03_LANG
984	__atomic_base(const __atomic_base&) = delete;	1542	__atomic_base(const __atomic_base&) = delete;
985	__atomic_base& operator=(const __atomic_base&) = delete;	1543	__atomic_base& operator=(const __atomic_base&) = delete;
...	@@ -1011,34 +1569,34 @@ struct __atomic_base<_Tp, true>	...	@@ -1011,34 +1569,34 @@ struct __atomic_base<_Tp, true>
1011		1569
1012	_LIBCPP_INLINE_VISIBILITY	1570	_LIBCPP_INLINE_VISIBILITY
1013	_Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1571	_Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1014	{return __c11_atomic_fetch_add(&this->__a_, __op, __m);}	1572	{return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
1015	_LIBCPP_INLINE_VISIBILITY	1573	_LIBCPP_INLINE_VISIBILITY
1016	_Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1574	_Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1017	{return __c11_atomic_fetch_add(&this->__a_, __op, __m);}	1575	{return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
1018	_LIBCPP_INLINE_VISIBILITY	1576	_LIBCPP_INLINE_VISIBILITY
1019	_Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1577	_Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1020	{return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}	1578	{return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
1021	_LIBCPP_INLINE_VISIBILITY	1579	_LIBCPP_INLINE_VISIBILITY
1022	_Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1580	_Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1023	{return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}	1581	{return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
1024	_LIBCPP_INLINE_VISIBILITY	1582	_LIBCPP_INLINE_VISIBILITY
1025	_Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1583	_Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1026	{return __c11_atomic_fetch_and(&this->__a_, __op, __m);}	1584	{return __cxx_atomic_fetch_and(&this->__a_, __op, __m);}
1027	_LIBCPP_INLINE_VISIBILITY	1585	_LIBCPP_INLINE_VISIBILITY
1028	_Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1586	_Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1029	{return __c11_atomic_fetch_and(&this->__a_, __op, __m);}	1587	{return __cxx_atomic_fetch_and(&this->__a_, __op, __m);}
1030	_LIBCPP_INLINE_VISIBILITY	1588	_LIBCPP_INLINE_VISIBILITY
1031	_Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1589	_Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1032	{return __c11_atomic_fetch_or(&this->__a_, __op, __m);}	1590	{return __cxx_atomic_fetch_or(&this->__a_, __op, __m);}
1033	_LIBCPP_INLINE_VISIBILITY	1591	_LIBCPP_INLINE_VISIBILITY
1034	_Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1592	_Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1035	{return __c11_atomic_fetch_or(&this->__a_, __op, __m);}	1593	{return __cxx_atomic_fetch_or(&this->__a_, __op, __m);}
1036	_LIBCPP_INLINE_VISIBILITY	1594	_LIBCPP_INLINE_VISIBILITY
1037	_Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	1595	_Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1038	{return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}	1596	{return __cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
1039	_LIBCPP_INLINE_VISIBILITY	1597	_LIBCPP_INLINE_VISIBILITY
1040	_Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1598	_Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1041	{return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}	1599	{return __cxx_atomic_fetch_xor(&this->__a_, __op, __m);}
1042		1600
1043	_LIBCPP_INLINE_VISIBILITY	1601	_LIBCPP_INLINE_VISIBILITY
1044	_Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}	1602	_Tp operator++(int) volatile _NOEXCEPT {return fetch_add(_Tp(1));}
...	@@ -1120,17 +1678,17 @@ struct atomic<_Tp*>	...	@@ -1120,17 +1678,17 @@ struct atomic<_Tp*>
1120	_LIBCPP_INLINE_VISIBILITY	1678	_LIBCPP_INLINE_VISIBILITY
1121	_Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)	1679	_Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
1122	volatile _NOEXCEPT	1680	volatile _NOEXCEPT
1123	{return __c11_atomic_fetch_add(&this->__a_, __op, __m);}	1681	{return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
1124	_LIBCPP_INLINE_VISIBILITY	1682	_LIBCPP_INLINE_VISIBILITY
1125	_Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1683	_Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1126	{return __c11_atomic_fetch_add(&this->__a_, __op, __m);}	1684	{return __cxx_atomic_fetch_add(&this->__a_, __op, __m);}
1127	_LIBCPP_INLINE_VISIBILITY	1685	_LIBCPP_INLINE_VISIBILITY
1128	_Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)	1686	_Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
1129	volatile _NOEXCEPT	1687	volatile _NOEXCEPT
1130	{return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}	1688	{return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
1131	_LIBCPP_INLINE_VISIBILITY	1689	_LIBCPP_INLINE_VISIBILITY
1132	_Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT	1690	_Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
1133	{return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}	1691	{return __cxx_atomic_fetch_sub(&this->__a_, __op, __m);}
1134		1692
1135	_LIBCPP_INLINE_VISIBILITY	1693	_LIBCPP_INLINE_VISIBILITY
1136	_Tp* operator++(int) volatile _NOEXCEPT {return fetch_add(1);}	1694	_Tp* operator++(int) volatile _NOEXCEPT {return fetch_add(1);}
...	@@ -1161,7 +1719,7 @@ struct atomic<_Tp*>	...	@@ -1161,7 +1719,7 @@ struct atomic<_Tp*>
1161	// atomic_is_lock_free	1719	// atomic_is_lock_free
1162		1720
1163	template <class _Tp>	1721	template <class _Tp>
1164	inline _LIBCPP_INLINE_VISIBILITY	1722	_LIBCPP_INLINE_VISIBILITY
1165	bool	1723	bool
1166	atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT	1724	atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT
1167	{	1725	{
...	@@ -1169,7 +1727,7 @@ atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT	...	@@ -1169,7 +1727,7 @@ atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT
1169	}	1727	}
1170		1728
1171	template <class _Tp>	1729	template <class _Tp>
1172	inline _LIBCPP_INLINE_VISIBILITY	1730	_LIBCPP_INLINE_VISIBILITY
1173	bool	1731	bool
1174	atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT	1732	atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT
1175	{	1733	{
...	@@ -1179,25 +1737,25 @@ atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT	...	@@ -1179,25 +1737,25 @@ atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT
1179	// atomic_init	1737	// atomic_init
1180		1738
1181	template <class _Tp>	1739	template <class _Tp>
1182	inline _LIBCPP_INLINE_VISIBILITY	1740	_LIBCPP_INLINE_VISIBILITY
1183	void	1741	void
1184	atomic_init(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1742	atomic_init(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1185	{	1743	{
1186	__c11_atomic_init(&__o->__a_, __d);	1744	__cxx_atomic_init(&__o->__a_, __d);
1187	}	1745	}
1188		1746
1189	template <class _Tp>	1747	template <class _Tp>
1190	inline _LIBCPP_INLINE_VISIBILITY	1748	_LIBCPP_INLINE_VISIBILITY
1191	void	1749	void
1192	atomic_init(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1750	atomic_init(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1193	{	1751	{
1194	__c11_atomic_init(&__o->__a_, __d);	1752	__cxx_atomic_init(&__o->__a_, __d);
1195	}	1753	}
1196		1754
1197	// atomic_store	1755	// atomic_store
1198		1756
1199	template <class _Tp>	1757	template <class _Tp>
1200	inline _LIBCPP_INLINE_VISIBILITY	1758	_LIBCPP_INLINE_VISIBILITY
1201	void	1759	void
1202	atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1760	atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1203	{	1761	{
...	@@ -1205,7 +1763,7 @@ atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	...	@@ -1205,7 +1763,7 @@ atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1205	}	1763	}
1206		1764
1207	template <class _Tp>	1765	template <class _Tp>
1208	inline _LIBCPP_INLINE_VISIBILITY	1766	_LIBCPP_INLINE_VISIBILITY
1209	void	1767	void
1210	atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1768	atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1211	{	1769	{
...	@@ -1215,7 +1773,7 @@ atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	...	@@ -1215,7 +1773,7 @@ atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1215	// atomic_store_explicit	1773	// atomic_store_explicit
1216		1774
1217	template <class _Tp>	1775	template <class _Tp>
1218	inline _LIBCPP_INLINE_VISIBILITY	1776	_LIBCPP_INLINE_VISIBILITY
1219	void	1777	void
1220	atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	1778	atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1221	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)	1779	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
...	@@ -1224,7 +1782,7 @@ atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOE	...	@@ -1224,7 +1782,7 @@ atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOE
1224	}	1782	}
1225		1783
1226	template <class _Tp>	1784	template <class _Tp>
1227	inline _LIBCPP_INLINE_VISIBILITY	1785	_LIBCPP_INLINE_VISIBILITY
1228	void	1786	void
1229	atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	1787	atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1230	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)	1788	_LIBCPP_CHECK_STORE_MEMORY_ORDER(__m)
...	@@ -1235,7 +1793,7 @@ atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	...	@@ -1235,7 +1793,7 @@ atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1235	// atomic_load	1793	// atomic_load
1236		1794
1237	template <class _Tp>	1795	template <class _Tp>
1238	inline _LIBCPP_INLINE_VISIBILITY	1796	_LIBCPP_INLINE_VISIBILITY
1239	_Tp	1797	_Tp
1240	atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT	1798	atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT
1241	{	1799	{
...	@@ -1243,7 +1801,7 @@ atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT	...	@@ -1243,7 +1801,7 @@ atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT
1243	}	1801	}
1244		1802
1245	template <class _Tp>	1803	template <class _Tp>
1246	inline _LIBCPP_INLINE_VISIBILITY	1804	_LIBCPP_INLINE_VISIBILITY
1247	_Tp	1805	_Tp
1248	atomic_load(const atomic<_Tp>* __o) _NOEXCEPT	1806	atomic_load(const atomic<_Tp>* __o) _NOEXCEPT
1249	{	1807	{
...	@@ -1253,7 +1811,7 @@ atomic_load(const atomic<_Tp>* __o) _NOEXCEPT	...	@@ -1253,7 +1811,7 @@ atomic_load(const atomic<_Tp>* __o) _NOEXCEPT
1253	// atomic_load_explicit	1811	// atomic_load_explicit
1254		1812
1255	template <class _Tp>	1813	template <class _Tp>
1256	inline _LIBCPP_INLINE_VISIBILITY	1814	_LIBCPP_INLINE_VISIBILITY
1257	_Tp	1815	_Tp
1258	atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEPT	1816	atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
1259	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)	1817	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
...	@@ -1262,7 +1820,7 @@ atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEP	...	@@ -1262,7 +1820,7 @@ atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEP
1262	}	1820	}
1263		1821
1264	template <class _Tp>	1822	template <class _Tp>
1265	inline _LIBCPP_INLINE_VISIBILITY	1823	_LIBCPP_INLINE_VISIBILITY
1266	_Tp	1824	_Tp
1267	atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT	1825	atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
1268	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)	1826	_LIBCPP_CHECK_LOAD_MEMORY_ORDER(__m)
...	@@ -1273,7 +1831,7 @@ atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT	...	@@ -1273,7 +1831,7 @@ atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
1273	// atomic_exchange	1831	// atomic_exchange
1274		1832
1275	template <class _Tp>	1833	template <class _Tp>
1276	inline _LIBCPP_INLINE_VISIBILITY	1834	_LIBCPP_INLINE_VISIBILITY
1277	_Tp	1835	_Tp
1278	atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1836	atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1279	{	1837	{
...	@@ -1281,7 +1839,7 @@ atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	...	@@ -1281,7 +1839,7 @@ atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1281	}	1839	}
1282		1840
1283	template <class _Tp>	1841	template <class _Tp>
1284	inline _LIBCPP_INLINE_VISIBILITY	1842	_LIBCPP_INLINE_VISIBILITY
1285	_Tp	1843	_Tp
1286	atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	1844	atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1287	{	1845	{
...	@@ -1291,7 +1849,7 @@ atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT	...	@@ -1291,7 +1849,7 @@ atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
1291	// atomic_exchange_explicit	1849	// atomic_exchange_explicit
1292		1850
1293	template <class _Tp>	1851	template <class _Tp>
1294	inline _LIBCPP_INLINE_VISIBILITY	1852	_LIBCPP_INLINE_VISIBILITY
1295	_Tp	1853	_Tp
1296	atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	1854	atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1297	{	1855	{
...	@@ -1299,7 +1857,7 @@ atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _	...	@@ -1299,7 +1857,7 @@ atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _
1299	}	1857	}
1300		1858
1301	template <class _Tp>	1859	template <class _Tp>
1302	inline _LIBCPP_INLINE_VISIBILITY	1860	_LIBCPP_INLINE_VISIBILITY
1303	_Tp	1861	_Tp
1304	atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	1862	atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1305	{	1863	{
...	@@ -1309,7 +1867,7 @@ atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT	...	@@ -1309,7 +1867,7 @@ atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
1309	// atomic_compare_exchange_weak	1867	// atomic_compare_exchange_weak
1310		1868
1311	template <class _Tp>	1869	template <class _Tp>
1312	inline _LIBCPP_INLINE_VISIBILITY	1870	_LIBCPP_INLINE_VISIBILITY
1313	bool	1871	bool
1314	atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	1872	atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1315	{	1873	{
...	@@ -1317,7 +1875,7 @@ atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEX	...	@@ -1317,7 +1875,7 @@ atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEX
1317	}	1875	}
1318		1876
1319	template <class _Tp>	1877	template <class _Tp>
1320	inline _LIBCPP_INLINE_VISIBILITY	1878	_LIBCPP_INLINE_VISIBILITY
1321	bool	1879	bool
1322	atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	1880	atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1323	{	1881	{
...	@@ -1327,7 +1885,7 @@ atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	...	@@ -1327,7 +1885,7 @@ atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1327	// atomic_compare_exchange_strong	1885	// atomic_compare_exchange_strong
1328		1886
1329	template <class _Tp>	1887	template <class _Tp>
1330	inline _LIBCPP_INLINE_VISIBILITY	1888	_LIBCPP_INLINE_VISIBILITY
1331	bool	1889	bool
1332	atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	1890	atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1333	{	1891	{
...	@@ -1335,7 +1893,7 @@ atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NO	...	@@ -1335,7 +1893,7 @@ atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NO
1335	}	1893	}
1336		1894
1337	template <class _Tp>	1895	template <class _Tp>
1338	inline _LIBCPP_INLINE_VISIBILITY	1896	_LIBCPP_INLINE_VISIBILITY
1339	bool	1897	bool
1340	atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	1898	atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1341	{	1899	{
...	@@ -1345,7 +1903,7 @@ atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT	...	@@ -1345,7 +1903,7 @@ atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
1345	// atomic_compare_exchange_weak_explicit	1903	// atomic_compare_exchange_weak_explicit
1346		1904
1347	template <class _Tp>	1905	template <class _Tp>
1348	inline _LIBCPP_INLINE_VISIBILITY	1906	_LIBCPP_INLINE_VISIBILITY
1349	bool	1907	bool
1350	atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,	1908	atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,
1351	_Tp __d,	1909	_Tp __d,
...	@@ -1356,7 +1914,7 @@ atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,	...	@@ -1356,7 +1914,7 @@ atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,
1356	}	1914	}
1357		1915
1358	template <class _Tp>	1916	template <class _Tp>
1359	inline _LIBCPP_INLINE_VISIBILITY	1917	_LIBCPP_INLINE_VISIBILITY
1360	bool	1918	bool
1361	atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,	1919	atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,
1362	memory_order __s, memory_order __f) _NOEXCEPT	1920	memory_order __s, memory_order __f) _NOEXCEPT
...	@@ -1368,7 +1926,7 @@ atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,	...	@@ -1368,7 +1926,7 @@ atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,
1368	// atomic_compare_exchange_strong_explicit	1926	// atomic_compare_exchange_strong_explicit
1369		1927
1370	template <class _Tp>	1928	template <class _Tp>
1371	inline _LIBCPP_INLINE_VISIBILITY	1929	_LIBCPP_INLINE_VISIBILITY
1372	bool	1930	bool
1373	atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,	1931	atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,
1374	_Tp* __e, _Tp __d,	1932	_Tp* __e, _Tp __d,
...	@@ -1379,7 +1937,7 @@ atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,	...	@@ -1379,7 +1937,7 @@ atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,
1379	}	1937	}
1380		1938
1381	template <class _Tp>	1939	template <class _Tp>
1382	inline _LIBCPP_INLINE_VISIBILITY	1940	_LIBCPP_INLINE_VISIBILITY
1383	bool	1941	bool
1384	atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,	1942	atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,
1385	_Tp __d,	1943	_Tp __d,
...	@@ -1392,7 +1950,7 @@ atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,	...	@@ -1392,7 +1950,7 @@ atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,
1392	// atomic_fetch_add	1950	// atomic_fetch_add
1393		1951
1394	template <class _Tp>	1952	template <class _Tp>
1395	inline _LIBCPP_INLINE_VISIBILITY	1953	_LIBCPP_INLINE_VISIBILITY
1396	typename enable_if	1954	typename enable_if
1397	<	1955	<
1398	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	1956	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1404,7 +1962,7 @@ atomic_fetch_add(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1404,7 +1962,7 @@ atomic_fetch_add(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1404	}	1962	}
1405		1963
1406	template <class _Tp>	1964	template <class _Tp>
1407	inline _LIBCPP_INLINE_VISIBILITY	1965	_LIBCPP_INLINE_VISIBILITY
1408	typename enable_if	1966	typename enable_if
1409	<	1967	<
1410	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	1968	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1416,7 +1974,7 @@ atomic_fetch_add(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1416,7 +1974,7 @@ atomic_fetch_add(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1416	}	1974	}
1417		1975
1418	template <class _Tp>	1976	template <class _Tp>
1419	inline _LIBCPP_INLINE_VISIBILITY	1977	_LIBCPP_INLINE_VISIBILITY
1420	_Tp*	1978	_Tp*
1421	atomic_fetch_add(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	1979	atomic_fetch_add(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1422	{	1980	{
...	@@ -1424,7 +1982,7 @@ atomic_fetch_add(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	...	@@ -1424,7 +1982,7 @@ atomic_fetch_add(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1424	}	1982	}
1425		1983
1426	template <class _Tp>	1984	template <class _Tp>
1427	inline _LIBCPP_INLINE_VISIBILITY	1985	_LIBCPP_INLINE_VISIBILITY
1428	_Tp*	1986	_Tp*
1429	atomic_fetch_add(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	1987	atomic_fetch_add(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1430	{	1988	{
...	@@ -1434,7 +1992,7 @@ atomic_fetch_add(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	...	@@ -1434,7 +1992,7 @@ atomic_fetch_add(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1434	// atomic_fetch_add_explicit	1992	// atomic_fetch_add_explicit
1435		1993
1436	template <class _Tp>	1994	template <class _Tp>
1437	inline _LIBCPP_INLINE_VISIBILITY	1995	_LIBCPP_INLINE_VISIBILITY
1438	typename enable_if	1996	typename enable_if
1439	<	1997	<
1440	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	1998	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1446,7 +2004,7 @@ atomic_fetch_add_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)	...	@@ -1446,7 +2004,7 @@ atomic_fetch_add_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)
1446	}	2004	}
1447		2005
1448	template <class _Tp>	2006	template <class _Tp>
1449	inline _LIBCPP_INLINE_VISIBILITY	2007	_LIBCPP_INLINE_VISIBILITY
1450	typename enable_if	2008	typename enable_if
1451	<	2009	<
1452	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2010	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1458,7 +2016,7 @@ atomic_fetch_add_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP	...	@@ -1458,7 +2016,7 @@ atomic_fetch_add_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP
1458	}	2016	}
1459		2017
1460	template <class _Tp>	2018	template <class _Tp>
1461	inline _LIBCPP_INLINE_VISIBILITY	2019	_LIBCPP_INLINE_VISIBILITY
1462	_Tp*	2020	_Tp*
1463	atomic_fetch_add_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,	2021	atomic_fetch_add_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,
1464	memory_order __m) _NOEXCEPT	2022	memory_order __m) _NOEXCEPT
...	@@ -1467,7 +2025,7 @@ atomic_fetch_add_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,	...	@@ -1467,7 +2025,7 @@ atomic_fetch_add_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,
1467	}	2025	}
1468		2026
1469	template <class _Tp>	2027	template <class _Tp>
1470	inline _LIBCPP_INLINE_VISIBILITY	2028	_LIBCPP_INLINE_VISIBILITY
1471	_Tp*	2029	_Tp*
1472	atomic_fetch_add_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT	2030	atomic_fetch_add_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
1473	{	2031	{
...	@@ -1477,7 +2035,7 @@ atomic_fetch_add_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _	...	@@ -1477,7 +2035,7 @@ atomic_fetch_add_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _
1477	// atomic_fetch_sub	2035	// atomic_fetch_sub
1478		2036
1479	template <class _Tp>	2037	template <class _Tp>
1480	inline _LIBCPP_INLINE_VISIBILITY	2038	_LIBCPP_INLINE_VISIBILITY
1481	typename enable_if	2039	typename enable_if
1482	<	2040	<
1483	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2041	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1489,7 +2047,7 @@ atomic_fetch_sub(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1489,7 +2047,7 @@ atomic_fetch_sub(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1489	}	2047	}
1490		2048
1491	template <class _Tp>	2049	template <class _Tp>
1492	inline _LIBCPP_INLINE_VISIBILITY	2050	_LIBCPP_INLINE_VISIBILITY
1493	typename enable_if	2051	typename enable_if
1494	<	2052	<
1495	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2053	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1501,7 +2059,7 @@ atomic_fetch_sub(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1501,7 +2059,7 @@ atomic_fetch_sub(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1501	}	2059	}
1502		2060
1503	template <class _Tp>	2061	template <class _Tp>
1504	inline _LIBCPP_INLINE_VISIBILITY	2062	_LIBCPP_INLINE_VISIBILITY
1505	_Tp*	2063	_Tp*
1506	atomic_fetch_sub(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	2064	atomic_fetch_sub(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1507	{	2065	{
...	@@ -1509,7 +2067,7 @@ atomic_fetch_sub(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	...	@@ -1509,7 +2067,7 @@ atomic_fetch_sub(volatile atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1509	}	2067	}
1510		2068
1511	template <class _Tp>	2069	template <class _Tp>
1512	inline _LIBCPP_INLINE_VISIBILITY	2070	_LIBCPP_INLINE_VISIBILITY
1513	_Tp*	2071	_Tp*
1514	atomic_fetch_sub(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	2072	atomic_fetch_sub(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1515	{	2073	{
...	@@ -1519,7 +2077,7 @@ atomic_fetch_sub(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT	...	@@ -1519,7 +2077,7 @@ atomic_fetch_sub(atomic<_Tp> __o, ptrdiff_t __op) _NOEXCEPT
1519	// atomic_fetch_sub_explicit	2077	// atomic_fetch_sub_explicit
1520		2078
1521	template <class _Tp>	2079	template <class _Tp>
1522	inline _LIBCPP_INLINE_VISIBILITY	2080	_LIBCPP_INLINE_VISIBILITY
1523	typename enable_if	2081	typename enable_if
1524	<	2082	<
1525	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2083	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1531,7 +2089,7 @@ atomic_fetch_sub_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)	...	@@ -1531,7 +2089,7 @@ atomic_fetch_sub_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)
1531	}	2089	}
1532		2090
1533	template <class _Tp>	2091	template <class _Tp>
1534	inline _LIBCPP_INLINE_VISIBILITY	2092	_LIBCPP_INLINE_VISIBILITY
1535	typename enable_if	2093	typename enable_if
1536	<	2094	<
1537	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2095	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1543,7 +2101,7 @@ atomic_fetch_sub_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP	...	@@ -1543,7 +2101,7 @@ atomic_fetch_sub_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP
1543	}	2101	}
1544		2102
1545	template <class _Tp>	2103	template <class _Tp>
1546	inline _LIBCPP_INLINE_VISIBILITY	2104	_LIBCPP_INLINE_VISIBILITY
1547	_Tp*	2105	_Tp*
1548	atomic_fetch_sub_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,	2106	atomic_fetch_sub_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,
1549	memory_order __m) _NOEXCEPT	2107	memory_order __m) _NOEXCEPT
...	@@ -1552,7 +2110,7 @@ atomic_fetch_sub_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,	...	@@ -1552,7 +2110,7 @@ atomic_fetch_sub_explicit(volatile atomic<_Tp> __o, ptrdiff_t __op,
1552	}	2110	}
1553		2111
1554	template <class _Tp>	2112	template <class _Tp>
1555	inline _LIBCPP_INLINE_VISIBILITY	2113	_LIBCPP_INLINE_VISIBILITY
1556	_Tp*	2114	_Tp*
1557	atomic_fetch_sub_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT	2115	atomic_fetch_sub_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
1558	{	2116	{
...	@@ -1562,7 +2120,7 @@ atomic_fetch_sub_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _	...	@@ -1562,7 +2120,7 @@ atomic_fetch_sub_explicit(atomic<_Tp> __o, ptrdiff_t __op, memory_order __m) _
1562	// atomic_fetch_and	2120	// atomic_fetch_and
1563		2121
1564	template <class _Tp>	2122	template <class _Tp>
1565	inline _LIBCPP_INLINE_VISIBILITY	2123	_LIBCPP_INLINE_VISIBILITY
1566	typename enable_if	2124	typename enable_if
1567	<	2125	<
1568	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2126	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1574,7 +2132,7 @@ atomic_fetch_and(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1574,7 +2132,7 @@ atomic_fetch_and(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1574	}	2132	}
1575		2133
1576	template <class _Tp>	2134	template <class _Tp>
1577	inline _LIBCPP_INLINE_VISIBILITY	2135	_LIBCPP_INLINE_VISIBILITY
1578	typename enable_if	2136	typename enable_if
1579	<	2137	<
1580	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2138	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1588,7 +2146,7 @@ atomic_fetch_and(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1588,7 +2146,7 @@ atomic_fetch_and(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1588	// atomic_fetch_and_explicit	2146	// atomic_fetch_and_explicit
1589		2147
1590	template <class _Tp>	2148	template <class _Tp>
1591	inline _LIBCPP_INLINE_VISIBILITY	2149	_LIBCPP_INLINE_VISIBILITY
1592	typename enable_if	2150	typename enable_if
1593	<	2151	<
1594	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2152	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1600,7 +2158,7 @@ atomic_fetch_and_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)	...	@@ -1600,7 +2158,7 @@ atomic_fetch_and_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)
1600	}	2158	}
1601		2159
1602	template <class _Tp>	2160	template <class _Tp>
1603	inline _LIBCPP_INLINE_VISIBILITY	2161	_LIBCPP_INLINE_VISIBILITY
1604	typename enable_if	2162	typename enable_if
1605	<	2163	<
1606	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2164	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1614,7 +2172,7 @@ atomic_fetch_and_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP	...	@@ -1614,7 +2172,7 @@ atomic_fetch_and_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP
1614	// atomic_fetch_or	2172	// atomic_fetch_or
1615		2173
1616	template <class _Tp>	2174	template <class _Tp>
1617	inline _LIBCPP_INLINE_VISIBILITY	2175	_LIBCPP_INLINE_VISIBILITY
1618	typename enable_if	2176	typename enable_if
1619	<	2177	<
1620	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2178	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1626,7 +2184,7 @@ atomic_fetch_or(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1626,7 +2184,7 @@ atomic_fetch_or(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1626	}	2184	}
1627		2185
1628	template <class _Tp>	2186	template <class _Tp>
1629	inline _LIBCPP_INLINE_VISIBILITY	2187	_LIBCPP_INLINE_VISIBILITY
1630	typename enable_if	2188	typename enable_if
1631	<	2189	<
1632	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2190	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1640,7 +2198,7 @@ atomic_fetch_or(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1640,7 +2198,7 @@ atomic_fetch_or(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1640	// atomic_fetch_or_explicit	2198	// atomic_fetch_or_explicit
1641		2199
1642	template <class _Tp>	2200	template <class _Tp>
1643	inline _LIBCPP_INLINE_VISIBILITY	2201	_LIBCPP_INLINE_VISIBILITY
1644	typename enable_if	2202	typename enable_if
1645	<	2203	<
1646	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2204	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1652,7 +2210,7 @@ atomic_fetch_or_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)	...	@@ -1652,7 +2210,7 @@ atomic_fetch_or_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)
1652	}	2210	}
1653		2211
1654	template <class _Tp>	2212	template <class _Tp>
1655	inline _LIBCPP_INLINE_VISIBILITY	2213	_LIBCPP_INLINE_VISIBILITY
1656	typename enable_if	2214	typename enable_if
1657	<	2215	<
1658	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2216	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1666,7 +2224,7 @@ atomic_fetch_or_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT	...	@@ -1666,7 +2224,7 @@ atomic_fetch_or_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
1666	// atomic_fetch_xor	2224	// atomic_fetch_xor
1667		2225
1668	template <class _Tp>	2226	template <class _Tp>
1669	inline _LIBCPP_INLINE_VISIBILITY	2227	_LIBCPP_INLINE_VISIBILITY
1670	typename enable_if	2228	typename enable_if
1671	<	2229	<
1672	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2230	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1678,7 +2236,7 @@ atomic_fetch_xor(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1678,7 +2236,7 @@ atomic_fetch_xor(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1678	}	2236	}
1679		2237
1680	template <class _Tp>	2238	template <class _Tp>
1681	inline _LIBCPP_INLINE_VISIBILITY	2239	_LIBCPP_INLINE_VISIBILITY
1682	typename enable_if	2240	typename enable_if
1683	<	2241	<
1684	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2242	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1692,7 +2250,7 @@ atomic_fetch_xor(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT	...	@@ -1692,7 +2250,7 @@ atomic_fetch_xor(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
1692	// atomic_fetch_xor_explicit	2250	// atomic_fetch_xor_explicit
1693		2251
1694	template <class _Tp>	2252	template <class _Tp>
1695	inline _LIBCPP_INLINE_VISIBILITY	2253	_LIBCPP_INLINE_VISIBILITY
1696	typename enable_if	2254	typename enable_if
1697	<	2255	<
1698	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2256	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1704,7 +2262,7 @@ atomic_fetch_xor_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)	...	@@ -1704,7 +2262,7 @@ atomic_fetch_xor_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m)
1704	}	2262	}
1705		2263
1706	template <class _Tp>	2264	template <class _Tp>
1707	inline _LIBCPP_INLINE_VISIBILITY	2265	_LIBCPP_INLINE_VISIBILITY
1708	typename enable_if	2266	typename enable_if
1709	<	2267	<
1710	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,	2268	is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
...	@@ -1719,27 +2277,23 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP	...	@@ -1719,27 +2277,23 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEP
1719		2277
1720	typedef struct atomic_flag	2278	typedef struct atomic_flag
1721	{	2279	{
1722	_Atomic(bool) __a_;	2280	__cxx_atomic_impl<_LIBCPP_ATOMIC_FLAG_TYPE> __a_;
1723		2281
1724	_LIBCPP_INLINE_VISIBILITY	2282	_LIBCPP_INLINE_VISIBILITY
1725	bool test_and_set(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	2283	bool test_and_set(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1726	{return __c11_atomic_exchange(&__a_, true, __m);}	2284	{return __cxx_atomic_exchange(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(true), __m);}
1727	_LIBCPP_INLINE_VISIBILITY	2285	_LIBCPP_INLINE_VISIBILITY
1728	bool test_and_set(memory_order __m = memory_order_seq_cst) _NOEXCEPT	2286	bool test_and_set(memory_order __m = memory_order_seq_cst) _NOEXCEPT
1729	{return __c11_atomic_exchange(&__a_, true, __m);}	2287	{return __cxx_atomic_exchange(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(true), __m);}
1730	_LIBCPP_INLINE_VISIBILITY	2288	_LIBCPP_INLINE_VISIBILITY
1731	void clear(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT	2289	void clear(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
1732	{__c11_atomic_store(&__a_, false, __m);}	2290	{__cxx_atomic_store(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(false), __m);}
1733	_LIBCPP_INLINE_VISIBILITY	2291	_LIBCPP_INLINE_VISIBILITY
1734	void clear(memory_order __m = memory_order_seq_cst) _NOEXCEPT	2292	void clear(memory_order __m = memory_order_seq_cst) _NOEXCEPT
1735	{__c11_atomic_store(&__a_, false, __m);}	2293	{__cxx_atomic_store(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(false), __m);}
1736		2294
1737	_LIBCPP_INLINE_VISIBILITY	2295	_LIBCPP_INLINE_VISIBILITY
1738	#ifndef _LIBCPP_CXX03_LANG	2296	atomic_flag() _NOEXCEPT _LIBCPP_DEFAULT
1739	atomic_flag() _NOEXCEPT = default;
1740	#else
1741	atomic_flag() _NOEXCEPT : __a_() {}
1742	#endif // _LIBCPP_CXX03_LANG
1743		2297
1744	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR	2298	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
1745	atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {} // EXTENSION	2299	atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {} // EXTENSION
...	@@ -1818,14 +2372,14 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -1818,14 +2372,14 @@ inline _LIBCPP_INLINE_VISIBILITY
1818	void	2372	void
1819	atomic_thread_fence(memory_order __m) _NOEXCEPT	2373	atomic_thread_fence(memory_order __m) _NOEXCEPT
1820	{	2374	{
1821	__c11_atomic_thread_fence(__m);	2375	__cxx_atomic_thread_fence(__m);
1822	}	2376	}
1823		2377
1824	inline _LIBCPP_INLINE_VISIBILITY	2378	inline _LIBCPP_INLINE_VISIBILITY
1825	void	2379	void
1826	atomic_signal_fence(memory_order __m) _NOEXCEPT	2380	atomic_signal_fence(memory_order __m) _NOEXCEPT
1827	{	2381	{
1828	__c11_atomic_signal_fence(__m);	2382	__cxx_atomic_signal_fence(__m);
1829	}	2383	}
1830		2384
1831	// Atomics for standard typedef types	2385	// Atomics for standard typedef types

lib/libcxx/include/bit+339-32

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------ bit ----------------------------------===//	2	//===------------------------------ bit ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===---------------------------------------------------------------------===//	8	//===---------------------------------------------------------------------===//
10		9
...	@@ -16,12 +15,42 @@	...	@@ -16,12 +15,42 @@
16		15
17	namespace std {	16	namespace std {
18		17
		18	template <class T>
		19	constexpr bool ispow2(T x) noexcept; // C++20
		20	template <class T>
		21	constexpr T ceil2(T x); // C++20
		22	template <class T>
		23	constexpr T floor2(T x) noexcept; // C++20
		24	template <class T>
		25	constexpr T log2p1(T x) noexcept; // C++20
		26
		27	// 23.20.2, rotating
		28	template<class T>
		29	constexpr T rotl(T x, unsigned int s) noexcept; // C++20
		30	template<class T>
		31	constexpr T rotr(T x, unsigned int s) noexcept; // C++20
		32
		33	// 23.20.3, counting
		34	template<class T>
		35	constexpr int countl_zero(T x) noexcept; // C++20
		36	template<class T>
		37	constexpr int countl_one(T x) noexcept; // C++20
		38	template<class T>
		39	constexpr int countr_zero(T x) noexcept; // C++20
		40	template<class T>
		41	constexpr int countr_one(T x) noexcept; // C++20
		42	template<class T>
		43	constexpr int popcount(T x) noexcept; // C++20
		44
19	} // namespace std	45	} // namespace std
20		46
21	*/	47	*/
22		48
23	#include <__config>	49	#include <__config>
		50	#include <limits>
		51	#include <type_traits>
24	#include <version>	52	#include <version>
		53	#include <__debug>
25		54
26	#if defined(__IBMCPP__)	55	#if defined(__IBMCPP__)
27	#include "support/ibm/support.h"	56	#include "support/ibm/support.h"
...	@@ -34,44 +63,47 @@ namespace std {	...	@@ -34,44 +63,47 @@ namespace std {
34	#pragma GCC system_header	63	#pragma GCC system_header
35	#endif	64	#endif
36		65
		66	_LIBCPP_PUSH_MACROS
		67	#include <__undef_macros>
		68
37	_LIBCPP_BEGIN_NAMESPACE_STD	69	_LIBCPP_BEGIN_NAMESPACE_STD
38		70
39	#ifndef _LIBCPP_COMPILER_MSVC	71	#ifndef _LIBCPP_COMPILER_MSVC
40		72
41	inline _LIBCPP_INLINE_VISIBILITY	73	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
42	int __ctz(unsigned __x) { return __builtin_ctz(__x); }	74	int __libcpp_ctz(unsigned __x) _NOEXCEPT { return __builtin_ctz(__x); }
43		75
44	inline _LIBCPP_INLINE_VISIBILITY	76	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
45	int __ctz(unsigned long __x) { return __builtin_ctzl(__x); }	77	int __libcpp_ctz(unsigned long __x) _NOEXCEPT { return __builtin_ctzl(__x); }
46		78
47	inline _LIBCPP_INLINE_VISIBILITY	79	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
48	int __ctz(unsigned long long __x) { return __builtin_ctzll(__x); }	80	int __libcpp_ctz(unsigned long long __x) _NOEXCEPT { return __builtin_ctzll(__x); }
49		81
50		82
51	inline _LIBCPP_INLINE_VISIBILITY	83	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
52	int __clz(unsigned __x) { return __builtin_clz(__x); }	84	int __libcpp_clz(unsigned __x) _NOEXCEPT { return __builtin_clz(__x); }
53		85
54	inline _LIBCPP_INLINE_VISIBILITY	86	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
55	int __clz(unsigned long __x) { return __builtin_clzl(__x); }	87	int __libcpp_clz(unsigned long __x) _NOEXCEPT { return __builtin_clzl(__x); }
56		88
57	inline _LIBCPP_INLINE_VISIBILITY	89	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
58	int __clz(unsigned long long __x) { return __builtin_clzll(__x); }	90	int __libcpp_clz(unsigned long long __x) _NOEXCEPT { return __builtin_clzll(__x); }
59		91
60		92
61	inline _LIBCPP_INLINE_VISIBILITY	93	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
62	int __popcount(unsigned __x) { return __builtin_popcount(__x); }	94	int __libcpp_popcount(unsigned __x) _NOEXCEPT { return __builtin_popcount(__x); }
63		95
64	inline _LIBCPP_INLINE_VISIBILITY	96	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
65	int __popcount(unsigned long __x) { return __builtin_popcountl(__x); }	97	int __libcpp_popcount(unsigned long __x) _NOEXCEPT { return __builtin_popcountl(__x); }
66		98
67	inline _LIBCPP_INLINE_VISIBILITY	99	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
68	int __popcount(unsigned long long __x) { return __builtin_popcountll(__x); }	100	int __libcpp_popcount(unsigned long long __x) _NOEXCEPT { return __builtin_popcountll(__x); }
69		101
70	#else // _LIBCPP_COMPILER_MSVC	102	#else // _LIBCPP_COMPILER_MSVC
71		103
72	// Precondition: __x != 0	104	// Precondition: __x != 0
73	inline _LIBCPP_INLINE_VISIBILITY	105	inline _LIBCPP_INLINE_VISIBILITY
74	int __ctz(unsigned __x) {	106	int __libcpp_ctz(unsigned __x) {
75	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");	107	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
76	static_assert(sizeof(unsigned long) == 4, "");	108	static_assert(sizeof(unsigned long) == 4, "");
77	unsigned long __where;	109	unsigned long __where;
...	@@ -81,13 +113,13 @@ int __ctz(unsigned __x) {	...	@@ -81,13 +113,13 @@ int __ctz(unsigned __x) {
81	}	113	}
82		114
83	inline _LIBCPP_INLINE_VISIBILITY	115	inline _LIBCPP_INLINE_VISIBILITY
84	int __ctz(unsigned long __x) {	116	int __libcpp_ctz(unsigned long __x) {
85	static_assert(sizeof(unsigned long) == sizeof(unsigned), "");	117	static_assert(sizeof(unsigned long) == sizeof(unsigned), "");
86	return __ctz(static_cast<unsigned>(__x));	118	return __ctz(static_cast<unsigned>(__x));
87	}	119	}
88		120
89	inline _LIBCPP_INLINE_VISIBILITY	121	inline _LIBCPP_INLINE_VISIBILITY
90	int __ctz(unsigned long long __x) {	122	int __libcpp_ctz(unsigned long long __x) {
91	unsigned long __where;	123	unsigned long __where;
92	#if defined(_LIBCPP_HAS_BITSCAN64)	124	#if defined(_LIBCPP_HAS_BITSCAN64)
93	(defined(_M_AMD64) \|\| defined(__x86_64__))	125	(defined(_M_AMD64) \|\| defined(__x86_64__))
...	@@ -105,7 +137,7 @@ int __ctz(unsigned long long __x) {	...	@@ -105,7 +137,7 @@ int __ctz(unsigned long long __x) {
105		137
106	// Precondition: __x != 0	138	// Precondition: __x != 0
107	inline _LIBCPP_INLINE_VISIBILITY	139	inline _LIBCPP_INLINE_VISIBILITY
108	int __clz(unsigned __x) {	140	int __libcpp_clz(unsigned __x) {
109	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");	141	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
110	static_assert(sizeof(unsigned long) == 4, "");	142	static_assert(sizeof(unsigned long) == 4, "");
111	unsigned long __where;	143	unsigned long __where;
...	@@ -115,13 +147,13 @@ int __clz(unsigned __x) {	...	@@ -115,13 +147,13 @@ int __clz(unsigned __x) {
115	}	147	}
116		148
117	inline _LIBCPP_INLINE_VISIBILITY	149	inline _LIBCPP_INLINE_VISIBILITY
118	int __clz(unsigned long __x) {	150	int __libcpp_clz(unsigned long __x) {
119	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");	151	static_assert(sizeof(unsigned) == sizeof(unsigned long), "");
120	return __clz(static_cast<unsigned>(__x));	152	return __libcpp_clz(static_cast<unsigned>(__x));
121	}	153	}
122		154
123	inline _LIBCPP_INLINE_VISIBILITY	155	inline _LIBCPP_INLINE_VISIBILITY
124	int __clz(unsigned long long __x) {	156	int __libcpp_clz(unsigned long long __x) {
125	unsigned long __where;	157	unsigned long __where;
126	#if defined(_LIBCPP_HAS_BITSCAN64)	158	#if defined(_LIBCPP_HAS_BITSCAN64)
127	if (_BitScanReverse64(&__where, __x))	159	if (_BitScanReverse64(&__where, __x))
...	@@ -136,23 +168,298 @@ int __clz(unsigned long long __x) {	...	@@ -136,23 +168,298 @@ int __clz(unsigned long long __x) {
136	return 64; // Undefined Behavior.	168	return 64; // Undefined Behavior.
137	}	169	}
138		170
139	inline _LIBCPP_INLINE_VISIBILITY int __popcount(unsigned __x) {	171	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned __x) {
140	static_assert(sizeof(unsigned) == 4, "");	172	static_assert(sizeof(unsigned) == 4, "");
141	return __popcnt(__x);	173	return __popcnt(__x);
142	}	174	}
143		175
144	inline _LIBCPP_INLINE_VISIBILITY int __popcount(unsigned long __x) {	176	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned long __x) {
145	static_assert(sizeof(unsigned long) == 4, "");	177	static_assert(sizeof(unsigned long) == 4, "");
146	return __popcnt(__x);	178	return __popcnt(__x);
147	}	179	}
148		180
149	inline _LIBCPP_INLINE_VISIBILITY int __popcount(unsigned long long __x) {	181	inline _LIBCPP_INLINE_VISIBILITY int __libcpp_popcount(unsigned long long __x) {
150	static_assert(sizeof(unsigned long long) == 8, "");	182	static_assert(sizeof(unsigned long long) == 8, "");
151	return __popcnt64(__x);	183	return __popcnt64(__x);
152	}	184	}
153		185
154	#endif // _LIBCPP_COMPILER_MSVC	186	#endif // _LIBCPP_COMPILER_MSVC
155		187
		188	template <class _Tp>
		189	using __bitop_unsigned_integer _LIBCPP_NODEBUG_TYPE = integral_constant<bool,
		190	is_integral<_Tp>::value &&
		191	is_unsigned<_Tp>::value &&
		192	_IsNotSame<typename remove_cv<_Tp>::type, bool>::value &&
		193	_IsNotSame<typename remove_cv<_Tp>::type, signed char>::value &&
		194	_IsNotSame<typename remove_cv<_Tp>::type, wchar_t>::value &&
		195	_IsNotSame<typename remove_cv<_Tp>::type, char16_t>::value &&
		196	_IsNotSame<typename remove_cv<_Tp>::type, char32_t>::value
		197	>;
		198
		199
		200	template<class _Tp>
		201	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		202	_Tp __rotl(_Tp __t, unsigned int __cnt) _NOEXCEPT
		203	{
		204	static_assert(__bitop_unsigned_integer<_Tp>::value, "__rotl requires unsigned");
		205	const unsigned int __dig = numeric_limits<_Tp>::digits;
		206	if ((__cnt % __dig) == 0)
		207	return __t;
		208	return (__t << (__cnt % __dig)) \| (__t >> (__dig - (__cnt % __dig)));
		209	}
		210
		211
		212	template<class _Tp>
		213	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		214	_Tp __rotr(_Tp __t, unsigned int __cnt) _NOEXCEPT
		215	{
		216	static_assert(__bitop_unsigned_integer<_Tp>::value, "__rotr requires unsigned");
		217	const unsigned int __dig = numeric_limits<_Tp>::digits;
		218	if ((__cnt % __dig) == 0)
		219	return __t;
		220	return (__t >> (__cnt % __dig)) \| (__t << (__dig - (__cnt % __dig)));
		221	}
		222
		223
		224
		225	template<class _Tp>
		226	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		227	int __countr_zero(_Tp __t) _NOEXCEPT
		228	{
		229	static_assert(__bitop_unsigned_integer<_Tp>::value, "__countr_zero requires unsigned");
		230	if (__t == 0)
		231	return numeric_limits<_Tp>::digits;
		232
		233	if (sizeof(_Tp) <= sizeof(unsigned int))
		234	return __libcpp_ctz(static_cast<unsigned int>(__t));
		235	else if (sizeof(_Tp) <= sizeof(unsigned long))
		236	return __libcpp_ctz(static_cast<unsigned long>(__t));
		237	else if (sizeof(_Tp) <= sizeof(unsigned long long))
		238	return __libcpp_ctz(static_cast<unsigned long long>(__t));
		239	else
		240	{
		241	int __ret = 0;
		242	int __iter = 0;
		243	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
		244	while ((__iter = __libcpp_ctz(static_cast<unsigned long long>(__t))) == __ulldigits)
		245	{
		246	__ret += __iter;
		247	__t >>= __ulldigits;
		248	}
		249	return __ret + __iter;
		250	}
		251	}
		252
		253	template<class _Tp>
		254	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		255	int __countl_zero(_Tp __t) _NOEXCEPT
		256	{
		257	static_assert(__bitop_unsigned_integer<_Tp>::value, "__countl_zero requires unsigned");
		258	if (__t == 0)
		259	return numeric_limits<_Tp>::digits;
		260
		261	if (sizeof(_Tp) <= sizeof(unsigned int))
		262	return __libcpp_clz(static_cast<unsigned int>(__t))
		263	- (numeric_limits<unsigned int>::digits - numeric_limits<_Tp>::digits);
		264	else if (sizeof(_Tp) <= sizeof(unsigned long))
		265	return __libcpp_clz(static_cast<unsigned long>(__t))
		266	- (numeric_limits<unsigned long>::digits - numeric_limits<_Tp>::digits);
		267	else if (sizeof(_Tp) <= sizeof(unsigned long long))
		268	return __libcpp_clz(static_cast<unsigned long long>(__t))
		269	- (numeric_limits<unsigned long long>::digits - numeric_limits<_Tp>::digits);
		270	else
		271	{
		272	int __ret = 0;
		273	int __iter = 0;
		274	const unsigned int __ulldigits = numeric_limits<unsigned long long>::digits;
		275	while (true) {
		276	__t = __rotr(__t, __ulldigits);
		277	if ((__iter = __countl_zero(static_cast<unsigned long long>(__t))) != __ulldigits)
		278	break;
		279	__ret += __iter;
		280	}
		281	return __ret + __iter;
		282	}
		283	}
		284
		285	template<class _Tp>
		286	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		287	int __countl_one(_Tp __t) _NOEXCEPT
		288	{
		289	static_assert(__bitop_unsigned_integer<_Tp>::value, "__countl_one requires unsigned");
		290	return __t != numeric_limits<_Tp>::max()
		291	? __countl_zero(static_cast<_Tp>(~__t))
		292	: numeric_limits<_Tp>::digits;
		293	}
		294
		295
		296	template<class _Tp>
		297	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		298	int __countr_one(_Tp __t) _NOEXCEPT
		299	{
		300	static_assert(__bitop_unsigned_integer<_Tp>::value, "__countr_one requires unsigned");
		301	return __t != numeric_limits<_Tp>::max()
		302	? __countr_zero(static_cast<_Tp>(~__t))
		303	: numeric_limits<_Tp>::digits;
		304	}
		305
		306
		307	template<class _Tp>
		308	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		309	int
		310	__popcount(_Tp __t) _NOEXCEPT
		311	{
		312	static_assert(__bitop_unsigned_integer<_Tp>::value, "__libcpp_popcount requires unsigned");
		313	if (sizeof(_Tp) <= sizeof(unsigned int))
		314	return __libcpp_popcount(static_cast<unsigned int>(__t));
		315	else if (sizeof(_Tp) <= sizeof(unsigned long))
		316	return __libcpp_popcount(static_cast<unsigned long>(__t));
		317	else if (sizeof(_Tp) <= sizeof(unsigned long long))
		318	return __libcpp_popcount(static_cast<unsigned long long>(__t));
		319	else
		320	{
		321	int __ret = 0;
		322	while (__t != 0)
		323	{
		324	__ret += __libcpp_popcount(static_cast<unsigned long long>(__t));
		325	__t >>= numeric_limits<unsigned long long>::digits;
		326	}
		327	return __ret;
		328	}
		329	}
		330
		331
		332	// integral log base 2
		333	template<class _Tp>
		334	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
		335	unsigned __bit_log2(_Tp __t) _NOEXCEPT
		336	{
		337	static_assert(__bitop_unsigned_integer<_Tp>::value, "__bit_log2 requires unsigned");
		338	return std::numeric_limits<_Tp>::digits - 1 - __countl_zero(__t);
		339	}
		340
		341	template <class _Tp>
		342	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
		343	bool __ispow2(_Tp __t) _NOEXCEPT
		344	{
		345	static_assert(__bitop_unsigned_integer<_Tp>::value, "__ispow2 requires unsigned");
		346	return __t != 0 && (((__t & (__t - 1)) == 0));
		347	}
		348
		349
		350	#if _LIBCPP_STD_VER > 17
		351
		352	template<class _Tp>
		353	_LIBCPP_INLINE_VISIBILITY constexpr
		354	enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
		355	rotl(_Tp __t, unsigned int __cnt) noexcept
		356	{
		357	return __rotl(__t, __cnt);
		358	}
		359
		360
		361	// rotr
		362	template<class _Tp>
		363	_LIBCPP_INLINE_VISIBILITY constexpr
		364	enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
		365	rotr(_Tp __t, unsigned int __cnt) noexcept
		366	{
		367	return __rotr(__t, __cnt);
		368	}
		369
		370
		371	template<class _Tp>
		372	_LIBCPP_INLINE_VISIBILITY constexpr
		373	enable_if_t<__bitop_unsigned_integer<_Tp>::value, int>
		374	countl_zero(_Tp __t) noexcept
		375	{
		376	return __countl_zero(__t);
		377	}
		378
		379
		380	template<class _Tp>
		381	_LIBCPP_INLINE_VISIBILITY constexpr
		382	enable_if_t<__bitop_unsigned_integer<_Tp>::value, int>
		383	countl_one(_Tp __t) noexcept
		384	{
		385	return __countl_one(__t);
		386	}
		387
		388
		389	template<class _Tp>
		390	_LIBCPP_INLINE_VISIBILITY constexpr
		391	enable_if_t<__bitop_unsigned_integer<_Tp>::value, int>
		392	countr_zero(_Tp __t) noexcept
		393	{
		394	return __countr_zero(__t);
		395	}
		396
		397
		398	template<class _Tp>
		399	_LIBCPP_INLINE_VISIBILITY constexpr
		400	enable_if_t<__bitop_unsigned_integer<_Tp>::value, int>
		401	countr_one(_Tp __t) noexcept
		402	{
		403	return __countr_one(__t);
		404	}
		405
		406
		407	template<class _Tp>
		408	_LIBCPP_INLINE_VISIBILITY constexpr
		409	enable_if_t<__bitop_unsigned_integer<_Tp>::value, int>
		410	popcount(_Tp __t) noexcept
		411	{
		412	return __popcount(__t);
		413	}
		414
		415
		416	template <class _Tp>
		417	_LIBCPP_INLINE_VISIBILITY constexpr
		418	enable_if_t<__bitop_unsigned_integer<_Tp>::value, bool>
		419	ispow2(_Tp __t) noexcept
		420	{
		421	return __ispow2(__t);
		422	}
		423
		424	template <class _Tp>
		425	_LIBCPP_INLINE_VISIBILITY constexpr
		426	enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
		427	floor2(_Tp __t) noexcept
		428	{
		429	return __t == 0 ? 0 : _Tp{1} << __bit_log2(__t);
		430	}
		431
		432	template <class _Tp>
		433	_LIBCPP_INLINE_VISIBILITY constexpr
		434	enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
		435	ceil2(_Tp __t) noexcept
		436	{
		437	if (__t < 2) return 1;
		438	const unsigned __n = numeric_limits<_Tp>::digits - countl_zero((_Tp)(__t - 1u));
		439	_LIBCPP_DEBUG_ASSERT(__libcpp_is_constant_evaluated() \|\| __n != numeric_limits<_Tp>::digits, "Bad input to ceil2");
		440
		441	if constexpr (sizeof(_Tp) >= sizeof(unsigned))
		442	return _Tp{1} << __n;
		443	else
		444	{
		445	const unsigned __extra = numeric_limits<unsigned>::digits - numeric_limits<_Tp>::digits;
		446	const unsigned __retVal = 1u << (__n + __extra);
		447	return (_Tp) (__retVal >> __extra);
		448	}
		449	}
		450
		451	template <class _Tp>
		452	_LIBCPP_INLINE_VISIBILITY constexpr
		453	enable_if_t<__bitop_unsigned_integer<_Tp>::value, _Tp>
		454	log2p1(_Tp __t) noexcept
		455	{
		456	return __t == 0 ? 0 : __bit_log2(__t) + 1;
		457	}
		458
		459	#endif // _LIBCPP_STD_VER > 17
		460
156	_LIBCPP_END_NAMESPACE_STD	461	_LIBCPP_END_NAMESPACE_STD
157		462
		463	_LIBCPP_POP_MACROS
		464
158	#endif // _LIBCPP_BIT	465	#endif // _LIBCPP_BIT

lib/libcxx/include/bitset+5-6

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- bitset ----------------------------------===//	2	//===---------------------------- bitset ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -680,7 +679,7 @@ public:	...	@@ -680,7 +679,7 @@ public:
680	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bitset() _NOEXCEPT {}	679	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bitset() _NOEXCEPT {}
681	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR	680	_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
682	bitset(unsigned long long __v) _NOEXCEPT : base(__v) {}	681	bitset(unsigned long long __v) _NOEXCEPT : base(__v) {}
683	template<class _CharT>	682	template<class _CharT, class = _EnableIf<_IsCharLikeType<_CharT>::value> >
684	explicit bitset(const _CharT* __str,	683	explicit bitset(const _CharT* __str,
685	typename basic_string<_CharT>::size_type __n = basic_string<_CharT>::npos,	684	typename basic_string<_CharT>::size_type __n = basic_string<_CharT>::npos,
686	_CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));	685	_CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
...	@@ -761,7 +760,7 @@ private:	...	@@ -761,7 +760,7 @@ private:
761	};	760	};
762		761
763	template <size_t _Size>	762	template <size_t _Size>
764	template<class _CharT>	763	template<class _CharT, class>
765	bitset<_Size>::bitset(const _CharT* __str,	764	bitset<_Size>::bitset(const _CharT* __str,
766	typename basic_string<_CharT>::size_type __n,	765	typename basic_string<_CharT>::size_type __n,
767	_CharT __zero, _CharT __one)	766	_CharT __zero, _CharT __one)

lib/libcxx/include/cassert+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- cassert -----------------------------------===//	2	//===-------------------------- cassert -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ccomplex+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- ccomplex ---------------------------------===//	2	//===--------------------------- ccomplex ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cctype+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- cctype ----------------------------------===//	2	//===---------------------------- cctype ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cerrno+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- cerrno ------------------------------------===//	2	//===-------------------------- cerrno ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cfenv+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- cfenv -----------------------------------===//	2	//===---------------------------- cfenv -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cfloat+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cfloat -----------------------------------===//	2	//===--------------------------- cfloat -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/charconv+21-22

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------ charconv ------------------------------===//	2	//===------------------------------ charconv ------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -97,7 +96,7 @@ _LIBCPP_FUNC_VIS char* __u64toa(uint64_t __value, char* __buffer);	...	@@ -97,7 +96,7 @@ _LIBCPP_FUNC_VIS char* __u64toa(uint64_t __value, char* __buffer);
97	_LIBCPP_FUNC_VIS char* __u32toa(uint32_t __value, char* __buffer);	96	_LIBCPP_FUNC_VIS char* __u32toa(uint32_t __value, char* __buffer);
98	}	97	}
99		98
100	#if _LIBCPP_STD_VER > 11	99	#ifndef _LIBCPP_CXX03_LANG
101		100
102	enum class _LIBCPP_ENUM_VIS chars_format	101	enum class _LIBCPP_ENUM_VIS chars_format
103	{	102	{
...	@@ -125,7 +124,7 @@ void from_chars(const char, const char, bool, int = 10) = delete;	...	@@ -125,7 +124,7 @@ void from_chars(const char, const char, bool, int = 10) = delete;
125	namespace __itoa	124	namespace __itoa
126	{	125	{
127		126
128	static constexpr uint64_t __pow10_64[] = {	127	static _LIBCPP_CONSTEXPR uint64_t __pow10_64[] = {
129	UINT64_C(0),	128	UINT64_C(0),
130	UINT64_C(10),	129	UINT64_C(10),
131	UINT64_C(100),	130	UINT64_C(100),
...	@@ -148,7 +147,7 @@ static constexpr uint64_t __pow10_64[] = {	...	@@ -148,7 +147,7 @@ static constexpr uint64_t __pow10_64[] = {
148	UINT64_C(10000000000000000000),	147	UINT64_C(10000000000000000000),
149	};	148	};
150		149
151	static constexpr uint32_t __pow10_32[] = {	150	static _LIBCPP_CONSTEXPR uint32_t __pow10_32[] = {
152	UINT32_C(0), UINT32_C(10), UINT32_C(100),	151	UINT32_C(0), UINT32_C(10), UINT32_C(100),
153	UINT32_C(1000), UINT32_C(10000), UINT32_C(100000),	152	UINT32_C(1000), UINT32_C(10000), UINT32_C(100000),
154	UINT32_C(1000000), UINT32_C(10000000), UINT32_C(100000000),	153	UINT32_C(1000000), UINT32_C(10000000), UINT32_C(100000000),
...	@@ -173,7 +172,7 @@ struct _LIBCPP_HIDDEN __traits_base	...	@@ -173,7 +172,7 @@ struct _LIBCPP_HIDDEN __traits_base
173	return __u64toa(__v, __p);	172	return __u64toa(__v, __p);
174	}	173	}
175		174
176	static _LIBCPP_INLINE_VISIBILITY auto& __pow() { return __pow10_64; }	175	static _LIBCPP_INLINE_VISIBILITY decltype(__pow10_64)& __pow() { return __pow10_64; }
177	};	176	};
178		177
179	template <typename _Tp>	178	template <typename _Tp>
...	@@ -195,7 +194,7 @@ struct _LIBCPP_HIDDEN	...	@@ -195,7 +194,7 @@ struct _LIBCPP_HIDDEN
195	return __u32toa(__v, __p);	194	return __u32toa(__v, __p);
196	}	195	}
197		196
198	static _LIBCPP_INLINE_VISIBILITY auto& __pow() { return __pow10_32; }	197	static _LIBCPP_INLINE_VISIBILITY decltype(__pow10_32)& __pow() { return __pow10_32; }
199	};	198	};
200		199
201	template <typename _Tp>	200	template <typename _Tp>
...	@@ -240,7 +239,7 @@ __mul_overflowed(_Tp __a, _Up __b, _Tp& __r)	...	@@ -240,7 +239,7 @@ __mul_overflowed(_Tp __a, _Up __b, _Tp& __r)
240	template <typename _Tp>	239	template <typename _Tp>
241	struct _LIBCPP_HIDDEN __traits : __traits_base<_Tp>	240	struct _LIBCPP_HIDDEN __traits : __traits_base<_Tp>
242	{	241	{
243	static constexpr int digits = numeric_limits<_Tp>::digits10 + 1;	242	static _LIBCPP_CONSTEXPR int digits = numeric_limits<_Tp>::digits10 + 1;
244	using __traits_base<_Tp>::__pow;	243	using __traits_base<_Tp>::__pow;
245	using typename __traits_base<_Tp>::type;	244	using typename __traits_base<_Tp>::type;
246		245
...	@@ -286,10 +285,10 @@ __complement(_Tp __x)	...	@@ -286,10 +285,10 @@ __complement(_Tp __x)
286	}	285	}
287		286
288	template <typename _Tp>	287	template <typename _Tp>
289	inline _LIBCPP_INLINE_VISIBILITY auto	288	inline _LIBCPP_INLINE_VISIBILITY typename make_unsigned<_Tp>::type
290	__to_unsigned(_Tp __x)	289	__to_unsigned(_Tp __x)
291	{	290	{
292	return static_cast<make_unsigned_t<_Tp>>(__x);	291	return static_cast<typename make_unsigned<_Tp>::type>(__x);
293	}	292	}
294		293
295	template <typename _Tp>	294	template <typename _Tp>
...	@@ -315,7 +314,7 @@ __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type)	...	@@ -315,7 +314,7 @@ __to_chars_itoa(char* __first, char* __last, _Tp __value, false_type)
315		314
316	#if !defined(_LIBCPP_COMPILER_MSVC)	315	#if !defined(_LIBCPP_COMPILER_MSVC)
317	if (__tx::digits <= __diff \|\| __tx::__width(__value) <= __diff)	316	if (__tx::digits <= __diff \|\| __tx::__width(__value) <= __diff)
318	return {__tx::__convert(__value, __first), {}};	317	return {__tx::__convert(__value, __first), errc(0)};
319	else	318	else
320	return {__last, errc::value_too_large};	319	return {__last, errc::value_too_large};
321	#else	320	#else
...	@@ -380,14 +379,14 @@ __to_chars_integral(char* __first, char* __last, _Tp __value, int __base,	...	@@ -380,14 +379,14 @@ __to_chars_integral(char* __first, char* __last, _Tp __value, int __base,
380	}	379	}
381	}	380	}
382		381
383	template <typename _Tp, enable_if_t<is_integral<_Tp>::value, int> = 0>	382	template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
384	inline _LIBCPP_INLINE_VISIBILITY to_chars_result	383	inline _LIBCPP_INLINE_VISIBILITY to_chars_result
385	to_chars(char* __first, char* __last, _Tp __value)	384	to_chars(char* __first, char* __last, _Tp __value)
386	{	385	{
387	return __to_chars_itoa(__first, __last, __value, is_signed<_Tp>());	386	return __to_chars_itoa(__first, __last, __value, is_signed<_Tp>());
388	}	387	}
389		388
390	template <typename _Tp, enable_if_t<is_integral<_Tp>::value, int> = 0>	389	template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
391	inline _LIBCPP_INLINE_VISIBILITY to_chars_result	390	inline _LIBCPP_INLINE_VISIBILITY to_chars_result
392	to_chars(char* __first, char* __last, _Tp __value, int __base)	391	to_chars(char* __first, char* __last, _Tp __value, int __base)
393	{	392	{
...	@@ -502,7 +501,7 @@ __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,	...	@@ -502,7 +501,7 @@ __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
502	return __r;	501	return __r;
503	}	502	}
504		503
505	template <typename _Tp, enable_if_t<is_unsigned<_Tp>::value, int> = 0>	504	template <typename _Tp, typename enable_if<is_unsigned<_Tp>::value, int>::type = 0>
506	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	505	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
507	__from_chars_atoi(const char* __first, const char* __last, _Tp& __value)	506	__from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
508	{	507	{
...	@@ -528,7 +527,7 @@ __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)	...	@@ -528,7 +527,7 @@ __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
528	});	527	});
529	}	528	}
530		529
531	template <typename _Tp, enable_if_t<is_signed<_Tp>::value, int> = 0>	530	template <typename _Tp, typename enable_if<is_signed<_Tp>::value, int>::type = 0>
532	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	531	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
533	__from_chars_atoi(const char* __first, const char* __last, _Tp& __value)	532	__from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
534	{	533	{
...	@@ -536,7 +535,7 @@ __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)	...	@@ -536,7 +535,7 @@ __from_chars_atoi(const char* __first, const char* __last, _Tp& __value)
536	return __sign_combinator(__first, __last, __value, __from_chars_atoi<__t>);	535	return __sign_combinator(__first, __last, __value, __from_chars_atoi<__t>);
537	}	536	}
538		537
539	template <typename _Tp, enable_if_t<is_unsigned<_Tp>::value, int> = 0>	538	template <typename _Tp, typename enable_if<is_unsigned<_Tp>::value, int>::type = 0>
540	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	539	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
541	__from_chars_integral(const char* __first, const char* __last, _Tp& __value,	540	__from_chars_integral(const char* __first, const char* __last, _Tp& __value,
542	int __base)	541	int __base)
...	@@ -583,7 +582,7 @@ __from_chars_integral(const char* __first, const char* __last, _Tp& __value,	...	@@ -583,7 +582,7 @@ __from_chars_integral(const char* __first, const char* __last, _Tp& __value,
583	__base);	582	__base);
584	}	583	}
585		584
586	template <typename _Tp, enable_if_t<is_signed<_Tp>::value, int> = 0>	585	template <typename _Tp, typename enable_if<is_signed<_Tp>::value, int>::type = 0>
587	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	586	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
588	__from_chars_integral(const char* __first, const char* __last, _Tp& __value,	587	__from_chars_integral(const char* __first, const char* __last, _Tp& __value,
589	int __base)	588	int __base)
...	@@ -593,14 +592,14 @@ __from_chars_integral(const char* __first, const char* __last, _Tp& __value,	...	@@ -593,14 +592,14 @@ __from_chars_integral(const char* __first, const char* __last, _Tp& __value,
593	__from_chars_integral<__t>, __base);	592	__from_chars_integral<__t>, __base);
594	}	593	}
595		594
596	template <typename _Tp, enable_if_t<is_integral<_Tp>::value, int> = 0>	595	template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
597	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	596	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
598	from_chars(const char* __first, const char* __last, _Tp& __value)	597	from_chars(const char* __first, const char* __last, _Tp& __value)
599	{	598	{
600	return __from_chars_atoi(__first, __last, __value);	599	return __from_chars_atoi(__first, __last, __value);
601	}	600	}
602		601
603	template <typename _Tp, enable_if_t<is_integral<_Tp>::value, int> = 0>	602	template <typename _Tp, typename enable_if<is_integral<_Tp>::value, int>::type = 0>
604	inline _LIBCPP_INLINE_VISIBILITY from_chars_result	603	inline _LIBCPP_INLINE_VISIBILITY from_chars_result
605	from_chars(const char* __first, const char* __last, _Tp& __value, int __base)	604	from_chars(const char* __first, const char* __last, _Tp& __value, int __base)
606	{	605	{
...	@@ -608,7 +607,7 @@ from_chars(const char* __first, const char* __last, _Tp& __value, int __base)	...	@@ -608,7 +607,7 @@ from_chars(const char* __first, const char* __last, _Tp& __value, int __base)
608	return __from_chars_integral(__first, __last, __value, __base);	607	return __from_chars_integral(__first, __last, __value, __base);
609	}	608	}
610		609
611	#endif // _LIBCPP_STD_VER > 11	610	#endif // _LIBCPP_CXX03_LANG
612		611
613	_LIBCPP_END_NAMESPACE_STD	612	_LIBCPP_END_NAMESPACE_STD
614		613

lib/libcxx/include/chrono+47-62

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- chrono ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -1263,34 +1262,15 @@ operator*(const _Rep1& __s, const duration<_Rep2, _Period>& __d)
 // Duration /
-template <class _Duration, class _Rep, bool = __is_duration<_Rep>::value>
-struct __duration_divide_result
-{
-};
-template <class _Duration, class _Rep2,
-    bool = is_convertible<_Rep2,
-                          typename common_type<typename _Duration::rep, _Rep2>::type>::value>
-struct __duration_divide_imp
-{
-};
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_imp<duration<_Rep1, _Period>, _Rep2, true>
-{
-    typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period> type;
-};
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_result<duration<_Rep1, _Period>, _Rep2, false>
-    : __duration_divide_imp<duration<_Rep1, _Period>, _Rep2>
-{
-};
 template <class _Rep1, class _Period, class _Rep2>
 inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
+typename enable_if
+<
+    !__is_duration<_Rep2>::value &&
+      is_convertible<_Rep2, typename common_type<_Rep1, _Rep2>::type>::value,
+    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
+>::type
 operator/(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
 {
     typedef typename common_type<_Rep1, _Rep2>::type _Cr;
 @@ -1313,7 +1293,12 @@ operator/(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2
 template <class _Rep1, class _Period, class _Rep2>
 inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
+typename enable_if
+<
+    !__is_duration<_Rep2>::value &&
+      is_convertible<_Rep2, typename common_type<_Rep1, _Rep2>::type>::value,
+    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
+>::type
 operator%(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
 {
     typedef typename common_type<_Rep1, _Rep2>::type _Cr;
 @@ -1605,9 +1590,9 @@ using local_seconds = local_time<seconds>;
 using local_days    = local_time<days>;
-struct _LIBCPP_TYPE_VIS last_spec { explicit last_spec() = default; };
+struct last_spec { explicit last_spec() = default; };
-class _LIBCPP_TYPE_VIS day {
+class day {
 private:
     unsigned char __d;
 public:
 @@ -1672,7 +1657,7 @@ inline constexpr day& day::operator-=(const days& __dd) noexcept
 { *this = *this - __dd; return *this; }
-class _LIBCPP_TYPE_VIS month {
+class month {
 private:
     unsigned char __m;
 public:
 @@ -1743,21 +1728,21 @@ inline constexpr month& month::operator-=(const months& __dm) noexcept
 { *this = *this - __dm; return *this; }
-class _LIBCPP_TYPE_VIS year {
+class year {
 private:
     short __y;
 public:
     year() = default;
     explicit inline constexpr year(int __val) noexcept : __y(static_cast<short>(__val)) {}
-    inline constexpr year& operator++()    noexcept { ++__y; return *this; };
+    inline constexpr year& operator++()    noexcept { ++__y; return *this; }
-    inline constexpr year  operator++(int) noexcept { year __tmp = *this; ++(*this); return __tmp; };
+    inline constexpr year  operator++(int) noexcept { year __tmp = *this; ++(*this); return __tmp; }
-    inline constexpr year& operator--()    noexcept { --__y; return *this; };
+    inline constexpr year& operator--()    noexcept { --__y; return *this; }
-    inline constexpr year  operator--(int) noexcept { year __tmp = *this; --(*this); return __tmp; };
+    inline constexpr year  operator--(int) noexcept { year __tmp = *this; --(*this); return __tmp; }
            constexpr year& operator+=(const years& __dy) noexcept;
            constexpr year& operator-=(const years& __dy) noexcept;
     inline constexpr year operator+() const noexcept { return *this; }
-    inline constexpr year operator-() const noexcept { return year{-__y}; };
+    inline constexpr year operator-() const noexcept { return year{-__y}; }
     inline constexpr bool is_leap() const noexcept { return __y % 4 == 0 && (__y % 100 != 0 || __y % 400 == 0); }
     explicit inline constexpr operator int() const noexcept { return __y; }
 @@ -1817,10 +1802,10 @@ inline constexpr year& year::operator-=(const years& __dy) noexcept
 inline constexpr bool year::ok() const noexcept
 { return static_cast<int>(min()) <= __y && __y <= static_cast<int>(max()); }
-class _LIBCPP_TYPE_VIS weekday_indexed;
+class weekday_indexed;
-class _LIBCPP_TYPE_VIS weekday_last;
+class weekday_last;
-class _LIBCPP_TYPE_VIS weekday {
+class weekday {
 private:
     unsigned char __wd;
 public:
 @@ -1906,7 +1891,7 @@ inline constexpr weekday& weekday::operator-=(const days& __dd) noexcept
 { *this = *this - __dd; return *this; }
-class _LIBCPP_TYPE_VIS weekday_indexed {
+class weekday_indexed {
 private:
     _VSTD::chrono::weekday __wd;
     unsigned char          __idx;
 @@ -1928,7 +1913,7 @@ bool operator!=(const weekday_indexed& __lhs, const weekday_indexed& __rhs) noex
 { return !(__lhs == __rhs); }
-class _LIBCPP_TYPE_VIS weekday_last {
+class weekday_last {
 private:
     _VSTD::chrono::weekday __wd;
 public:
 @@ -1949,7 +1934,7 @@ bool operator!=(const weekday_last& __lhs, const weekday_last& __rhs) noexcept
 inline constexpr
 weekday_indexed weekday::operator[](unsigned __index) const noexcept { return weekday_indexed{*this, __index}; }
 inline constexpr
 weekday_last    weekday::operator[](last_spec) const noexcept { return weekday_last{*this}; }
 @@ -1976,7 +1961,7 @@ inline constexpr month November{11};
 inline constexpr month December{12};
-class _LIBCPP_TYPE_VIS month_day {
+class month_day {
 private:
    chrono::month __m;
    chrono::day   __d;
 @@ -2051,7 +2036,7 @@ bool operator>=(const month_day& __lhs, const month_day& __rhs) noexcept
-class _LIBCPP_TYPE_VIS month_day_last {
+class month_day_last {
 private:
     chrono::month __m;
 public:
 @@ -2102,7 +2087,7 @@ month_day_last operator/(last_spec, int __rhs) noexcept
 { return month_day_last{month(__rhs)}; }
-class _LIBCPP_TYPE_VIS month_weekday {
+class month_weekday {
 private:
     chrono::month __m;
     chrono::weekday_indexed __wdi;
 @@ -2140,7 +2125,7 @@ month_weekday operator/(const weekday_indexed& __lhs, int __rhs) noexcept
 { return month_weekday{month(__rhs), __lhs}; }
-class _LIBCPP_TYPE_VIS month_weekday_last {
+class month_weekday_last {
     chrono::month        __m;
     chrono::weekday_last __wdl;
   public:
 @@ -2177,7 +2162,7 @@ month_weekday_last operator/(const weekday_last& __lhs, int __rhs) noexcept
 { return month_weekday_last{month(__rhs), __lhs}; }
-class _LIBCPP_TYPE_VIS year_month {
+class year_month {
     chrono::year  __y;
     chrono::month __m;
 public:
 @@ -2251,7 +2236,7 @@ constexpr year_month operator-(const year_month& __lhs, const years& __rhs) noex
 class year_month_day_last;
-class _LIBCPP_TYPE_VIS year_month_day {
+class year_month_day {
 private:
     chrono::year  __y;
     chrono::month __m;
 @@ -2260,7 +2245,7 @@ public:
      year_month_day() = default;
      inline constexpr year_month_day(
             const chrono::year& __yval, const chrono::month& __mval, const chrono::day& __dval) noexcept
             : __y{__yval}, __m{__mval}, __d{__dval} {}
             constexpr year_month_day(const year_month_day_last& __ymdl) noexcept;
      inline constexpr year_month_day(const sys_days& __sysd) noexcept
             : year_month_day(__from_days(__sysd.time_since_epoch())) {}
 @@ -2405,7 +2390,7 @@ inline constexpr year_month_day& year_month_day::operator-=(const months& __dm)
 inline constexpr year_month_day& year_month_day::operator+=(const years& __dy)  noexcept { *this = *this + __dy; return *this; }
 inline constexpr year_month_day& year_month_day::operator-=(const years& __dy)  noexcept { *this = *this - __dy; return *this; }
-class _LIBCPP_TYPE_VIS year_month_day_last {
+class year_month_day_last {
 private:
     chrono::year           __y;
     chrono::month_day_last __mdl;
 @@ -2515,7 +2500,7 @@ inline constexpr year_month_day_last& year_month_day_last::operator+=(const year
 inline constexpr year_month_day_last& year_month_day_last::operator-=(const years& __dy)  noexcept { *this = *this - __dy; return *this; }
 inline constexpr year_month_day::year_month_day(const year_month_day_last& __ymdl) noexcept
     : __y{__ymdl.year()}, __m{__ymdl.month()}, __d{__ymdl.day()} {}
 inline constexpr bool year_month_day::ok() const noexcept
 {
 @@ -2523,7 +2508,7 @@ inline constexpr bool year_month_day::ok() const noexcept
     return chrono::day{1} <= __d && __d <= (__y / __m / last).day();
 }
-class _LIBCPP_TYPE_VIS year_month_weekday {
+class year_month_weekday {
     chrono::year            __y;
     chrono::month           __m;
     chrono::weekday_indexed __wdi;
 @@ -2566,7 +2551,7 @@ year_month_weekday year_month_weekday::__from_days(days __d) noexcept
     const sys_days      __sysd{__d};
     const chrono::weekday __wd = chrono::weekday(__sysd);
     const year_month_day __ymd = year_month_day(__sysd);
     return year_month_weekday{__ymd.year(), __ymd.month(),
                               __wd[(static_cast<unsigned>(__ymd.day())-1)/7+1]};
 }
 @@ -2637,7 +2622,7 @@ inline constexpr year_month_weekday& year_month_weekday::operator-=(const months
 inline constexpr year_month_weekday& year_month_weekday::operator+=(const years& __dy)  noexcept { *this = *this + __dy; return *this; }
 inline constexpr year_month_weekday& year_month_weekday::operator-=(const years& __dy)  noexcept { *this = *this - __dy; return *this; }
-class _LIBCPP_TYPE_VIS year_month_weekday_last {
+class year_month_weekday_last {
 private:
     chrono::year         __y;
     chrono::month        __m;
 @@ -2658,9 +2643,9 @@ public:
     inline constexpr operator                 sys_days() const noexcept { return   sys_days{__to_days()}; }
     inline explicit constexpr operator      local_days() const noexcept { return local_days{__to_days()}; }
     inline constexpr bool ok() const noexcept { return __y.ok() && __m.ok() && __wdl.ok(); }
     constexpr days __to_days() const noexcept;
 };
 inline constexpr
 @@ -2698,7 +2683,7 @@ year_month_weekday_last operator/(const month_weekday_last& __lhs, const year& _
 inline constexpr
 year_month_weekday_last operator/(const month_weekday_last& __lhs, int __rhs) noexcept
 { return year(__rhs) / __lhs; }
 inline constexpr
 @@ -2810,7 +2795,7 @@ inline namespace literals
     {
         return chrono::day(static_cast<unsigned>(__d));
     }
     constexpr chrono::year operator ""y(unsigned long long __y) noexcept
     {
         return chrono::year(static_cast<int>(__y));
 @@ -2842,7 +2827,7 @@ struct _FilesystemClock {
   static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;
-  _LIBCPP_FUNC_VIS static time_point now() noexcept;
+  _LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_FUNC_VIS static time_point now() noexcept;
   _LIBCPP_INLINE_VISIBILITY
   static time_t to_time_t(const time_point& __t) noexcept {

lib/libcxx/include/cinttypes+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cinttypes --------------------------------===//	2	//===--------------------------- cinttypes --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ciso646+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- ciso646 ----------------------------------===//	2	//===--------------------------- ciso646 ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/climits+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- climits ----------------------------------===//	2	//===--------------------------- climits ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/clocale+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- clocale ----------------------------------===//	2	//===--------------------------- clocale ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cmath+30-5

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- cmath -----------------------------------===//	2	//===---------------------------- cmath -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -530,7 +529,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double hypot( long double x, long double y	...	@@ -530,7 +529,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double hypot( long double x, long double y
530		529
531	template <class _A1, class _A2, class _A3>	530	template <class _A1, class _A2, class _A3>
532	inline _LIBCPP_INLINE_VISIBILITY	531	inline _LIBCPP_INLINE_VISIBILITY
533	typename __lazy_enable_if	532	typename _EnableIf
534	<	533	<
535	is_arithmetic<_A1>::value &&	534	is_arithmetic<_A1>::value &&
536	is_arithmetic<_A2>::value &&	535	is_arithmetic<_A2>::value &&
...	@@ -607,6 +606,32 @@ __libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT	...	@@ -607,6 +606,32 @@ __libcpp_isfinite_or_builtin(_A1 __lcpp_x) _NOEXCEPT
607	return isfinite(__lcpp_x);	606	return isfinite(__lcpp_x);
608	}	607	}
609		608
		609	#if _LIBCPP_STD_VER > 17
		610	template <typename _Fp>
		611	constexpr
		612	_Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {
		613	if ((__a <= 0 && __b >= 0) \|\| (__a >= 0 && __b <= 0))
		614	return __t * __b + (1 - __t) * __a;
		615
		616	if (__t == 1) return __b;
		617	const _Fp __x = __a + __t * (__b - __a);
		618	if (__t > 1 == __b > __a)
		619	return __b < __x ? __x : __b;
		620	else
		621	return __x < __b ? __x : __b;
		622	}
		623
		624	constexpr float
		625	lerp(float __a, float __b, float __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
		626
		627	constexpr double
		628	lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
		629
		630	constexpr long double
		631	lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); }
		632
		633	#endif // _LIBCPP_STD_VER > 17
		634
610	_LIBCPP_END_NAMESPACE_STD	635	_LIBCPP_END_NAMESPACE_STD
611		636
612	#endif // _LIBCPP_CMATH	637	#endif // _LIBCPP_CMATH

lib/libcxx/include/codecvt+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- codecvt -----------------------------------===//	2	//===-------------------------- codecvt -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/compare+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- compare -----------------------------------===//	2	//===-------------------------- compare -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/complex+5-6

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- complex ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -1450,10 +1449,10 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
     return __os << __s.str();
 }
 #if _LIBCPP_STD_VER > 11
 // Literal suffix for complex number literals [complex.literals]
 inline namespace literals
 {
   inline namespace complex_literals
   {
     constexpr complex<long double> operator""il(long double __im)

lib/libcxx/include/complex.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- complex.h --------------------------------===//	2	//===--------------------------- complex.h --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/condition_variable+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------- condition_variable ----------------------------===//	2	//===---------------------- condition_variable ----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/csetjmp+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- csetjmp ----------------------------------===//	2	//===--------------------------- csetjmp ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/csignal+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- csignal ----------------------------------===//	2	//===--------------------------- csignal ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstdarg+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstdarg ----------------------------------===//	2	//===--------------------------- cstdarg ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstdbool+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstdbool ---------------------------------===//	2	//===--------------------------- cstdbool ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstddef+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstddef ----------------------------------===//	2	//===--------------------------- cstddef ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstdint+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstdint ----------------------------------===//	2	//===--------------------------- cstdint ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstdio+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- cstdio ----------------------------------===//	2	//===---------------------------- cstdio ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstdlib+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstdlib ----------------------------------===//	2	//===--------------------------- cstdlib ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cstring+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cstring ----------------------------------===//	2	//===--------------------------- cstring ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ctgmath+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- ctgmath -----------------------------------===//	2	//===-------------------------- ctgmath -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ctime+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- ctime -----------------------------------===//	2	//===---------------------------- ctime -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ctype.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- ctype.h ---------------------------------===//	2	//===---------------------------- ctype.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cwchar+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cwchar -----------------------------------===//	2	//===--------------------------- cwchar -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/cwctype+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- cwctype ----------------------------------===//	2	//===--------------------------- cwctype ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/deque+15-16

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- deque -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -1331,21 +1330,21 @@ public:
     // element access:
     _LIBCPP_INLINE_VISIBILITY
-    reference operator[](size_type __i);
+    reference operator[](size_type __i) _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
-    const_reference operator[](size_type __i) const;
+    const_reference operator[](size_type __i) const _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
     reference at(size_type __i);
     _LIBCPP_INLINE_VISIBILITY
     const_reference at(size_type __i) const;
     _LIBCPP_INLINE_VISIBILITY
-    reference front();
+    reference front() _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const;
+    const_reference front() const _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
-    reference back();
+    reference back() _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const;
+    const_reference back() const _NOEXCEPT;
     // 23.2.2.3 modifiers:
     void push_front(const value_type& __v);
 @@ -1746,7 +1745,7 @@ deque<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::operator[](size_type __i)
+deque<_Tp, _Allocator>::operator[](size_type __i) _NOEXCEPT
 {
     size_type __p = __base::__start_ + __i;
     return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
 @@ -1755,7 +1754,7 @@ deque<_Tp, _Allocator>::operator[](size_type __i)
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::operator[](size_type __i) const
+deque<_Tp, _Allocator>::operator[](size_type __i) const _NOEXCEPT
 {
     size_type __p = __base::__start_ + __i;
     return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
 @@ -1786,7 +1785,7 @@ deque<_Tp, _Allocator>::at(size_type __i) const
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::front()
+deque<_Tp, _Allocator>::front() _NOEXCEPT
 {
     return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
                                       + __base::__start_ % __base::__block_size);
 @@ -1795,7 +1794,7 @@ deque<_Tp, _Allocator>::front()
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::front() const
+deque<_Tp, _Allocator>::front() const _NOEXCEPT
 {
     return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
                                       + __base::__start_ % __base::__block_size);
 @@ -1804,7 +1803,7 @@ deque<_Tp, _Allocator>::front() const
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::back()
+deque<_Tp, _Allocator>::back() _NOEXCEPT
 {
     size_type __p = __base::size() + __base::__start_ - 1;
     return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
 @@ -1813,7 +1812,7 @@ deque<_Tp, _Allocator>::back()
 template <class _Tp, class _Allocator>
 inline
 typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::back() const
+deque<_Tp, _Allocator>::back() const _NOEXCEPT
 {
     size_type __p = __base::size() + __base::__start_ - 1;
     return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);

lib/libcxx/include/errno.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- errno.h -----------------------------------===//	2	//===-------------------------- errno.h -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/exception+6-15

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- exception ---------------------------------===//	2	//===-------------------------- exception ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -83,7 +82,7 @@ template <class E> void rethrow_if_nested(const E& e);	...	@@ -83,7 +82,7 @@ template <class E> void rethrow_if_nested(const E& e);
83	#include <type_traits>	82	#include <type_traits>
84	#include <version>	83	#include <version>
85		84
86	#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)	85	#if defined(_LIBCPP_ABI_VCRUNTIME)
87	#include <vcruntime_exception.h>	86	#include <vcruntime_exception.h>
88	#endif	87	#endif
89		88
...	@@ -94,7 +93,7 @@ template <class E> void rethrow_if_nested(const E& e);	...	@@ -94,7 +93,7 @@ template <class E> void rethrow_if_nested(const E& e);
94	namespace std // purposefully not using versioning namespace	93	namespace std // purposefully not using versioning namespace
95	{	94	{
96		95
97	#if !defined(_LIBCPP_ABI_MICROSOFT) \|\| defined(_LIBCPP_NO_VCRUNTIME)	96	#if !defined(_LIBCPP_ABI_VCRUNTIME)
98	class _LIBCPP_EXCEPTION_ABI exception	97	class _LIBCPP_EXCEPTION_ABI exception
99	{	98	{
100	public:	99	public:
...	@@ -111,7 +110,7 @@ public:	...	@@ -111,7 +110,7 @@ public:
111	virtual ~bad_exception() _NOEXCEPT;	110	virtual ~bad_exception() _NOEXCEPT;
112	virtual const char* what() const _NOEXCEPT;	111	virtual const char* what() const _NOEXCEPT;
113	};	112	};
114	#endif // !_LIBCPP_ABI_MICROSOFT \|\| _LIBCPP_NO_VCRUNTIME	113	#endif // !_LIBCPP_ABI_VCRUNTIME
115		114
116	#if _LIBCPP_STD_VER <= 14 \	115	#if _LIBCPP_STD_VER <= 14 \
117	\|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS) \	116	\|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS) \
...	@@ -261,11 +260,7 @@ struct __throw_with_nested;	...	@@ -261,11 +260,7 @@ struct __throw_with_nested;
261	template <class _Tp, class _Up>	260	template <class _Tp, class _Up>
262	struct __throw_with_nested<_Tp, _Up, true> {	261	struct __throw_with_nested<_Tp, _Up, true> {
263	_LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY void	262	_LIBCPP_NORETURN static inline _LIBCPP_INLINE_VISIBILITY void
264	#ifndef _LIBCPP_CXX03_LANG
265	__do_throw(_Tp&& __t)	263	__do_throw(_Tp&& __t)
266	#else
267	__do_throw (_Tp& __t)
268	#endif // _LIBCPP_CXX03_LANG
269	{	264	{
270	throw __nested<_Up>(_VSTD::forward<_Tp>(__t));	265	throw __nested<_Up>(_VSTD::forward<_Tp>(__t));
271	}	266	}
...	@@ -288,11 +283,7 @@ struct __throw_with_nested<_Tp, _Up, false> {	...	@@ -288,11 +283,7 @@ struct __throw_with_nested<_Tp, _Up, false> {
288	template <class _Tp>	283	template <class _Tp>
289	_LIBCPP_NORETURN	284	_LIBCPP_NORETURN
290	void	285	void
291	#ifndef _LIBCPP_CXX03_LANG
292	throw_with_nested(_Tp&& __t)	286	throw_with_nested(_Tp&& __t)
293	#else
294	throw_with_nested (_Tp& __t)
295	#endif // _LIBCPP_CXX03_LANG
296	{	287	{
297	#ifndef _LIBCPP_NO_EXCEPTIONS	288	#ifndef _LIBCPP_NO_EXCEPTIONS
298	typedef typename decay<_Tp>::type _Up;	289	typedef typename decay<_Tp>::type _Up;

lib/libcxx/include/experimental/__config+10-5

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- __config ---------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -37,8 +36,14 @@
   namespace chrono { namespace experimental { inline namespace fundamentals_v1 {
 #define _LIBCPP_END_NAMESPACE_CHRONO_LFTS _LIBCPP_END_NAMESPACE_STD } } }
+#if defined(_LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM)
+#   define _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM /* nothing */
+#else
+#   define _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM __attribute__((deprecated("std::experimental::filesystem has now been deprecated in favor of C++17's std::filesystem. Please stop using it and start using std::filesystem. This experimental version will be removed in LLVM 11. You can remove this warning by defining the _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM macro.")))
+#endif
 #define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL_FILESYSTEM \
-    _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL namespace filesystem { \
+    _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL namespace filesystem _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM { \
     inline namespace v1 {
 #define _LIBCPP_END_NAMESPACE_EXPERIMENTAL_FILESYSTEM \

lib/libcxx/include/experimental/__memory+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------------------------------------------------===//	2	//===----------------------------------------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/algorithm+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- algorithm ---------------------------------===//	2	//===-------------------------- algorithm ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/any deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===------------------------------- any ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_ANY
11	#define _LIBCPP_EXPERIMENTAL_ANY
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/any> has been removed. Use <any> instead.")
17	#else
18	# warning "<experimental/any> has been removed. Use <any> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_ANY

lib/libcxx/include/experimental/chrono deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===---------------------------- chrono ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_CHRONO
11	#define _LIBCPP_EXPERIMENTAL_CHRONO
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/chrono> has been removed. Use <chrono> instead.")
17	#else
18	# warning "<experimental/chrono> has been removed. Use <chrono> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_CHRONO

lib/libcxx/include/experimental/coroutine+6-7

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------- coroutine -----------------------------===//	2	//===----------------------------- coroutine -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -82,7 +81,7 @@ struct __coroutine_traits_sfinae<	...	@@ -82,7 +81,7 @@ struct __coroutine_traits_sfinae<
82	};	81	};
83		82
84	template <typename _Ret, typename... _Args>	83	template <typename _Ret, typename... _Args>
85	struct _LIBCPP_TEMPLATE_VIS coroutine_traits	84	struct coroutine_traits
86	: public __coroutine_traits_sfinae<_Ret>	85	: public __coroutine_traits_sfinae<_Ret>
87	{	86	{
88	};	87	};
...	@@ -299,7 +298,7 @@ noop_coroutine_handle noop_coroutine() _NOEXCEPT {	...	@@ -299,7 +298,7 @@ noop_coroutine_handle noop_coroutine() _NOEXCEPT {
299	}	298	}
300	#endif // __has_builtin(__builtin_coro_noop)	299	#endif // __has_builtin(__builtin_coro_noop)
301		300
302	struct _LIBCPP_TYPE_VIS suspend_never {	301	struct suspend_never {
303	_LIBCPP_INLINE_VISIBILITY	302	_LIBCPP_INLINE_VISIBILITY
304	bool await_ready() const _NOEXCEPT { return true; }	303	bool await_ready() const _NOEXCEPT { return true; }
305	_LIBCPP_INLINE_VISIBILITY	304	_LIBCPP_INLINE_VISIBILITY
...	@@ -308,7 +307,7 @@ struct _LIBCPP_TYPE_VIS suspend_never {	...	@@ -308,7 +307,7 @@ struct _LIBCPP_TYPE_VIS suspend_never {
308	void await_resume() const _NOEXCEPT {}	307	void await_resume() const _NOEXCEPT {}
309	};	308	};
310		309
311	struct _LIBCPP_TYPE_VIS suspend_always {	310	struct suspend_always {
312	_LIBCPP_INLINE_VISIBILITY	311	_LIBCPP_INLINE_VISIBILITY
313	bool await_ready() const _NOEXCEPT { return false; }	312	bool await_ready() const _NOEXCEPT { return false; }
314	_LIBCPP_INLINE_VISIBILITY	313	_LIBCPP_INLINE_VISIBILITY

lib/libcxx/include/experimental/deque+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- deque ------------------------------------===//	2	//===--------------------------- deque ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/filesystem+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- filesystem -------------------------------===//	2	//===--------------------------- filesystem -------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_FILESYSTEM	9	#ifndef _LIBCPP_EXPERIMENTAL_FILESYSTEM

lib/libcxx/include/experimental/forward_list+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- forward_list -----------------------------===//	2	//===--------------------------- forward_list -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/functional+6-10

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- functional --------------------------------===//	2	//===-------------------------- functional --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -110,8 +109,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS	...	@@ -110,8 +109,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
110	#if _LIBCPP_STD_VER > 11	109	#if _LIBCPP_STD_VER > 11
111	// default searcher	110	// default searcher
112	template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>	111	template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>
113	_LIBCPP_TYPE_VIS	112	class _LIBCPP_TYPE_VIS default_searcher {
114	class default_searcher {
115	public:	113	public:
116	_LIBCPP_INLINE_VISIBILITY	114	_LIBCPP_INLINE_VISIBILITY
117	default_searcher(_ForwardIterator __f, _ForwardIterator __l,	115	default_searcher(_ForwardIterator __f, _ForwardIterator __l,
...	@@ -209,8 +207,7 @@ public:	...	@@ -209,8 +207,7 @@ public:
209	template <class _RandomAccessIterator1,	207	template <class _RandomAccessIterator1,
210	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,	208	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,
211	class _BinaryPredicate = equal_to<>>	209	class _BinaryPredicate = equal_to<>>
212	_LIBCPP_TYPE_VIS	210	class _LIBCPP_TYPE_VIS boyer_moore_searcher {
213	class boyer_moore_searcher {
214	private:	211	private:
215	typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type difference_type;	212	typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type difference_type;
216	typedef typename std::iterator_traits<_RandomAccessIterator1>::value_type value_type;	213	typedef typename std::iterator_traits<_RandomAccessIterator1>::value_type value_type;
...	@@ -361,8 +358,7 @@ make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l,	...	@@ -361,8 +358,7 @@ make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l,
361	template <class _RandomAccessIterator1,	358	template <class _RandomAccessIterator1,
362	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,	359	class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,
363	class _BinaryPredicate = equal_to<>>	360	class _BinaryPredicate = equal_to<>>
364	_LIBCPP_TYPE_VIS	361	class _LIBCPP_TYPE_VIS boyer_moore_horspool_searcher {
365	class boyer_moore_horspool_searcher {
366	private:	362	private:
367	typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type difference_type;	363	typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type difference_type;
368	typedef typename std::iterator_traits<_RandomAccessIterator1>::value_type value_type;	364	typedef typename std::iterator_traits<_RandomAccessIterator1>::value_type value_type;

lib/libcxx/include/experimental/iterator+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------- iterator -------------------------------===//	2	//===----------------------------- iterator -------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/list+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- list ------------------------------------===//	2	//===--------------------------- list ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/map+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------- map ------------------------------------===//	2	//===----------------------------- map ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/memory_resource+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------ memory_resource -----------------------------===//	2	//===------------------------ memory_resource -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/numeric deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===--------------------------- numeric ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_NUMERIC
11	#define _LIBCPP_EXPERIMENTAL_NUMERIC
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/numeric> has been removed. Use <numeric> instead.")
17	#else
18	# warning "<experimental/numeric> has been removed. Use <numeric> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_NUMERIC

lib/libcxx/include/experimental/optional deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===-------------------------- optional ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_OPTIONAL
11	#define _LIBCPP_EXPERIMENTAL_OPTIONAL
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/optional> has been removed. Use <optional> instead.")
17	#else
18	# warning "<experimental/optional> has been removed. Use <optional> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_OPTIONAL

lib/libcxx/include/experimental/propagate_const+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------ propagate_const -----------------------------===//	2	//===------------------------ propagate_const -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/ratio deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===----------------------------- ratio ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_RATIO
11	#define _LIBCPP_EXPERIMENTAL_RATIO
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/ratio> has been removed. Use <ratio> instead.")
17	#else
18	# warning "<experimental/ratio> has been removed. Use <ratio> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_RATIO

lib/libcxx/include/experimental/regex+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------------- regex ----------------------------------===//	2	//===----------------------------- regex ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/set+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- list ------------------------------------===//	2	//===--------------------------- list ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/simd+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------- simd ---------------------------------===//	2	//===------------------------------- simd ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_SIMD	9	#ifndef _LIBCPP_EXPERIMENTAL_SIMD

lib/libcxx/include/experimental/string+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- string ----------------------------------===//	2	//===--------------------------- string ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/string_view deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===------------------------ string_view ---------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_STRING_VIEW
11	#define _LIBCPP_EXPERIMENTAL_STRING_VIEW
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/string_view> has been removed. Use <string_view> instead.")
17	#else
18	# warning "<experimental/string_view> has been removed. Use <string_view> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_STRING_VIEW

lib/libcxx/include/experimental/system_error deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===-------------------------- system_error ------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_SYSTEM_ERROR
11	#define _LIBCPP_EXPERIMENTAL_SYSTEM_ERROR
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/system_error> has been removed. Use <system_error> instead.")
17	#else
18	# warning "<experimental/system_error> has been removed. Use <system_error> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_SYSTEM_ERROR

lib/libcxx/include/experimental/tuple deleted-21

...	@@ -1,21 +0,0 @@
1	// -- C++ --
2	//===----------------------------- tuple ----------------------------------===//
3	//
4	// The LLVM Compiler Infrastructure
5	//
6	// This file is dual licensed under the MIT and the University of Illinois Open
7	// Source Licenses. See LICENSE.TXT for details.
8	//
9	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_EXPERIMENTAL_TUPLE
11	#define _LIBCPP_EXPERIMENTAL_TUPLE
12
13	#include <__config>
14
15	#ifdef _LIBCPP_WARNING
16	_LIBCPP_WARNING("<experimental/tuple> has been removed. Use <tuple> instead.")
17	#else
18	# warning "<experimental/tuple> has been removed. Use <tuple> instead."
19	#endif
20
21	#endif // _LIBCPP_EXPERIMENTAL_TUPLE

lib/libcxx/include/experimental/type_traits+8-9

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- type_traits -------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -73,6 +72,7 @@ inline namespace fundamentals_v1 {
 #if _LIBCPP_STD_VER > 11
+#include <initializer_list>
 #include <type_traits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -105,11 +105,10 @@ using raw_invocation_type_t = typename raw_invocation_type<_Tp>::type;
 // 3.3.4, Detection idiom
 template <class...> using void_t = void;
-struct nonesuch {
+struct nonesuch : private _VSTD::__nat { // make nonesuch "not an aggregate"
-    nonesuch()  = delete;
+  ~nonesuch() = delete;
-    ~nonesuch() = delete;
+  nonesuch      (nonesuch const&) = delete;
-    nonesuch      (nonesuch const&) = delete;
+  void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch const&) = delete;
   };
 template <class _Default, class _AlwaysVoid, template <class...> class _Op, class... _Args>

lib/libcxx/include/experimental/unordered_map+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------- unordered_map ------------------------------===//	2	//===------------------------- unordered_map ------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/unordered_set+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------- unordered_set ------------------------------===//	2	//===------------------------- unordered_set ------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/utility+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- utility ----------------------------------===//	2	//===-------------------------- utility ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/experimental/vector+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- vector ------------------------------------===//	2	//===--------------------------- vector ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/ext/__hash+16-18

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===------------------------- hash_set ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -17,32 +16,31 @@
 #include <cstring>
 namespace __gnu_cxx {
-using namespace std;
 template <typename _Tp> struct _LIBCPP_TEMPLATE_VIS hash { };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<const char*>
-    : public unary_function<const char*, size_t>
+ : public std::unary_function<const char*, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(const char *__c) const _NOEXCEPT
     {
-        return __do_string_hash(__c, __c + strlen(__c));
+        return std::__do_string_hash(__c, __c + strlen(__c));
     }
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<char *>
-    : public unary_function<char*, size_t>
+ : public std::unary_function<char*, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(char *__c) const _NOEXCEPT
     {
-        return __do_string_hash<const char *>(__c, __c + strlen(__c));
+        return std::__do_string_hash<const char *>(__c, __c + strlen(__c));
     }
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<char>
-    : public unary_function<char, size_t>
+ : public std::unary_function<char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(char __c) const _NOEXCEPT
 @@ -52,7 +50,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<char>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<signed char>
-    : public unary_function<signed char, size_t>
+ : public std::unary_function<signed char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(signed char __c) const _NOEXCEPT
 @@ -62,7 +60,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<signed char>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned char>
-    : public unary_function<unsigned char, size_t>
+ : public std::unary_function<unsigned char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(unsigned char __c) const _NOEXCEPT
 @@ -72,7 +70,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned char>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<short>
-    : public unary_function<short, size_t>
+ : public std::unary_function<short, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(short __c) const _NOEXCEPT
 @@ -82,7 +80,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<short>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned short>
-    : public unary_function<unsigned short, size_t>
+ : public std::unary_function<unsigned short, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(unsigned short __c) const _NOEXCEPT
 @@ -92,7 +90,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned short>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<int>
-    : public unary_function<int, size_t>
+    : public std::unary_function<int, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(int __c) const _NOEXCEPT
 @@ -102,7 +100,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<int>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned int>
-    : public unary_function<unsigned int, size_t>
+    : public std::unary_function<unsigned int, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(unsigned int __c) const _NOEXCEPT
 @@ -112,7 +110,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned int>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<long>
-    : public unary_function<long, size_t>
+    : public std::unary_function<long, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(long __c) const _NOEXCEPT
 @@ -122,7 +120,7 @@ template <> struct _LIBCPP_TEMPLATE_VIS hash<long>
 };
 template <> struct _LIBCPP_TEMPLATE_VIS hash<unsigned long>
-    : public unary_function<unsigned long, size_t>
+    : public std::unary_function<unsigned long, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(unsigned long __c) const _NOEXCEPT

lib/libcxx/include/ext/hash_map+38-40

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- hash_map ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -220,10 +219,8 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 namespace __gnu_cxx {
-using namespace std;
 template <class _Tp, class _Hash,
-          bool = is_empty<_Hash>::value && !__libcpp_is_final<_Hash>::value
+          bool = std::is_empty<_Hash>::value && !std::__libcpp_is_final<_Hash>::value
         >
 class __hash_map_hasher
     : private _Hash
 @@ -257,7 +254,7 @@ public:
 };
 template <class _Tp, class _Pred,
-          bool = is_empty<_Pred>::value && !__libcpp_is_final<_Pred>::value
+          bool = std::is_empty<_Pred>::value && !std::__libcpp_is_final<_Pred>::value
          >
 class __hash_map_equal
     : private _Pred
 @@ -308,7 +305,7 @@ template <class _Alloc>
 class __hash_map_node_destructor
 {
     typedef _Alloc                              allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
+    typedef std::allocator_traits<allocator_type>    __alloc_traits;
     typedef typename __alloc_traits::value_type::__node_value_type value_type;
 public:
     typedef typename __alloc_traits::pointer    pointer;
 @@ -333,7 +330,7 @@ public:
 #ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(__hash_node_destructor<allocator_type>&& __x)
+    __hash_map_node_destructor(std::__hash_node_destructor<allocator_type>&& __x)
         : __na_(__x.__na_),
           __first_constructed(__x.__value_constructed),
           __second_constructed(__x.__value_constructed)
 @@ -342,7 +339,7 @@ public:
         }
 #else  // _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(const __hash_node_destructor<allocator_type>& __x)
+    __hash_map_node_destructor(const std::__hash_node_destructor<allocator_type>& __x)
         : __na_(__x.__na_),
           __first_constructed(__x.__value_constructed),
           __second_constructed(__x.__value_constructed)
 @@ -371,11 +368,11 @@ class _LIBCPP_TEMPLATE_VIS __hash_map_iterator
     typedef const typename _HashIterator::value_type::first_type key_type;
     typedef typename _HashIterator::value_type::second_type      mapped_type;
 public:
-    typedef forward_iterator_tag                                 iterator_category;
+    typedef std::forward_iterator_tag                            iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
+    typedef std::pair<key_type, mapped_type>                     value_type;
     typedef typename _HashIterator::difference_type              difference_type;
     typedef value_type&                                          reference;
-    typedef typename __rebind_pointer<typename _HashIterator::pointer, value_type>::type
+    typedef typename std::__rebind_pointer<typename _HashIterator::pointer, value_type>::type
         pointer;
     _LIBCPP_INLINE_VISIBILITY __hash_map_iterator() {}
 @@ -416,11 +413,11 @@ class _LIBCPP_TEMPLATE_VIS __hash_map_const_iterator
     typedef const typename _HashIterator::value_type::first_type key_type;
     typedef typename _HashIterator::value_type::second_type      mapped_type;
 public:
-    typedef forward_iterator_tag                                 iterator_category;
+    typedef std::forward_iterator_tag                            iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
+    typedef std::pair<key_type, mapped_type>                     value_type;
     typedef typename _HashIterator::difference_type              difference_type;
     typedef const value_type&                                    reference;
-    typedef typename __rebind_pointer<typename _HashIterator::pointer, const value_type>::type
+    typedef typename std::__rebind_pointer<typename _HashIterator::pointer, const value_type>::type
         pointer;
     _LIBCPP_INLINE_VISIBILITY __hash_map_const_iterator() {}
 @@ -460,8 +457,8 @@ public:
     template <class> friend class _LIBCPP_TEMPLATE_VIS __hash_const_local_iterator;
 };
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
+template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = std::equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
+          class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
 class _LIBCPP_TEMPLATE_VIS hash_map
 {
 public:
 @@ -472,17 +469,18 @@ public:
     typedef _Hash                                          hasher;
     typedef _Pred                                          key_equal;
     typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
+    typedef std::pair<const key_type, mapped_type>         value_type;
     typedef value_type&                                    reference;
     typedef const value_type&                              const_reference;
 private:
-    typedef pair<key_type, mapped_type>                    __value_type;
+    typedef std::pair<key_type, mapped_type>                    __value_type;
     typedef __hash_map_hasher<__value_type, hasher>   __hasher;
     typedef __hash_map_equal<__value_type, key_equal> __key_equal;
-    typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>, __value_type>::type __allocator_type;
+    typedef typename std::__rebind_alloc_helper<
+        std::allocator_traits<allocator_type>, __value_type>::type __allocator_type;
-    typedef __hash_table<__value_type, __hasher,
+    typedef std::__hash_table<__value_type, __hasher,
                          __key_equal,  __allocator_type>   __table;
     __table __table_;
 @@ -493,8 +491,8 @@ private:
     typedef typename __table::__node_allocator             __node_allocator;
     typedef typename __table::__node                       __node;
     typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
+    typedef std::unique_ptr<__node, _Dp>                   __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
+    typedef std::allocator_traits<allocator_type>          __alloc_traits;
 public:
     typedef typename __alloc_traits::pointer         pointer;
     typedef typename __alloc_traits::const_pointer   const_pointer;
 @@ -544,7 +542,7 @@ public:
     const_iterator end()    const {return __table_.end();}
     _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
+    std::pair<iterator, bool> insert(const value_type& __x)
         {return __table_.__insert_unique(__x);}
     _LIBCPP_INLINE_VISIBILITY
     iterator insert(const_iterator, const value_type& __x) {return insert(__x).first;}
 @@ -579,10 +577,10 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
     _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
+    std::pair<iterator, iterator>             equal_range(const key_type& __k)
         {return __table_.__equal_range_unique(__k);}
     _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
+    std::pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
         {return __table_.__equal_range_unique(__k);}
     mapped_type& operator[](const key_type& __k);
 @@ -692,7 +690,7 @@ hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](const key_type& __k)
     if (__i != end())
         return __i->second;
     __node_holder __h = __construct_node(__k);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
+    std::pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
     __h.release();
     return __r.first->second;
 }
 @@ -734,8 +732,8 @@ operator!=(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
     return !(__x == __y);
 }
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
+template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = std::equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
+          class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
 class _LIBCPP_TEMPLATE_VIS hash_multimap
 {
 public:
 @@ -746,17 +744,17 @@ public:
     typedef _Hash                                          hasher;
     typedef _Pred                                          key_equal;
     typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
+    typedef std::pair<const key_type, mapped_type>         value_type;
     typedef value_type&                                    reference;
     typedef const value_type&                              const_reference;
 private:
-    typedef pair<key_type, mapped_type>                    __value_type;
+    typedef std::pair<key_type, mapped_type>               __value_type;
     typedef __hash_map_hasher<__value_type, hasher>   __hasher;
     typedef __hash_map_equal<__value_type, key_equal> __key_equal;
-    typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>, __value_type>::type __allocator_type;
+    typedef typename std::__rebind_alloc_helper<std::allocator_traits<allocator_type>, __value_type>::type __allocator_type;
-    typedef __hash_table<__value_type, __hasher,
+    typedef std::__hash_table<__value_type, __hasher,
                          __key_equal,  __allocator_type>   __table;
     __table __table_;
 @@ -765,8 +763,8 @@ private:
     typedef typename __table::__node_allocator             __node_allocator;
     typedef typename __table::__node                       __node;
     typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
+    typedef std::unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
+    typedef std::allocator_traits<allocator_type>               __alloc_traits;
 public:
     typedef typename __alloc_traits::pointer         pointer;
     typedef typename __alloc_traits::const_pointer   const_pointer;
 @@ -851,10 +849,10 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
     _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
+    std::pair<iterator, iterator>             equal_range(const key_type& __k)
         {return __table_.__equal_range_multi(__k);}
     _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
+    std::pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
         {return __table_.__equal_range_multi(__k);}
     _LIBCPP_INLINE_VISIBILITY
 @@ -956,7 +954,7 @@ operator==(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
         return false;
     typedef typename hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
                                                                  const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
+    typedef std::pair<const_iterator, const_iterator> _EqRng;
     for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
     {
         _EqRng __xeq = __x.equal_range(__i->first);

lib/libcxx/include/ext/hash_set+16-18

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------- hash_set ------------------------------------===//	2	//===------------------------- hash_set ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -208,10 +207,9 @@ template <class Value, class Hash, class Pred, class Alloc>	...	@@ -208,10 +207,9 @@ template <class Value, class Hash, class Pred, class Alloc>
208		207
209	namespace __gnu_cxx {	208	namespace __gnu_cxx {
210		209
211	using namespace std;
212		210
213	template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,	211	template <class _Value, class _Hash = hash<_Value>, class _Pred = std::equal_to<_Value>,
214	class _Alloc = allocator<_Value> >	212	class _Alloc = std::allocator<_Value> >
215	class _LIBCPP_TEMPLATE_VIS hash_set	213	class _LIBCPP_TEMPLATE_VIS hash_set
216	{	214	{
217	public:	215	public:
...	@@ -225,7 +223,7 @@ public:	...	@@ -225,7 +223,7 @@ public:
225	typedef const value_type& const_reference;	223	typedef const value_type& const_reference;
226		224
227	private:	225	private:
228	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;	226	typedef std::__hash_table<value_type, hasher, key_equal, allocator_type> __table;
229		227
230	__table __table_;	228	__table __table_;
231		229
...	@@ -277,7 +275,7 @@ public:	...	@@ -277,7 +275,7 @@ public:
277	const_iterator end() const {return __table_.end();}	275	const_iterator end() const {return __table_.end();}
278		276
279	_LIBCPP_INLINE_VISIBILITY	277	_LIBCPP_INLINE_VISIBILITY
280	pair<iterator, bool> insert(const value_type& __x)	278	std::pair<iterator, bool> insert(const value_type& __x)
281	{return __table_.__insert_unique(__x);}	279	{return __table_.__insert_unique(__x);}
282	_LIBCPP_INLINE_VISIBILITY	280	_LIBCPP_INLINE_VISIBILITY
283	iterator insert(const_iterator, const value_type& __x) {return insert(__x).first;}	281	iterator insert(const_iterator, const value_type& __x) {return insert(__x).first;}
...	@@ -310,10 +308,10 @@ public:	...	@@ -310,10 +308,10 @@ public:
310	_LIBCPP_INLINE_VISIBILITY	308	_LIBCPP_INLINE_VISIBILITY
311	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}	309	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
312	_LIBCPP_INLINE_VISIBILITY	310	_LIBCPP_INLINE_VISIBILITY
313	pair<iterator, iterator> equal_range(const key_type& __k)	311	std::pair<iterator, iterator> equal_range(const key_type& __k)
314	{return __table_.__equal_range_unique(__k);}	312	{return __table_.__equal_range_unique(__k);}
315	_LIBCPP_INLINE_VISIBILITY	313	_LIBCPP_INLINE_VISIBILITY
316	pair<const_iterator, const_iterator> equal_range(const key_type& __k) const	314	std::pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
317	{return __table_.__equal_range_unique(__k);}	315	{return __table_.__equal_range_unique(__k);}
318		316
319	_LIBCPP_INLINE_VISIBILITY	317	_LIBCPP_INLINE_VISIBILITY
...	@@ -432,8 +430,8 @@ operator!=(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,	...	@@ -432,8 +430,8 @@ operator!=(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
432	return !(__x == __y);	430	return !(__x == __y);
433	}	431	}
434		432
435	template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,	433	template <class _Value, class _Hash = hash<_Value>, class _Pred = std::equal_to<_Value>,
436	class _Alloc = allocator<_Value> >	434	class _Alloc = std::allocator<_Value> >
437	class _LIBCPP_TEMPLATE_VIS hash_multiset	435	class _LIBCPP_TEMPLATE_VIS hash_multiset
438	{	436	{
439	public:	437	public:
...	@@ -447,7 +445,7 @@ public:	...	@@ -447,7 +445,7 @@ public:
447	typedef const value_type& const_reference;	445	typedef const value_type& const_reference;
448		446
449	private:	447	private:
450	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;	448	typedef std::__hash_table<value_type, hasher, key_equal, allocator_type> __table;
451		449
452	__table __table_;	450	__table __table_;
453		451
...	@@ -531,10 +529,10 @@ public:	...	@@ -531,10 +529,10 @@ public:
531	_LIBCPP_INLINE_VISIBILITY	529	_LIBCPP_INLINE_VISIBILITY
532	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}	530	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
533	_LIBCPP_INLINE_VISIBILITY	531	_LIBCPP_INLINE_VISIBILITY
534	pair<iterator, iterator> equal_range(const key_type& __k)	532	std::pair<iterator, iterator> equal_range(const key_type& __k)
535	{return __table_.__equal_range_multi(__k);}	533	{return __table_.__equal_range_multi(__k);}
536	_LIBCPP_INLINE_VISIBILITY	534	_LIBCPP_INLINE_VISIBILITY
537	pair<const_iterator, const_iterator> equal_range(const key_type& __k) const	535	std::pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
538	{return __table_.__equal_range_multi(__k);}	536	{return __table_.__equal_range_multi(__k);}
539		537
540	_LIBCPP_INLINE_VISIBILITY	538	_LIBCPP_INLINE_VISIBILITY
...	@@ -611,7 +609,7 @@ template <class _InputIterator>	...	@@ -611,7 +609,7 @@ template <class _InputIterator>
611	inline	609	inline
612	void	610	void
613	hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,	611	hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
614	_InputIterator __last)	612	_InputIterator __last)
615	{	613	{
616	for (; __first != __last; ++__first)	614	for (; __first != __last; ++__first)
617	__table_.__insert_multi(*__first);	615	__table_.__insert_multi(*__first);
...	@@ -635,7 +633,7 @@ operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,	...	@@ -635,7 +633,7 @@ operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
635	return false;	633	return false;
636	typedef typename hash_multiset<_Value, _Hash, _Pred, _Alloc>::const_iterator	634	typedef typename hash_multiset<_Value, _Hash, _Pred, _Alloc>::const_iterator
637	const_iterator;	635	const_iterator;
638	typedef pair<const_iterator, const_iterator> _EqRng;	636	typedef std::pair<const_iterator, const_iterator> _EqRng;
639	for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)	637	for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
640	{	638	{
641	_EqRng __xeq = __x.equal_range(*__i);	639	_EqRng __xeq = __x.equal_range(*__i);

lib/libcxx/include/fenv.h created+116

...	@@ -0,0 +1,116 @@
1	// -- C++ --
2	//===---------------------------- math.h ----------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_FENV_H
11	#define _LIBCPP_FENV_H
12
13
14	/*
15	fenv.h synopsis
16
17	This entire header is C99 / C++0X
18
19	Macros:
20
21	FE_DIVBYZERO
22	FE_INEXACT
23	FE_INVALID
24	FE_OVERFLOW
25	FE_UNDERFLOW
26	FE_ALL_EXCEPT
27	FE_DOWNWARD
28	FE_TONEAREST
29	FE_TOWARDZERO
30	FE_UPWARD
31	FE_DFL_ENV
32
33	Types:
34
35	fenv_t
36	fexcept_t
37
38	int feclearexcept(int excepts);
39	int fegetexceptflag(fexcept_t* flagp, int excepts);
40	int feraiseexcept(int excepts);
41	int fesetexceptflag(const fexcept_t* flagp, int excepts);
42	int fetestexcept(int excepts);
43	int fegetround();
44	int fesetround(int round);
45	int fegetenv(fenv_t* envp);
46	int feholdexcept(fenv_t* envp);
47	int fesetenv(const fenv_t* envp);
48	int feupdateenv(const fenv_t* envp);
49
50
51	*/
52
53	#include <__config>
54
55	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
56	#pragma GCC system_header
57	#endif
58
59	#include_next <fenv.h>
60
61	#ifdef __cplusplus
62
63	extern "C++" {
64
65	#ifdef feclearexcept
66	#undef feclearexcept
67	#endif
68
69	#ifdef fegetexceptflag
70	#undef fegetexceptflag
71	#endif
72
73
74	#ifdef feraiseexcept
75	#undef feraiseexcept
76	#endif
77
78	#ifdef fesetexceptflag
79	#undef fesetexceptflag
80	#endif
81
82
83	#ifdef fetestexcept
84	#undef fetestexcept
85	#endif
86
87	#ifdef fegetround
88	#undef fegetround
89	#endif
90
91	#ifdef fesetround
92	#undef fesetround
93	#endif
94
95	#ifdef fegetenv
96	#undef fegetenv
97	#endif
98
99	#ifdef feholdexcept
100	#undef feholdexcept
101	#endif
102
103
104	#ifdef fesetenv
105	#undef fesetenv
106	#endif
107
108	#ifdef feupdateenv
109	#undef feupdateenv
110	#endif
111
112	} // extern "C++"
113
114	#endif // defined(__cplusplus)
115
116	#endif // _LIBCPP_FENV_H

lib/libcxx/include/filesystem+19-13

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- filesystem -------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP_FILESYSTEM
 @@ -259,6 +258,8 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
+_LIBCPP_AVAILABILITY_FILESYSTEM_PUSH
 typedef chrono::time_point<_FilesystemClock> file_time_type;
 struct _LIBCPP_TYPE_VIS space_info {
 @@ -1311,7 +1312,11 @@ inline _LIBCPP_INLINE_VISIBILITY bool operator!=(const path::iterator& __lhs,
   return !(__lhs == __rhs);
 }
-class _LIBCPP_EXCEPTION_ABI filesystem_error : public system_error {
+// TODO(ldionne): We need to pop the pragma and push it again after
+//                filesystem_error to work around PR41078.
+_LIBCPP_AVAILABILITY_FILESYSTEM_POP
+class _LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_EXCEPTION_ABI filesystem_error : public system_error {
 public:
   _LIBCPP_INLINE_VISIBILITY
   filesystem_error(const string& __what, error_code __ec)
 @@ -1348,11 +1353,10 @@ public:
     return __storage_->__what_.c_str();
   }
-  _LIBCPP_FUNC_VIS
   void __create_what(int __num_paths);
 private:
-  struct _Storage {
+  struct _LIBCPP_HIDDEN _Storage {
     _LIBCPP_INLINE_VISIBILITY
     _Storage(const path& __p1, const path& __p2) : __p1_(__p1), __p2_(__p2) {}
 @@ -1363,16 +1367,16 @@ private:
   shared_ptr<_Storage> __storage_;
 };
+_LIBCPP_AVAILABILITY_FILESYSTEM_PUSH
 template <class... _Args>
 _LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    void
+void __throw_filesystem_error(_Args&&... __args) {
-    __throw_filesystem_error(_Args&&... __args) {
   throw filesystem_error(std::forward<_Args>(__args)...);
 }
 #else
-    void
+void __throw_filesystem_error(_Args&&...) {
-    __throw_filesystem_error(_Args&&...) {
   _VSTD::abort();
 }
 #endif
 @@ -1938,7 +1942,7 @@ inline _LIBCPP_INLINE_VISIBILITY path weakly_canonical(path const& __p,
 class directory_iterator;
 class recursive_directory_iterator;
-class __dir_stream;
+class _LIBCPP_HIDDEN __dir_stream;
 class directory_entry {
   typedef _VSTD_FS::path _Path;
 @@ -2601,7 +2605,7 @@ private:
   operator==(const recursive_directory_iterator&,
              const recursive_directory_iterator&) noexcept;
-  struct __shared_imp;
+  struct _LIBCPP_HIDDEN __shared_imp;
   shared_ptr<__shared_imp> __imp_;
   bool __rec_;
 }; // class recursive_directory_iterator
 @@ -2628,6 +2632,8 @@ end(const recursive_directory_iterator&) noexcept {
   return recursive_directory_iterator();
 }
+_LIBCPP_AVAILABILITY_FILESYSTEM_POP
 _LIBCPP_END_NAMESPACE_FILESYSTEM
 #endif // !_LIBCPP_CXX03_LANG

lib/libcxx/include/float.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- float.h ----------------------------------===//	2	//===--------------------------- float.h ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/forward_list+45-32

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------- forward_list ---------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -121,10 +120,12 @@ public:
                       const_iterator first, const_iterator last);
     void splice_after(const_iterator p, forward_list&& x,
                       const_iterator first, const_iterator last);
-    void remove(const value_type& v);
+    size_type remove(const value_type& v);           // void before C++20
-    template <class Predicate> void remove_if(Predicate pred);
+    template <class Predicate>
-    void unique();
+      size_type remove_if(Predicate pred);           // void before C++20
-    template <class BinaryPredicate> void unique(BinaryPredicate binary_pred);
+    size_type unique();                              // void before C++20
+    template <class BinaryPredicate>
+      size_type unique(BinaryPredicate binary_pred); // void before C++20
     void merge(forward_list& x);
     void merge(forward_list&& x);
     template <class Compare> void merge(forward_list& x, Compare comp);
 @@ -531,7 +532,7 @@ public:
 #if _LIBCPP_STD_VER >= 14
         _NOEXCEPT;
 #else
         _NOEXCEPT_(!__node_traits::propagate_on_container_move_assignment::value ||
                     __is_nothrow_swappable<__node_allocator>::value);
 #endif
 protected:
 @@ -596,11 +597,11 @@ __forward_list_base<_Tp, _Alloc>::swap(__forward_list_base& __x)
 #if _LIBCPP_STD_VER >= 14
         _NOEXCEPT
 #else
         _NOEXCEPT_(!__node_traits::propagate_on_container_move_assignment::value ||
                     __is_nothrow_swappable<__node_allocator>::value)
 #endif
 {
     __swap_allocator(__alloc(), __x.__alloc(),
             integral_constant<bool, __node_traits::propagate_on_container_swap::value>());
     using _VSTD::swap;
     swap(__before_begin()->__next_, __x.__before_begin()->__next_);
 @@ -648,6 +649,11 @@ public:
     typedef typename base::iterator       iterator;
     typedef typename base::const_iterator const_iterator;
+#if _LIBCPP_STD_VER > 17
+    typedef size_type                                __remove_return_type;
+#else
+    typedef void                                     __remove_return_type;
+#endif
     _LIBCPP_INLINE_VISIBILITY
     forward_list()
 @@ -809,7 +815,6 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     void clear() _NOEXCEPT {base::clear();}
-#ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     void splice_after(const_iterator __p, forward_list&& __x);
     _LIBCPP_INLINE_VISIBILITY
 @@ -817,16 +822,15 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     void splice_after(const_iterator __p, forward_list&& __x,
                       const_iterator __f, const_iterator __l);
-#endif  // _LIBCPP_CXX03_LANG
     void splice_after(const_iterator __p, forward_list& __x);
     void splice_after(const_iterator __p, forward_list& __x, const_iterator __i);
     void splice_after(const_iterator __p, forward_list& __x,
                       const_iterator __f, const_iterator __l);
-    void remove(const value_type& __v);
+    __remove_return_type remove(const value_type& __v);
-    template <class _Predicate> void remove_if(_Predicate __pred);
+    template <class _Predicate> __remove_return_type remove_if(_Predicate __pred);
     _LIBCPP_INLINE_VISIBILITY
-    void unique() {unique(__equal_to<value_type>());}
+    __remove_return_type unique() {return unique(__equal_to<value_type>());}
-    template <class _BinaryPredicate> void unique(_BinaryPredicate __binary_pred);
+    template <class _BinaryPredicate> __remove_return_type unique(_BinaryPredicate __binary_pred);
 #ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     void merge(forward_list&& __x) {merge(__x, __less<value_type>());}
 @@ -1469,8 +1473,6 @@ forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
     }
 }
-#ifndef _LIBCPP_CXX03_LANG
 template <class _Tp, class _Alloc>
 inline _LIBCPP_INLINE_VISIBILITY
 void
 @@ -1500,21 +1502,21 @@ forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
     splice_after(__p, __x, __f, __l);
 }
-#endif  // _LIBCPP_CXX03_LANG
 template <class _Tp, class _Alloc>
-void
+typename forward_list<_Tp, _Alloc>::__remove_return_type
 forward_list<_Tp, _Alloc>::remove(const value_type& __v)
 {
-    forward_list<_Tp, _Alloc> __deleted_nodes; // collect the nodes we're removing
+    forward_list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
-    iterator __e = end();
+    typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0;
+    const iterator __e = end();
     for (iterator __i = before_begin(); __i.__get_begin()->__next_ != nullptr;)
     {
         if (__i.__get_begin()->__next_->__value_ == __v)
         {
+            ++__count_removed;
             iterator __j = _VSTD::next(__i, 2);
             for (; __j != __e && *__j == __v; ++__j)
-                ;
+                ++__count_removed;
             __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
             if (__j == __e)
                 break;
 @@ -1523,22 +1525,27 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v)
         else
             ++__i;
     }
+    return (__remove_return_type) __count_removed;
 }
 template <class _Tp, class _Alloc>
 template <class _Predicate>
-void
+typename forward_list<_Tp, _Alloc>::__remove_return_type
 forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred)
 {
-    iterator __e = end();
+    forward_list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
+    typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0;
+    const iterator __e = end();
     for (iterator __i = before_begin(); __i.__get_begin()->__next_ != nullptr;)
     {
         if (__pred(__i.__get_begin()->__next_->__value_))
         {
+            ++__count_removed;
             iterator __j = _VSTD::next(__i, 2);
             for (; __j != __e && __pred(*__j); ++__j)
-                ;
+                ++__count_removed;
-            erase_after(__i, __j);
+            __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
             if (__j == __e)
                 break;
             __i = __j;
 @@ -1546,22 +1553,28 @@ forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred)
         else
             ++__i;
     }
+    return (__remove_return_type) __count_removed;
 }
 template <class _Tp, class _Alloc>
 template <class _BinaryPredicate>
-void
+typename forward_list<_Tp, _Alloc>::__remove_return_type
 forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred)
 {
+    forward_list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
+    typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0;
     for (iterator __i = begin(), __e = end(); __i != __e;)
     {
         iterator __j = _VSTD::next(__i);
         for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
-            ;
+            ++__count_removed;
         if (__i.__get_begin()->__next_ != __j.__get_unsafe_node_pointer())
-            erase_after(__i, __j);
+            __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
         __i = __j;
     }
+    return (__remove_return_type) __count_removed;
 }
 template <class _Tp, class _Alloc>

lib/libcxx/include/fstream+11-12

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------- fstream ------------------------------------===//	2	//===------------------------- fstream ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -236,7 +235,7 @@ public:	...	@@ -236,7 +235,7 @@ public:
236	basic_filebuf* open(const string& __s, ios_base::openmode __mode);	235	basic_filebuf* open(const string& __s, ios_base::openmode __mode);
237		236
238	#if _LIBCPP_STD_VER >= 17	237	#if _LIBCPP_STD_VER >= 17
239	_LIBCPP_INLINE_VISIBILITY	238	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
240	basic_filebuf* open(const _VSTD_FS::path& __p, ios_base::openmode __mode) {	239	basic_filebuf* open(const _VSTD_FS::path& __p, ios_base::openmode __mode) {
241	return open(__p.c_str(), __mode);	240	return open(__p.c_str(), __mode);
242	}	241	}
...	@@ -758,7 +757,7 @@ basic_filebuf<_CharT, _Traits>::underflow()	...	@@ -758,7 +757,7 @@ basic_filebuf<_CharT, _Traits>::underflow()
758	this->eback() + __ibs_, __inext);	757	this->eback() + __ibs_, __inext);
759	if (__r == codecvt_base::noconv)	758	if (__r == codecvt_base::noconv)
760	{	759	{
761	this->setg((char_type)__extbuf_, (char_type)__extbuf_,	760	this->setg((char_type)__extbuf_, (char_type)__extbuf_,
762	(char_type)const_cast<char >(__extbufend_));	761	(char_type)const_cast<char >(__extbufend_));
763	__c = traits_type::to_int_type(*this->gptr());	762	__c = traits_type::to_int_type(*this->gptr());
764	}	763	}
...	@@ -1152,7 +1151,7 @@ public:	...	@@ -1152,7 +1151,7 @@ public:
1152	_LIBCPP_INLINE_VISIBILITY	1151	_LIBCPP_INLINE_VISIBILITY
1153	explicit basic_ifstream(const string& __s, ios_base::openmode __mode = ios_base::in);	1152	explicit basic_ifstream(const string& __s, ios_base::openmode __mode = ios_base::in);
1154	#if _LIBCPP_STD_VER >= 17	1153	#if _LIBCPP_STD_VER >= 17
1155	_LIBCPP_INLINE_VISIBILITY	1154	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1156	explicit basic_ifstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in)	1155	explicit basic_ifstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in)
1157	: basic_ifstream(__p.c_str(), __mode) {}	1156	: basic_ifstream(__p.c_str(), __mode) {}
1158	#endif // _LIBCPP_STD_VER >= 17	1157	#endif // _LIBCPP_STD_VER >= 17
...	@@ -1178,7 +1177,7 @@ public:	...	@@ -1178,7 +1177,7 @@ public:
1178	#endif	1177	#endif
1179	void open(const string& __s, ios_base::openmode __mode = ios_base::in);	1178	void open(const string& __s, ios_base::openmode __mode = ios_base::in);
1180	#if _LIBCPP_STD_VER >= 17	1179	#if _LIBCPP_STD_VER >= 17
1181	_LIBCPP_INLINE_VISIBILITY	1180	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1182	void open(const filesystem::path& __p,	1181	void open(const filesystem::path& __p,
1183	ios_base::openmode __mode = ios_base::in) {	1182	ios_base::openmode __mode = ios_base::in) {
1184	return open(__p.c_str(), __mode);	1183	return open(__p.c_str(), __mode);
...	@@ -1366,7 +1365,7 @@ public:	...	@@ -1366,7 +1365,7 @@ public:
1366	explicit basic_ofstream(const string& __s, ios_base::openmode __mode = ios_base::out);	1365	explicit basic_ofstream(const string& __s, ios_base::openmode __mode = ios_base::out);
1367		1366
1368	#if _LIBCPP_STD_VER >= 17	1367	#if _LIBCPP_STD_VER >= 17
1369	_LIBCPP_INLINE_VISIBILITY	1368	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1370	explicit basic_ofstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::out)	1369	explicit basic_ofstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::out)
1371	: basic_ofstream(__p.c_str(), __mode) {}	1370	: basic_ofstream(__p.c_str(), __mode) {}
1372	#endif // _LIBCPP_STD_VER >= 17	1371	#endif // _LIBCPP_STD_VER >= 17
...	@@ -1393,7 +1392,7 @@ public:	...	@@ -1393,7 +1392,7 @@ public:
1393	void open(const string& __s, ios_base::openmode __mode = ios_base::out);	1392	void open(const string& __s, ios_base::openmode __mode = ios_base::out);
1394		1393
1395	#if _LIBCPP_STD_VER >= 17	1394	#if _LIBCPP_STD_VER >= 17
1396	_LIBCPP_INLINE_VISIBILITY	1395	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1397	void open(const filesystem::path& __p, ios_base::openmode __mode = ios_base::out)	1396	void open(const filesystem::path& __p, ios_base::openmode __mode = ios_base::out)
1398	{ return open(__p.c_str(), __mode); }	1397	{ return open(__p.c_str(), __mode); }
1399	#endif // _LIBCPP_STD_VER >= 17	1398	#endif // _LIBCPP_STD_VER >= 17
...	@@ -1580,7 +1579,7 @@ public:	...	@@ -1580,7 +1579,7 @@ public:
1580	explicit basic_fstream(const string& __s, ios_base::openmode __mode = ios_base::in \| ios_base::out);	1579	explicit basic_fstream(const string& __s, ios_base::openmode __mode = ios_base::in \| ios_base::out);
1581		1580
1582	#if _LIBCPP_STD_VER >= 17	1581	#if _LIBCPP_STD_VER >= 17
1583	_LIBCPP_INLINE_VISIBILITY	1582	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1584	explicit basic_fstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in \| ios_base::out)	1583	explicit basic_fstream(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in \| ios_base::out)
1585	: basic_fstream(__p.c_str(), __mode) {}	1584	: basic_fstream(__p.c_str(), __mode) {}
1586	#endif // _LIBCPP_STD_VER >= 17	1585	#endif // _LIBCPP_STD_VER >= 17
...	@@ -1608,7 +1607,7 @@ public:	...	@@ -1608,7 +1607,7 @@ public:
1608	void open(const string& __s, ios_base::openmode __mode = ios_base::in \| ios_base::out);	1607	void open(const string& __s, ios_base::openmode __mode = ios_base::in \| ios_base::out);
1609		1608
1610	#if _LIBCPP_STD_VER >= 17	1609	#if _LIBCPP_STD_VER >= 17
1611	_LIBCPP_INLINE_VISIBILITY	1610	_LIBCPP_AVAILABILITY_FILESYSTEM _LIBCPP_INLINE_VISIBILITY
1612	void open(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in\|ios_base::out)	1611	void open(const filesystem::path& __p, ios_base::openmode __mode = ios_base::in\|ios_base::out)
1613	{ return open(__p.c_str(), __mode); }	1612	{ return open(__p.c_str(), __mode); }
1614	#endif // _LIBCPP_STD_VER >= 17	1613	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/functional+106-34

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===------------------------ functional ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -231,6 +230,10 @@ template<class Fn, class... BoundArgs>
 template<class R, class Fn, class... BoundArgs>
   unspecified bind(Fn&&, BoundArgs&&...);
+template<class F, class... Args>
+ invoke_result_t<F, Args...> invoke(F&& f, Args&&... args) // C++17
+    noexcept(is_nothrow_invocable_v<F, Args...>);
 namespace placeholders {
   // M is the implementation-defined number of placeholders
   extern unspecified _1;
 @@ -1476,6 +1479,8 @@ namespace __function {
 // __alloc_func holds a functor and an allocator.
 template <class _Fp, class _Ap, class _FB> class __alloc_func;
+template <class _Fp, class _FB>
+class __default_alloc_func;
 template <class _Fp, class _Ap, class _Rp, class... _ArgTypes>
 class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>
 @@ -1483,14 +1488,15 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>
     __compressed_pair<_Fp, _Ap> __f_;
   public:
-    typedef _Fp _Target;
+    typedef _LIBCPP_NODEBUG_TYPE _Fp _Target;
-    typedef _Ap _Alloc;
+    typedef _LIBCPP_NODEBUG_TYPE _Ap _Alloc;
     _LIBCPP_INLINE_VISIBILITY
     const _Target& __target() const { return __f_.first(); }
+    // WIN32 APIs may define __allocator, so use __get_allocator instead.
     _LIBCPP_INLINE_VISIBILITY
-    const _Alloc& __allocator() const { return __f_.second(); }
+    const _Alloc& __get_allocator() const { return __f_.second(); }
     _LIBCPP_INLINE_VISIBILITY
     explicit __alloc_func(_Target&& __f)
 @@ -1544,6 +1550,56 @@ class __alloc_func<_Fp, _Ap, _Rp(_ArgTypes...)>
     _LIBCPP_INLINE_VISIBILITY
     void destroy() _NOEXCEPT { __f_.~__compressed_pair<_Target, _Alloc>(); }
+    static void __destroy_and_delete(__alloc_func* __f) {
+      typedef allocator_traits<_Alloc> __alloc_traits;
+      typedef typename __rebind_alloc_helper<__alloc_traits, __alloc_func>::type
+          _FunAlloc;
+      _FunAlloc __a(__f->__get_allocator());
+      __f->destroy();
+      __a.deallocate(__f, 1);
+    }
+};
+template <class _Fp, class _Rp, class... _ArgTypes>
+class __default_alloc_func<_Fp, _Rp(_ArgTypes...)> {
+  _Fp __f_;
+public:
+  typedef _LIBCPP_NODEBUG_TYPE _Fp _Target;
+  _LIBCPP_INLINE_VISIBILITY
+  const _Target& __target() const { return __f_; }
+  _LIBCPP_INLINE_VISIBILITY
+  explicit __default_alloc_func(_Target&& __f) : __f_(std::move(__f)) {}
+  _LIBCPP_INLINE_VISIBILITY
+  explicit __default_alloc_func(const _Target& __f) : __f_(__f) {}
+  _LIBCPP_INLINE_VISIBILITY
+  _Rp operator()(_ArgTypes&&... __arg) {
+    typedef __invoke_void_return_wrapper<_Rp> _Invoker;
+    return _Invoker::__call(__f_, _VSTD::forward<_ArgTypes>(__arg)...);
+  }
+  _LIBCPP_INLINE_VISIBILITY
+  __default_alloc_func* __clone() const {
+      __builtin_new_allocator::__holder_t __hold =
+        __builtin_new_allocator::__allocate_type<__default_alloc_func>(1);
+    __default_alloc_func* __res =
+        ::new (__hold.get()) __default_alloc_func(__f_);
+    (void)__hold.release();
+    return __res;
+  }
+  _LIBCPP_INLINE_VISIBILITY
+  void destroy() _NOEXCEPT { __f_.~_Target(); }
+  static void __destroy_and_delete(__default_alloc_func* __f) {
+    __f->destroy();
+      __builtin_new_allocator::__deallocate_type<__default_alloc_func>(__f, 1);
+  }
 };
 // __base provides an abstract interface for copyable functors.
 @@ -1612,7 +1668,7 @@ __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone() const
 {
     typedef allocator_traits<_Alloc> __alloc_traits;
     typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
-    _Ap __a(__f_.__allocator());
+    _Ap __a(__f_.__get_allocator());
     typedef __allocator_destructor<_Ap> _Dp;
     unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
     ::new ((void*)__hold.get()) __func(__f_.__target(), _Alloc(__a));
 @@ -1623,7 +1679,7 @@ template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
 void
 __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone(__base<_Rp(_ArgTypes...)>* __p) const
 {
-    ::new (__p) __func(__f_.__target(), __f_.__allocator());
+    ::new (__p) __func(__f_.__target(), __f_.__get_allocator());
 }
 template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
 @@ -1639,7 +1695,7 @@ __func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate() _NOEXCEPT
 {
     typedef allocator_traits<_Alloc> __alloc_traits;
     typedef typename __rebind_alloc_helper<__alloc_traits, __func>::type _Ap;
-    _Ap __a(__f_.__allocator());
+    _Ap __a(__f_.__get_allocator());
     __f_.destroy();
     __a.deallocate(this, 1);
 }
 @@ -1692,7 +1748,7 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>
     __value_func() _NOEXCEPT : __f_(0) {}
     template <class _Fp, class _Alloc>
-    _LIBCPP_INLINE_VISIBILITY __value_func(_Fp&& __f, const _Alloc __a)
+    _LIBCPP_INLINE_VISIBILITY __value_func(_Fp&& __f, const _Alloc& __a)
         : __f_(0)
     {
         typedef allocator_traits<_Alloc> __alloc_traits;
 @@ -1720,6 +1776,11 @@ template <class _Rp, class... _ArgTypes> class __value_func<_Rp(_ArgTypes...)>
         }
     }
+    template <class _Fp,
+        class = typename enable_if<!is_same<typename decay<_Fp>::type, __value_func>::value>::type>
+    _LIBCPP_INLINE_VISIBILITY explicit __value_func(_Fp&& __f)
+        : __value_func(std::forward<_Fp>(__f), allocator<_Fp>()) {}
     _LIBCPP_INLINE_VISIBILITY
     __value_func(const __value_func& __f)
     {
 @@ -1919,29 +1980,22 @@ struct __policy
         return __f->__clone();
     }
-    template <typename _Fun> static void __large_destroy(void* __s)
+    template <typename _Fun>
-    {
+    static void __large_destroy(void* __s) {
-        typedef allocator_traits<typename _Fun::_Alloc> __alloc_traits;
+      _Fun::__destroy_and_delete(static_cast<_Fun*>(__s));
-        typedef typename __rebind_alloc_helper<__alloc_traits, _Fun>::type
-            _FunAlloc;
-        _Fun* __f = static_cast<_Fun*>(__s);
-        _FunAlloc __a(__f->__allocator());
-        __f->destroy();
-        __a.deallocate(__f, 1);
     }
     template <typename _Fun>
     _LIBCPP_INLINE_VISIBILITY static const __policy*
-        __choose_policy(/* is_small = */ false_type)
+    __choose_policy(/* is_small = */ false_type) {
-    {
+      static const _LIBCPP_CONSTEXPR __policy __policy_ = {
-        static const _LIBCPP_CONSTEXPR __policy __policy_ = {
+          &__large_clone<_Fun>, &__large_destroy<_Fun>, false,
-            &__large_clone<_Fun>, &__large_destroy<_Fun>, false,
 #ifndef _LIBCPP_NO_RTTI
-            &typeid(typename _Fun::_Target)
+          &typeid(typename _Fun::_Target)
 #else
-            nullptr
+          nullptr
 #endif
-        };
+      };
         return &__policy_;
     }
 @@ -2066,6 +2120,25 @@ template <class _Rp, class... _ArgTypes> class __policy_func<_Rp(_ArgTypes...)>
         }
     }
+    template <class _Fp, class = typename enable_if<!is_same<typename decay<_Fp>::type, __policy_func>::value>::type>
+    _LIBCPP_INLINE_VISIBILITY explicit __policy_func(_Fp&& __f)
+        : __policy_(__policy::__create_empty()) {
+      typedef __default_alloc_func<_Fp, _Rp(_ArgTypes...)> _Fun;
+      if (__function::__not_null(__f)) {
+        __invoker_ = __invoker::template __create<_Fun>();
+        __policy_ = __policy::__create<_Fun>();
+        if (__use_small_storage<_Fun>()) {
+          ::new ((void*)&__buf_.__small) _Fun(_VSTD::move(__f));
+        } else {
+          __builtin_new_allocator::__holder_t __hold =
+              __builtin_new_allocator::__allocate_type<_Fun>(1);
+          __buf_.__large = ::new (__hold.get()) _Fun(_VSTD::move(__f));
+          (void)__hold.release();
+        }
+      }
+    }
     _LIBCPP_INLINE_VISIBILITY
     __policy_func(const __policy_func& __f)
         : __buf_(__f.__buf_), __invoker_(__f.__invoker_),
 @@ -2173,8 +2246,8 @@ class _LIBCPP_TEMPLATE_VIS function<_Rp(_ArgTypes...)>
     __func __f_;
-    template <class _Fp, bool = __lazy_and<
+    template <class _Fp, bool = _And<
-        integral_constant<bool, !is_same<__uncvref_t<_Fp>, function>::value>,
+        _IsNotSame<__uncvref_t<_Fp>, function>,
         __invokable<_Fp&, _ArgTypes...>
     >::value>
     struct __callable;
 @@ -2286,8 +2359,7 @@ function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
 template <class _Rp, class... _ArgTypes>
 template <class _Fp, class>
-function<_Rp(_ArgTypes...)>::function(_Fp __f)
+function<_Rp(_ArgTypes...)>::function(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    : __f_(_VSTD::move(__f), allocator<_Fp>()) {}
 #if _LIBCPP_STD_VER <= 14
 template <class _Rp, class... _ArgTypes>
 @@ -2484,7 +2556,7 @@ __mu_expand(_Ti& __ti, tuple<_Uj...>& __uj, __tuple_indices<_Indx...>)
 template <class _Ti, class ..._Uj>
 inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
+typename _EnableIf
 <
     is_bind_expression<_Ti>::value,
     __invoke_of<_Ti&, _Uj...>
 @@ -2769,9 +2841,9 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args)
 #if _LIBCPP_STD_VER > 14
 template <class _Fn, class ..._Args>
-result_of_t<_Fn&&(_Args&&...)>
+invoke_result_t<_Fn, _Args...>
 invoke(_Fn&& __f, _Args&&... __args)
-    noexcept(noexcept(_VSTD::__invoke(_VSTD::forward<_Fn>(__f), _VSTD::forward<_Args>(__args)...)))
+    noexcept(is_nothrow_invocable_v<_Fn, _Args...>)
 {
     return _VSTD::__invoke(_VSTD::forward<_Fn>(__f), _VSTD::forward<_Args>(__args)...);
 }

lib/libcxx/include/future+8-13

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- future -----------------------------------===//	2	//===--------------------------- future -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -409,11 +408,7 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)	...	@@ -409,11 +408,7 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
409		408
410	#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS	409	#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
411		410
412	#ifdef _LIBCPP_UNDERLYING_TYPE
413	typedef underlying_type<launch>::type __launch_underlying_type;	411	typedef underlying_type<launch>::type __launch_underlying_type;
414	#else
415	typedef int __launch_underlying_type;
416	#endif
417		412
418	inline _LIBCPP_INLINE_VISIBILITY	413	inline _LIBCPP_INLINE_VISIBILITY
419	_LIBCPP_CONSTEXPR	414	_LIBCPP_CONSTEXPR
...	@@ -2016,7 +2011,7 @@ public:	...	@@ -2016,7 +2011,7 @@ public:
2016	class = typename enable_if	2011	class = typename enable_if
2017	<	2012	<
2018	!is_same<	2013	!is_same<
2019	typename __uncvref<_Fp>::type,	2014	typename __uncvref<_Fp>::type,
2020	packaged_task	2015	packaged_task
2021	>::value	2016	>::value
2022	>::type	2017	>::type
...	@@ -2027,7 +2022,7 @@ public:	...	@@ -2027,7 +2022,7 @@ public:
2027	class = typename enable_if	2022	class = typename enable_if
2028	<	2023	<
2029	!is_same<	2024	!is_same<
2030	typename __uncvref<_Fp>::type,	2025	typename __uncvref<_Fp>::type,
2031	packaged_task	2026	packaged_task
2032	>::value	2027	>::value
2033	>::type	2028	>::type
...	@@ -2145,7 +2140,7 @@ public:	...	@@ -2145,7 +2140,7 @@ public:
2145	class = typename enable_if	2140	class = typename enable_if
2146	<	2141	<
2147	!is_same<	2142	!is_same<
2148	typename __uncvref<_Fp>::type,	2143	typename __uncvref<_Fp>::type,
2149	packaged_task	2144	packaged_task
2150	>::value	2145	>::value
2151	>::type	2146	>::type
...	@@ -2156,11 +2151,11 @@ public:	...	@@ -2156,11 +2151,11 @@ public:
2156	class = typename enable_if	2151	class = typename enable_if
2157	<	2152	<
2158	!is_same<	2153	!is_same<
2159	typename __uncvref<_Fp>::type,	2154	typename __uncvref<_Fp>::type,
2160	packaged_task	2155	packaged_task
2161	>::value	2156	>::value
2162	>::type	2157	>::type
2163	>	2158	>
2164	_LIBCPP_INLINE_VISIBILITY	2159	_LIBCPP_INLINE_VISIBILITY
2165	packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)	2160	packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
2166	: __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),	2161	: __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),

lib/libcxx/include/initializer_list+4-5

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------- initializer_list -----------------------------===//	2	//===----------------------- initializer_list -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -83,7 +82,7 @@ public:	...	@@ -83,7 +82,7 @@ public:
83	_LIBCPP_INLINE_VISIBILITY	82	_LIBCPP_INLINE_VISIBILITY
84	_LIBCPP_CONSTEXPR_AFTER_CXX11	83	_LIBCPP_CONSTEXPR_AFTER_CXX11
85	size_t size() const _NOEXCEPT {return __size_;}	84	size_t size() const _NOEXCEPT {return __size_;}
86		85
87	_LIBCPP_INLINE_VISIBILITY	86	_LIBCPP_INLINE_VISIBILITY
88	_LIBCPP_CONSTEXPR_AFTER_CXX11	87	_LIBCPP_CONSTEXPR_AFTER_CXX11
89	const _Ep* begin() const _NOEXCEPT {return __begin_;}	88	const _Ep* begin() const _NOEXCEPT {return __begin_;}

lib/libcxx/include/inttypes.h+8-4

 @@ -1,15 +1,19 @@
 // -*- C++ -*-
 //===--------------------------- inttypes.h -------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is distributed under the University of Illinois Open Source
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP_INTTYPES_H
+// AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T
+// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
+// case the header guard macro is defined.
+#if !defined(_AIX) || !defined(_STD_TYPES_T)
 #define _LIBCPP_INTTYPES_H
+#endif // _STD_TYPES_T
 /*
     inttypes.h synopsis

lib/libcxx/include/iomanip+8-9

lib/libcxx/include/ios+37-19

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- ios -------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -203,8 +202,8 @@ enum class io_errc
 };
 concept_map ErrorCodeEnum<io_errc> { };
 error_code make_error_code(io_errc e) noexcept;
 error_condition make_error_condition(io_errc e) noexcept;
 storage-class-specifier const error_category& iostream_category() noexcept;
 }  // std
 @@ -331,6 +330,15 @@ public:
     void __set_badbit_and_consider_rethrow();
     void __set_failbit_and_consider_rethrow();
+    _LIBCPP_INLINE_VISIBILITY
+    void __setstate_nothrow(iostate __state)
+    {
+        if (__rdbuf_)
+            __rdstate_ |= __state;
+        else
+            __rdstate_ |= __state | ios_base::badbit;
+    }
 protected:
     _LIBCPP_INLINE_VISIBILITY
     ios_base() {// purposefully does no initialization
 @@ -426,6 +434,16 @@ public:
     virtual ~failure() throw();
 };
+_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY
+void __throw_failure(char const* __msg) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+    throw ios_base::failure(__msg);
+#else
+    ((void)__msg);
+    _VSTD::abort();
+#endif
+}
 class _LIBCPP_TYPE_VIS ios_base::Init
 {
 public:
 @@ -626,47 +644,47 @@ public:
     virtual ~basic_ios();
     // 27.5.4.2 Members:
     _LIBCPP_INLINE_VISIBILITY
     basic_ostream<char_type, traits_type>* tie() const;
     _LIBCPP_INLINE_VISIBILITY
     basic_ostream<char_type, traits_type>* tie(basic_ostream<char_type, traits_type>* __tiestr);
     _LIBCPP_INLINE_VISIBILITY
     basic_streambuf<char_type, traits_type>* rdbuf() const;
     _LIBCPP_INLINE_VISIBILITY
     basic_streambuf<char_type, traits_type>* rdbuf(basic_streambuf<char_type, traits_type>* __sb);
     basic_ios& copyfmt(const basic_ios& __rhs);
     _LIBCPP_INLINE_VISIBILITY
     char_type fill() const;
     _LIBCPP_INLINE_VISIBILITY
     char_type fill(char_type __ch);
     _LIBCPP_INLINE_VISIBILITY
     locale imbue(const locale& __loc);
     _LIBCPP_INLINE_VISIBILITY
     char narrow(char_type __c, char __dfault) const;
     _LIBCPP_INLINE_VISIBILITY
     char_type widen(char __c) const;
 protected:
     _LIBCPP_INLINE_VISIBILITY
     basic_ios() {// purposefully does no initialization
                 }
     _LIBCPP_INLINE_VISIBILITY
     void init(basic_streambuf<char_type, traits_type>* __sb);
     _LIBCPP_INLINE_VISIBILITY
     void move(basic_ios& __rhs);
 #ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     void move(basic_ios&& __rhs) {move(__rhs);}
 #endif
     _LIBCPP_INLINE_VISIBILITY
     void swap(basic_ios& __rhs) _NOEXCEPT;
     _LIBCPP_INLINE_VISIBILITY
     void set_rdbuf(basic_streambuf<char_type, traits_type>* __sb);
 private:
     basic_ostream<char_type, traits_type>* __tie_;

lib/libcxx/include/iosfwd+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- iosfwd -----------------------------------===//	2	//===--------------------------- iosfwd -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/iostream+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- iostream ---------------------------------===//	2	//===--------------------------- iostream ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/istream+514-381

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- istream ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -363,26 +362,31 @@ template <class _Tp, class _CharT, class _Traits>
 _LIBCPP_INLINE_VISIBILITY
 basic_istream<_CharT, _Traits>&
 __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __s(__is);
+    if (__s)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
+        try
-        if (__s)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             typedef istreambuf_iterator<_CharT, _Traits> _Ip;
             typedef num_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
+            use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __n);
-            use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __err, __n);
-            __is.setstate(__err);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }
 @@ -467,39 +471,46 @@ template <class _Tp, class _CharT, class _Traits>
 _LIBCPP_INLINE_VISIBILITY
 basic_istream<_CharT, _Traits>&
 __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __s(__is);
+    if (__s)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
+        try
-        if (__s)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             typedef istreambuf_iterator<_CharT, _Traits> _Ip;
             typedef num_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
             long __temp;
-            use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __err, __temp);
+            use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __temp);
             if (__temp < numeric_limits<_Tp>::min())
             {
-                __err |= ios_base::failbit;
+                __state |= ios_base::failbit;
                 __n = numeric_limits<_Tp>::min();
             }
             else if (__temp > numeric_limits<_Tp>::max())
             {
-                __err |= ios_base::failbit;
+                __state |= ios_base::failbit;
                 __n = numeric_limits<_Tp>::max();
             }
             else
+            {
                 __n = static_cast<_Tp>(__temp);
-            __is.setstate(__err);
+            }
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        __is.__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        __is.setstate(__state);
+    }
     return __is;
 }
 @@ -522,22 +533,22 @@ _LIBCPP_INLINE_VISIBILITY
 basic_istream<_CharT, _Traits>&
 __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+        try
-        if (__sen)
         {
-            auto __s = __p;
+#endif
+            _CharT* __s = __p;
             const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
             while (__s != __p + (__n-1))
             {
                 typename _Traits::int_type __i = __is.rdbuf()->sgetc();
                 if (_Traits::eq_int_type(__i, _Traits::eof()))
                 {
-                   __err |= ios_base::eofbit;
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 _CharT __ch = _Traits::to_char_type(__i);
 @@ -549,16 +560,21 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n)
             *__s = _CharT();
             __is.width(0);
             if (__s == __p)
-               __err |= ios_base::failbit;
+               __state |= ios_base::failbit;
-            __is.setstate(__err);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }
 @@ -569,7 +585,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, _CharT (&__buf)[_Np])
 {
-    auto __n = _Np;
+    size_t __n = _Np;
     if (__is.width() > 0)
         __n = _VSTD::min(size_t(__is.width()), _Np);
     return _VSTD::__input_c_string(__is, __buf, __n);
 @@ -626,26 +642,33 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+        try
-        if (__sen)
         {
+#endif
             typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
             if (_Traits::eq_int_type(__i, _Traits::eof()))
-                __is.setstate(ios_base::eofbit | ios_base::failbit);
+                __state |= ios_base::eofbit | ios_base::failbit;
             else
                 __c = _Traits::to_char_type(__i);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }
 @@ -669,58 +692,56 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_type>* __sb)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __s(*this, true);
-    try
+    if (__s)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+        if (__sb)
-        sentry __s(*this, true);
-        if (__s)
         {
-            if (__sb)
-            {
 #ifndef _LIBCPP_NO_EXCEPTIONS
-                try
+            try
+            {
+#endif // _LIBCPP_NO_EXCEPTIONS
+                while (true)
                 {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+                    typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                    ios_base::iostate __err = ios_base::goodbit;
+                    if (traits_type::eq_int_type(__i, _Traits::eof()))
-                    while (true)
                     {
-                        typename traits_type::int_type __i = this->rdbuf()->sgetc();
+                       __state |= ios_base::eofbit;
-                        if (traits_type::eq_int_type(__i, _Traits::eof()))
+                       break;
-                        {
-                           __err |= ios_base::eofbit;
-                           break;
-                        }
-                        if (traits_type::eq_int_type(
-                                __sb->sputc(traits_type::to_char_type(__i)),
-                                traits_type::eof()))
-                            break;
-                        ++__gc_;
-                        this->rdbuf()->sbumpc();
                     }
-                    if (__gc_ == 0)
+                    if (traits_type::eq_int_type(
-                       __err |= ios_base::failbit;
+                            __sb->sputc(traits_type::to_char_type(__i)),
-                    this->setstate(__err);
+                            traits_type::eof()))
-#ifndef _LIBCPP_NO_EXCEPTIONS
+                        break;
+                    ++__gc_;
+                    this->rdbuf()->sbumpc();
                 }
-                catch (...)
+                if (__gc_ == 0)
+                   __state |= ios_base::failbit;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+            }
+            catch (...)
+            {
+                __state |= ios_base::badbit;
+                if (__gc_ == 0)
+                    __state |= ios_base::failbit;
+                this->__setstate_nothrow(__state);
+                if (this->exceptions() & ios_base::failbit || this->exceptions() & ios_base::badbit)
                 {
-                    if (__gc_ == 0)
+                    throw;
-                        this->__set_failbit_and_consider_rethrow();
                 }
-#endif  // _LIBCPP_NO_EXCEPTIONS
             }
-            else
+#endif  // _LIBCPP_NO_EXCEPTIONS
-                this->setstate(ios_base::failbit);
         }
-#ifndef _LIBCPP_NO_EXCEPTIONS
+        else
-    }
+        {
-    catch (...)
+            __state |= ios_base::failbit;
-    {
+        }
-        this->__set_badbit_and_consider_rethrow();
+        this->setstate(__state);
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return *this;
 }
 @@ -728,28 +749,34 @@ template<class _CharT, class _Traits>
 typename basic_istream<_CharT, _Traits>::int_type
 basic_istream<_CharT, _Traits>::get()
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
     int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __s(*this, true);
-    try
+    if (__s)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this, true);
+        try
-        if (__s)
         {
+#endif
             __r = this->rdbuf()->sbumpc();
             if (traits_type::eq_int_type(__r, traits_type::eof()))
-               this->setstate(ios_base::failbit | ios_base::eofbit);
+               __state |= ios_base::failbit | ios_base::eofbit;
             else
                 __gc_ = 1;
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            this->__setstate_nothrow(this->rdstate() | ios_base::badbit);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        this->setstate(__state);
     }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __r;
 }
 @@ -757,23 +784,23 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __dlm)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+        if (__n > 0)
-        sentry __sen(*this, true);
-        if (__sen)
         {
-            if (__n > 0)
+#ifndef _LIBCPP_NO_EXCEPTIONS
+            try
             {
-                ios_base::iostate __err = ios_base::goodbit;
+#endif
                 while (__gc_ < __n-1)
                 {
                     int_type __i = this->rdbuf()->sgetc();
                     if (traits_type::eq_int_type(__i, traits_type::eof()))
                     {
-                       __err |= ios_base::eofbit;
+                       __state |= ios_base::eofbit;
                        break;
                     }
                     char_type __ch = traits_type::to_char_type(__i);
 @@ -784,23 +811,33 @@ basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __
                      this->rdbuf()->sbumpc();
                 }
                 if (__gc_ == 0)
-                   __err |= ios_base::failbit;
+                   __state |= ios_base::failbit;
-                this->setstate(__err);
+#ifndef _LIBCPP_NO_EXCEPTIONS
             }
-            else
+            catch (...)
-                this->setstate(ios_base::failbit);
+            {
+                __state |= ios_base::badbit;
+                this->__setstate_nothrow(__state);
+                if (this->exceptions() & ios_base::badbit)
+                {
+                    if (__n > 0)
+                        *__s = char_type();
+                    throw;
+                }
+            }
+#endif
         }
+        else
+        {
+            __state |= ios_base::failbit;
+        }
         if (__n > 0)
             *__s = char_type();
-#ifndef _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
-    }
-    catch (...)
-    {
-        if (__n > 0)
-            *__s = char_type();
-        this->__set_badbit_and_consider_rethrow();
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
+    if (__n > 0)
+        *__s = char_type();
     return *this;
 }
 @@ -809,52 +846,43 @@ basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __sb,
                                     char_type __dlm)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
 #ifndef _LIBCPP_NO_EXCEPTIONS
-            try
+        try
-            {
+        {
 #endif  // _LIBCPP_NO_EXCEPTIONS
-                while (true)
+            while (true)
+            {
+                typename traits_type::int_type __i = this->rdbuf()->sgetc();
+                if (traits_type::eq_int_type(__i, traits_type::eof()))
                 {
-                    typename traits_type::int_type __i = this->rdbuf()->sgetc();
+                   __state |= ios_base::eofbit;
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
+                   break;
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    char_type __ch = traits_type::to_char_type(__i);
-                    if (traits_type::eq(__ch, __dlm))
-                        break;
-                    if (traits_type::eq_int_type(__sb.sputc(__ch), traits_type::eof()))
-                        break;
-                    ++__gc_;
-                    this->rdbuf()->sbumpc();
                 }
-#ifndef _LIBCPP_NO_EXCEPTIONS
+                char_type __ch = traits_type::to_char_type(__i);
-            }
+                if (traits_type::eq(__ch, __dlm))
-            catch (...)
+                    break;
-            {
+                if (traits_type::eq_int_type(__sb.sputc(__ch), traits_type::eof()))
+                    break;
+                ++__gc_;
+                this->rdbuf()->sbumpc();
             }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            // according to the spec, exceptions here are caught but not rethrown
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        if (__gc_ == 0)
+           __state |= ios_base::failbit;
+        this->setstate(__state);
+    }
     return *this;
 }
 @@ -862,21 +890,21 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_type __dlm)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
-            ios_base::iostate __err = ios_base::goodbit;
+#endif  // _LIBCPP_NO_EXCEPTIONS
             while (true)
             {
                 typename traits_type::int_type __i = this->rdbuf()->sgetc();
                 if (traits_type::eq_int_type(__i, traits_type::eof()))
                 {
-                   __err |= ios_base::eofbit;
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 char_type __ch = traits_type::to_char_type(__i);
 @@ -888,28 +916,35 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ
                 }
                 if (__gc_ >= __n-1)
                 {
-                    __err |= ios_base::failbit;
+                    __state |= ios_base::failbit;
                     break;
                 }
                 *__s++ = __ch;
                 this->rdbuf()->sbumpc();
                 ++__gc_;
             }
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
-        if (__n > 0)
-            *__s = char_type();
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        if (__n > 0)
+            __state |= ios_base::badbit;
-            *__s = char_type();
+            this->__setstate_nothrow(__state);
-        this->__set_badbit_and_consider_rethrow();
+            if (this->exceptions() & ios_base::badbit)
-    }
+            {
+                if (__n > 0)
+                    *__s = char_type();
+                if (__gc_ == 0)
+                    __state |= ios_base::failbit;
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+    }
+    if (__n > 0)
+        *__s = char_type();
+    if (__gc_ == 0)
+        __state |= ios_base::failbit;
+    this->setstate(__state);
     return *this;
 }
 @@ -917,15 +952,15 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
-            ios_base::iostate __err = ios_base::goodbit;
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (__n == numeric_limits<streamsize>::max())
             {
                 while (true)
 @@ -933,7 +968,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
                     typename traits_type::int_type __i = this->rdbuf()->sbumpc();
                     if (traits_type::eq_int_type(__i, traits_type::eof()))
                     {
-                       __err |= ios_base::eofbit;
+                       __state |= ios_base::eofbit;
                        break;
                     }
                     ++__gc_;
 @@ -948,7 +983,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
                     typename traits_type::int_type __i = this->rdbuf()->sbumpc();
                     if (traits_type::eq_int_type(__i, traits_type::eof()))
                     {
-                       __err |= ios_base::eofbit;
+                       __state |= ios_base::eofbit;
                        break;
                     }
                     ++__gc_;
 @@ -956,15 +991,20 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
                         break;
                 }
             }
-            this->setstate(__err);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return *this;
 }
 @@ -972,26 +1012,33 @@ template<class _CharT, class _Traits>
 typename basic_istream<_CharT, _Traits>::int_type
 basic_istream<_CharT, _Traits>::peek()
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
     int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             __r = this->rdbuf()->sgetc();
             if (traits_type::eq_int_type(__r, traits_type::eof()))
-                this->setstate(ios_base::eofbit);
+                __state |= ios_base::eofbit;
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return __r;
 }
 @@ -999,27 +1046,36 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             __gc_ = this->rdbuf()->sgetn(__s, __n);
             if (__gc_ != __n)
-                this->setstate(ios_base::failbit | ios_base::eofbit);
+                __state |= ios_base::failbit | ios_base::eofbit;
-        }
-        else
-            this->setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif  // _LIBCPP_NO_EXCEPTIONS
     }
-    catch (...)
+    else
     {
-        this->__set_badbit_and_consider_rethrow();
+        __state |= ios_base::failbit;
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
+    this->setstate(__state);
     return *this;
 }
 @@ -1027,36 +1083,48 @@ template<class _CharT, class _Traits>
 streamsize
 basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __n)
 {
+    ios_base::iostate __state = ios_base::goodbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             streamsize __c = this->rdbuf()->in_avail();
             switch (__c)
             {
             case -1:
-                this->setstate(ios_base::eofbit);
+                __state |= ios_base::eofbit;
                 break;
             case 0:
                 break;
             default:
-                read(__s, _VSTD::min(__c, __n));
+                __n = _VSTD::min(__c, __n);
+                __gc_ = this->rdbuf()->sgetn(__s, __n);
+                if (__gc_ != __n)
+                    __state |= ios_base::failbit | ios_base::eofbit;
                 break;
             }
-        }
-        else
-            this->setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif  // _LIBCPP_NO_EXCEPTIONS
     }
-    catch (...)
+    else
     {
-        this->__set_badbit_and_consider_rethrow();
+        __state |= ios_base::failbit;
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
+    this->setstate(__state);
     return __gc_;
 }
 @@ -1064,27 +1132,36 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::putback(char_type __c)
 {
+    ios_base::iostate __state = this->rdstate() & ~ios_base::eofbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    this->clear(__state);
-    try
+    sentry __sen(*this, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
+        try
-        sentry __sen(*this, true);
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (this->rdbuf() == 0 || this->rdbuf()->sputbackc(__c) == traits_type::eof())
-                this->setstate(ios_base::badbit);
+                __state |= ios_base::badbit;
-        }
-        else
-            this->setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif  // _LIBCPP_NO_EXCEPTIONS
     }
-    catch (...)
+    else
     {
-        this->__set_badbit_and_consider_rethrow();
+        __state |= ios_base::failbit;
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
+    this->setstate(__state);
     return *this;
 }
 @@ -1092,27 +1169,36 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::unget()
 {
+    ios_base::iostate __state = this->rdstate() & ~ios_base::eofbit;
     __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    this->clear(__state);
-    try
+    sentry __sen(*this, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
+        try
-        sentry __sen(*this, true);
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (this->rdbuf() == 0 || this->rdbuf()->sungetc() == traits_type::eof())
-                this->setstate(ios_base::badbit);
+                __state |= ios_base::badbit;
-        }
-        else
-            this->setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif  // _LIBCPP_NO_EXCEPTIONS
     }
-    catch (...)
+    else
     {
-        this->__set_badbit_and_consider_rethrow();
+        __state |= ios_base::failbit;
     }
-#endif  // _LIBCPP_NO_EXCEPTIONS
+    this->setstate(__state);
     return *this;
 }
 @@ -1120,29 +1206,36 @@ template<class _CharT, class _Traits>
 int
 basic_istream<_CharT, _Traits>::sync()
 {
+    ios_base::iostate __state = ios_base::goodbit;
     int __r = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        try
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (this->rdbuf() == 0)
                 return -1;
             if (this->rdbuf()->pubsync() == -1)
             {
-                this->setstate(ios_base::badbit);
+                __state |= ios_base::badbit;
                 return -1;
             }
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return __r;
 }
 @@ -1150,21 +1243,30 @@ template<class _CharT, class _Traits>
 typename basic_istream<_CharT, _Traits>::pos_type
 basic_istream<_CharT, _Traits>::tellg()
 {
+    ios_base::iostate __state = ios_base::goodbit;
     pos_type __r(-1);
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    sentry __sen(*this, true);
-    try
+    if (__sen)
     {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+        try
+        {
 #endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
+        __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-        if (__sen)
-            __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return __r;
 }
 @@ -1172,24 +1274,31 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::seekg(pos_type __pos)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = this->rdstate() & ~ios_base::eofbit;
-    try
+    this->clear(__state);
+    sentry __sen(*this, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
+        try
-        sentry __sen(*this, true);
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
+                __state |= ios_base::failbit;
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return *this;
 }
 @@ -1197,24 +1306,31 @@ template<class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = this->rdstate() & ~ios_base::eofbit;
-    try
+    this->clear(__state);
+    sentry __sen(*this, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
+        try
-        sentry __sen(*this, true);
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
+                __state |= ios_base::failbit;
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        this->__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            this->__setstate_nothrow(__state);
+            if (this->exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        this->setstate(__state);
+    }
     return *this;
 }
 @@ -1222,34 +1338,41 @@ template <class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 ws(basic_istream<_CharT, _Traits>& __is)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
+        try
-        if (__sen)
         {
+#endif  // _LIBCPP_NO_EXCEPTIONS
             const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
             while (true)
             {
                 typename _Traits::int_type __i = __is.rdbuf()->sgetc();
                 if (_Traits::eq_int_type(__i, _Traits::eof()))
                 {
-                   __is.setstate(ios_base::eofbit);
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 if (!__ct.is(__ct.space, _Traits::to_char_type(__i)))
                     break;
                 __is.rdbuf()->sbumpc();
             }
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
-    }
+        }
-    catch (...)
+        catch (...)
-    {
+        {
-        __is.__set_badbit_and_consider_rethrow();
+            __state |= ios_base::badbit;
-    }
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
 #endif  // _LIBCPP_NO_EXCEPTIONS
+        __is.setstate(__state);
+    }
     return __is;
 }
 @@ -1298,7 +1421,6 @@ protected:
     inline _LIBCPP_HIDE_FROM_ABI_AFTER_V1
     void swap(basic_iostream& __rhs)
     { basic_istream<char_type, traits_type>::swap(__rhs); }
-public:
 };
 #ifndef _LIBCPP_CXX03_LANG
 @@ -1329,13 +1451,14 @@ basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is,
            basic_string<_CharT, _Traits, _Allocator>& __str)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+        try
-        if (__sen)
         {
+#endif
             __str.clear();
             streamsize __n = __is.width();
             if (__n <= 0)
 @@ -1344,13 +1467,12 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
                 __n = numeric_limits<streamsize>::max();
             streamsize __c = 0;
             const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
             while (__c < __n)
             {
                 typename _Traits::int_type __i = __is.rdbuf()->sgetc();
                 if (_Traits::eq_int_type(__i, _Traits::eof()))
                 {
-                   __err |= ios_base::eofbit;
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 _CharT __ch = _Traits::to_char_type(__i);
 @@ -1362,18 +1484,21 @@ operator>>(basic_istream<_CharT, _Traits>& __is,
             }
             __is.width(0);
             if (__c == 0)
-               __err |= ios_base::failbit;
+               __state |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }
 @@ -1382,22 +1507,22 @@ basic_istream<_CharT, _Traits>&
 getline(basic_istream<_CharT, _Traits>& __is,
         basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
+        try
-        if (__sen)
         {
+#endif
             __str.clear();
-            ios_base::iostate __err = ios_base::goodbit;
             streamsize __extr = 0;
             while (true)
             {
                 typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
                 if (_Traits::eq_int_type(__i, _Traits::eof()))
                 {
-                   __err |= ios_base::eofbit;
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 ++__extr;
 @@ -1407,21 +1532,26 @@ getline(basic_istream<_CharT, _Traits>& __is,
                 __str.push_back(__ch);
                 if (__str.size() == __str.max_size())
                 {
-                    __err |= ios_base::failbit;
+                    __state |= ios_base::failbit;
                     break;
                 }
             }
             if (__extr == 0)
-               __err |= ios_base::failbit;
+               __state |= ios_base::failbit;
-            __is.setstate(__err);
-        }
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }
 @@ -1460,17 +1590,17 @@ template <class _CharT, class _Traits, size_t _Size>
 basic_istream<_CharT, _Traits>&
 operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
 {
-#ifndef _LIBCPP_NO_EXCEPTIONS
+    ios_base::iostate __state = ios_base::goodbit;
-    try
+    typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+    if (__sen)
     {
-#endif  // _LIBCPP_NO_EXCEPTIONS
+#ifndef _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
+        try
-        if (__sen)
         {
+#endif
             basic_string<_CharT, _Traits> __str;
             const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
             size_t __c = 0;
-            ios_base::iostate __err = ios_base::goodbit;
             _CharT __zero = __ct.widen('0');
             _CharT __one = __ct.widen('1');
             while (__c < _Size)
 @@ -1478,7 +1608,7 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
                 typename _Traits::int_type __i = __is.rdbuf()->sgetc();
                 if (_Traits::eq_int_type(__i, _Traits::eof()))
                 {
-                   __err |= ios_base::eofbit;
+                   __state |= ios_base::eofbit;
                    break;
                 }
                 _CharT __ch = _Traits::to_char_type(__i);
 @@ -1490,18 +1620,21 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
             }
             __x = bitset<_Size>(__str);
             if (__c == 0)
-               __err |= ios_base::failbit;
+               __state |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
 #ifndef _LIBCPP_NO_EXCEPTIONS
+        }
+        catch (...)
+        {
+            __state |= ios_base::badbit;
+            __is.__setstate_nothrow(__state);
+            if (__is.exceptions() & ios_base::badbit)
+            {
+                throw;
+            }
+        }
+#endif
+        __is.setstate(__state);
     }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return __is;
 }

lib/libcxx/include/iterator+141-106

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- iterator ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -70,7 +69,7 @@ typename iterator_traits<InputIterator>::difference_type n = 1);
 template <class BidirectionalIterator>  // constexpr in C++17
   constexpr BidirectionalIterator prev(BidirectionalIterator x,
     typename iterator_traits<BidirectionalIterator>::difference_type n = 1);
 template <class Iterator>
 class reverse_iterator
 @@ -137,7 +136,7 @@ operator-(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2
 template <class Iterator>
 constexpr reverse_iterator<Iterator>
 operator+(typename reverse_iterator<Iterator>::difference_type n,
           const reverse_iterator<Iterator>& x);   // constexpr in C++17
 template <class Iterator>
 @@ -217,7 +216,7 @@ public:
     typedef typename iterator_traits<Iterator>::value_type        value_type;
     typedef typename iterator_traits<Iterator>::iterator_category iterator_category;
     typedef value_type&&                                          reference;
     constexpr move_iterator();  // all the constexprs are in C++17
     constexpr explicit move_iterator(Iterator i);
     template <class U>
 @@ -231,10 +230,10 @@ public:
     constexpr move_iterator operator++(int);
     constexpr move_iterator& operator--();
     constexpr move_iterator operator--(int);
     constexpr move_iterator operator+(difference_type n) const;
     constexpr move_iterator& operator+=(difference_type n);
     constexpr move_iterator operator-(difference_type n) const;
     constexpr move_iterator& operator-=(difference_type n);
     constexpr unspecified operator[](difference_type n) const;
 private:
     Iterator current; // exposition only
 @@ -271,7 +270,7 @@ operator-(const move_iterator<Iterator1>& x,
 template <class Iterator>
 constexpr move_iterator<Iterator> operator+(   // constexpr in C++17
             typename move_iterator<Iterator>::difference_type n,
             const move_iterator<Iterator>& x);
 template <class Iterator>   // constexpr in C++17
 @@ -400,6 +399,11 @@ template <class C> constexpr auto crend(const C& c) -> decltype(std::rend(c));
 // 24.8, container access:
 template <class C> constexpr auto size(const C& c) -> decltype(c.size());         // C++17
 template <class T, size_t N> constexpr size_t size(const T (&array)[N]) noexcept; // C++17
+template <class C> constexpr auto ssize(const C& c)
+    -> common_type_t<ptrdiff_t, make_signed_t<decltype(c.size())>>;				       // C++20
+template <class T, ptrdiff_t> constexpr ptrdiff_t ssize(const T (&array)[N]) noexcept; // C++20
 template <class C> constexpr auto empty(const C& c) -> decltype(c.empty());       // C++17
 template <class T, size_t N> constexpr bool empty(const T (&array)[N]) noexcept;  // C++17
 template <class E> constexpr bool empty(initializer_list<E> il) noexcept;         // C++17
 @@ -530,10 +534,26 @@ struct __is_random_access_iterator : public __has_iterator_category_convertible_
 template <class _Tp>
 struct __is_exactly_input_iterator
     : public integral_constant<bool,
          __has_iterator_category_convertible_to<_Tp, input_iterator_tag>::value &&
         !__has_iterator_category_convertible_to<_Tp, forward_iterator_tag>::value> {};
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _InputIterator>
+using __iter_value_type = typename iterator_traits<_InputIterator>::value_type;
+template<class _InputIterator>
+using __iter_key_type = remove_const_t<typename iterator_traits<_InputIterator>::value_type::first_type>;
+template<class _InputIterator>
+using __iter_mapped_type = typename iterator_traits<_InputIterator>::value_type::second_type;
+template<class _InputIterator>
+using __iter_to_alloc_type = pair<
+    add_const_t<typename iterator_traits<_InputIterator>::value_type::first_type>,
+    typename iterator_traits<_InputIterator>::value_type::second_type>;
+#endif
 template<class _Category, class _Tp, class _Distance = ptrdiff_t,
          class _Pointer = _Tp*, class _Reference = _Tp&>
 struct _LIBCPP_TEMPLATE_VIS iterator
 @@ -580,6 +600,8 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 void advance(_InputIter& __i,
              typename iterator_traits<_InputIter>::difference_type __n)
 {
+    _LIBCPP_ASSERT(__n >= 0 || __is_bidirectional_iterator<_InputIter>::value,
+                       "Attempt to advance(it, -n) on a non-bidi iterator");
     __advance(__i, __n, typename iterator_traits<_InputIter>::iterator_category());
 }
 @@ -614,26 +636,31 @@ template <class _InputIter>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 typename enable_if
 <
     __is_input_iterator<_InputIter>::value,
     _InputIter
 >::type
 next(_InputIter __x,
      typename iterator_traits<_InputIter>::difference_type __n = 1)
 {
+    _LIBCPP_ASSERT(__n >= 0 || __is_bidirectional_iterator<_InputIter>::value,
+                       "Attempt to next(it, -n) on a non-bidi iterator");
     _VSTD::advance(__x, __n);
     return __x;
 }
-template <class _BidirectionalIter>
+template <class _InputIter>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 typename enable_if
 <
-    __is_bidirectional_iterator<_BidirectionalIter>::value,
+    __is_input_iterator<_InputIter>::value,
-    _BidirectionalIter
+    _InputIter
 >::type
-prev(_BidirectionalIter __x,
+prev(_InputIter __x,
-     typename iterator_traits<_BidirectionalIter>::difference_type __n = 1)
+     typename iterator_traits<_InputIter>::difference_type __n = 1)
 {
+    _LIBCPP_ASSERT(__n <= 0 || __is_bidirectional_iterator<_InputIter>::value,
+                       "Attempt to prev(it, +n) on a non-bidi iterator");
     _VSTD::advance(__x, -__n);
     return __x;
 }
 @@ -1079,10 +1106,6 @@ public:
     _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++(int) {return *this;}
     _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
-#if !defined(__APPLE__) || \
-    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
     template <class _Ch, class _Tr>
     friend
     _LIBCPP_HIDDEN
 @@ -1090,7 +1113,6 @@ public:
     __pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,
                      const _Ch* __ob, const _Ch* __op, const _Ch* __oe,
                      ios_base& __iob, _Ch __fl);
-#endif
 };
 template <class _Iter>
 @@ -1123,7 +1145,7 @@ public:
       _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
       move_iterator(const move_iterator<_Up>& __u) : __i(__u.base()) {}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14 _Iter base() const {return __i;}
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
     reference operator*() const { return static_cast<reference>(*__i); }
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
     pointer  operator->() const { return __i;}
 @@ -1237,50 +1259,50 @@ template <class _Iter> class __wrap_iter;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 auto
-operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 -> decltype(__x.base() - __y.base());
 #else
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY
 typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 #endif
 template <class _Iter>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 __wrap_iter<_Iter>
-operator+(typename __wrap_iter<_Iter>::difference_type, __wrap_iter<_Iter>) _NOEXCEPT_DEBUG;
+operator+(typename __wrap_iter<_Iter>::difference_type, __wrap_iter<_Iter>) _NOEXCEPT;
 template <class _Ip, class _Op> _Op _LIBCPP_INLINE_VISIBILITY copy(_Ip, _Ip, _Op);
 template <class _B1, class _B2> _B2 _LIBCPP_INLINE_VISIBILITY copy_backward(_B1, _B1, _B2);
 @@ -1324,7 +1346,7 @@ public:
 private:
     iterator_type __i;
 public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter() _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter() _NOEXCEPT
 #if _LIBCPP_STD_VER > 11
                 : __i{}
 #endif
 @@ -1335,7 +1357,7 @@ public:
     }
     template <class _Up> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
         __wrap_iter(const __wrap_iter<_Up>& __u,
-            typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = 0) _NOEXCEPT_DEBUG
+            typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = 0) _NOEXCEPT
             : __i(__u.base())
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
 @@ -1365,7 +1387,7 @@ public:
         __get_db()->__erase_i(this);
     }
 #endif
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG reference operator*() const _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG reference operator*() const _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
 @@ -1373,7 +1395,7 @@ public:
 #endif
         return *__i;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG pointer  operator->() const _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG pointer  operator->() const _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
 @@ -1381,7 +1403,7 @@ public:
 #endif
         return (pointer)_VSTD::addressof(*__i);
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator++() _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator++() _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
 @@ -1390,10 +1412,10 @@ public:
         ++__i;
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator++(int) _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator++(int) _NOEXCEPT
         {__wrap_iter __tmp(*this); ++(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator--() _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator--() _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
 @@ -1402,11 +1424,11 @@ public:
         --__i;
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator--(int) _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator--(int) _NOEXCEPT
         {__wrap_iter __tmp(*this); --(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT
         {__wrap_iter __w(*this); __w += __n; return __w;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator+=(difference_type __n) _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator+=(difference_type __n) _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__addable(this, __n),
 @@ -1415,11 +1437,11 @@ public:
         __i += __n;
         return *this;
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator- (difference_type __n) const _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter  operator- (difference_type __n) const _NOEXCEPT
         {return *this + (-__n);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator-=(difference_type __n) _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator-=(difference_type __n) _NOEXCEPT
         {*this += -__n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG reference    operator[](difference_type __n) const _NOEXCEPT_DEBUG
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG reference    operator[](difference_type __n) const _NOEXCEPT
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
         _LIBCPP_ASSERT(__get_const_db()->__subscriptable(this, __n),
 @@ -1428,7 +1450,7 @@ public:
         return __i[__n];
     }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG iterator_type base() const _NOEXCEPT_DEBUG {return __i;}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG iterator_type base() const _NOEXCEPT {return __i;}
 private:
 #if _LIBCPP_DEBUG_LEVEL >= 2
 @@ -1437,61 +1459,61 @@ private:
         __get_db()->__insert_ic(this, __p);
     }
 #else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter(iterator_type __x) _NOEXCEPT_DEBUG : __i(__x) {}
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter(iterator_type __x) _NOEXCEPT : __i(__x) {}
 #endif
     template <class _Up> friend class __wrap_iter;
     template <class _CharT, class _Traits, class _Alloc> friend class basic_string;
     template <class _Tp, class _Alloc> friend class _LIBCPP_TEMPLATE_VIS vector;
-    template <class _Tp, ptrdiff_t> friend class _LIBCPP_TEMPLATE_VIS span;
+    template <class _Tp, size_t> friend class _LIBCPP_TEMPLATE_VIS span;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     bool
-    operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 #ifndef _LIBCPP_CXX03_LANG
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     auto
-    operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+    operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
     -> decltype(__x.base() - __y.base());
 #else
     template <class _Iter1, class _Iter2>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     typename __wrap_iter<_Iter1>::difference_type
-    operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT_DEBUG;
+    operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 #endif
     template <class _Iter1>
     _LIBCPP_CONSTEXPR_IF_NODEBUG friend
     __wrap_iter<_Iter1>
-    operator+(typename __wrap_iter<_Iter1>::difference_type, __wrap_iter<_Iter1>) _NOEXCEPT_DEBUG;
+    operator+(typename __wrap_iter<_Iter1>::difference_type, __wrap_iter<_Iter1>) _NOEXCEPT;
     template <class _Ip, class _Op> friend _Op copy(_Ip, _Ip, _Op);
     template <class _B1, class _B2> friend _B2 copy_backward(_B1, _B1, _B2);
 @@ -1522,7 +1544,7 @@ private:
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     return __x.base() == __y.base();
 }
 @@ -1530,7 +1552,7 @@ operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEX
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
     _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
 @@ -1542,7 +1564,7 @@ operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXC
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     return !(__x == __y);
 }
 @@ -1550,7 +1572,7 @@ operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEX
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     return __y < __x;
 }
 @@ -1558,7 +1580,7 @@ operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXC
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     return !(__x < __y);
 }
 @@ -1566,7 +1588,7 @@ operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEX
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
     return !(__y < __x);
 }
 @@ -1574,7 +1596,7 @@ operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEX
 template <class _Iter1>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT_DEBUG
+operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
 {
     return !(__x == __y);
 }
 @@ -1582,7 +1604,7 @@ operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEX
 template <class _Iter1>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT_DEBUG
+operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
 {
     return __y < __x;
 }
 @@ -1590,7 +1612,7 @@ operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXC
 template <class _Iter1>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT_DEBUG
+operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
 {
     return !(__x < __y);
 }
 @@ -1598,7 +1620,7 @@ operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEX
 template <class _Iter1>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT_DEBUG
+operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
 {
     return !(__y < __x);
 }
 @@ -1607,7 +1629,7 @@ operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEX
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 auto
-operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 -> decltype(__x.base() - __y.base())
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
 @@ -1620,7 +1642,7 @@ operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXC
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT_DEBUG
+operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
     _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
 @@ -1634,7 +1656,7 @@ template <class _Iter>
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG
 __wrap_iter<_Iter>
 operator+(typename __wrap_iter<_Iter>::difference_type __n,
-          __wrap_iter<_Iter> __x) _NOEXCEPT_DEBUG
+          __wrap_iter<_Iter> __x) _NOEXCEPT
 {
     __x += __n;
     return __x;
 @@ -1643,7 +1665,7 @@ operator+(typename __wrap_iter<_Iter>::difference_type __n,
 template <class _Iter>
 struct __libcpp_is_trivial_iterator
     : public _LIBCPP_BOOL_CONSTANT(is_pointer<_Iter>::value) {};
 template <class _Iter>
 struct __libcpp_is_trivial_iterator<move_iterator<_Iter> >
     : public _LIBCPP_BOOL_CONSTANT(__libcpp_is_trivial_iterator<_Iter>::value) {};
 @@ -1658,7 +1680,7 @@ struct __libcpp_is_trivial_iterator<__wrap_iter<_Iter> >
 template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 _Tp*
 begin(_Tp (&__array)[_Np])
 {
 @@ -1666,7 +1688,7 @@ begin(_Tp (&__array)[_Np])
 }
 template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 _Tp*
 end(_Tp (&__array)[_Np])
 {
 @@ -1676,7 +1698,7 @@ end(_Tp (&__array)[_Np])
 #if !defined(_LIBCPP_CXX03_LANG)
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto
 begin(_Cp& __c) -> decltype(__c.begin())
 {
 @@ -1684,7 +1706,7 @@ begin(_Cp& __c) -> decltype(__c.begin())
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto
 begin(const _Cp& __c) -> decltype(__c.begin())
 {
 @@ -1692,7 +1714,7 @@ begin(const _Cp& __c) -> decltype(__c.begin())
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto
 end(_Cp& __c) -> decltype(__c.end())
 {
 @@ -1700,7 +1722,7 @@ end(_Cp& __c) -> decltype(__c.end())
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto
 end(const _Cp& __c) -> decltype(__c.end())
 {
 @@ -1710,84 +1732,84 @@ end(const _Cp& __c) -> decltype(__c.end())
 #if _LIBCPP_STD_VER > 11
 template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np])
 {
     return reverse_iterator<_Tp*>(__array + _Np);
 }
 template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np])
 {
     return reverse_iterator<_Tp*>(__array);
 }
 template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il)
 {
     return reverse_iterator<const _Ep*>(__il.end());
 }
 template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)
 {
     return reverse_iterator<const _Ep*>(__il.begin());
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 auto cbegin(const _Cp& __c) -> decltype(_VSTD::begin(__c))
 {
     return _VSTD::begin(__c);
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 auto cend(const _Cp& __c) -> decltype(_VSTD::end(__c))
 {
     return _VSTD::end(__c);
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto rbegin(_Cp& __c) -> decltype(__c.rbegin())
 {
     return __c.rbegin();
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto rbegin(const _Cp& __c) -> decltype(__c.rbegin())
 {
     return __c.rbegin();
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto rend(_Cp& __c) -> decltype(__c.rend())
 {
     return __c.rend();
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto rend(const _Cp& __c) -> decltype(__c.rend())
 {
     return __c.rend();
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto crbegin(const _Cp& __c) -> decltype(_VSTD::rbegin(__c))
 {
     return _VSTD::rbegin(__c);
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
+_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX14
 auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))
 {
     return _VSTD::rend(__c);
 @@ -1799,7 +1821,7 @@ auto crend(const _Cp& __c) -> decltype(_VSTD::rend(__c))
 #else  // defined(_LIBCPP_CXX03_LANG)
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 typename _Cp::iterator
 begin(_Cp& __c)
 {
 @@ -1807,7 +1829,7 @@ begin(_Cp& __c)
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 typename _Cp::const_iterator
 begin(const _Cp& __c)
 {
 @@ -1815,7 +1837,7 @@ begin(const _Cp& __c)
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 typename _Cp::iterator
 end(_Cp& __c)
 {
 @@ -1823,7 +1845,7 @@ end(_Cp& __c)
 }
 template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 typename _Cp::const_iterator
 end(const _Cp& __c)
 {
 @@ -1849,51 +1871,64 @@ end(const _Cp& __c)
 // #endif
 template <class _Cont>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 constexpr auto size(const _Cont& __c)
 _NOEXCEPT_(noexcept(__c.size()))
 -> decltype        (__c.size())
 { return            __c.size(); }
 template <class _Tp, size_t _Sz>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 constexpr size_t size(const _Tp (&)[_Sz]) noexcept { return _Sz; }
+#if _LIBCPP_STD_VER > 17
 template <class _Cont>
-_LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
+constexpr auto ssize(const _Cont& __c)
+_NOEXCEPT_(noexcept(static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(__c.size())))
+->                              common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>
+{ return            static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(__c.size()); }
+template <class _Tp, ptrdiff_t _Sz>
+_LIBCPP_INLINE_VISIBILITY
+constexpr ptrdiff_t ssize(const _Tp (&)[_Sz]) noexcept { return _Sz; }
+#endif
+template <class _Cont>
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
 constexpr auto empty(const _Cont& __c)
 _NOEXCEPT_(noexcept(__c.empty()))
 -> decltype        (__c.empty())
 { return            __c.empty(); }
 template <class _Tp, size_t _Sz>
-_LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
 constexpr bool empty(const _Tp (&)[_Sz]) noexcept { return false; }
 template <class _Ep>
-_LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY
 constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; }
 template <class _Cont> constexpr
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 auto data(_Cont& __c)
 _NOEXCEPT_(noexcept(__c.data()))
 -> decltype        (__c.data())
 { return            __c.data(); }
 template <class _Cont> constexpr
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 auto data(const _Cont& __c)
 _NOEXCEPT_(noexcept(__c.data()))
 -> decltype        (__c.data())
 { return            __c.data(); }
 template <class _Tp, size_t _Sz>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept { return __array; }
 template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
+_LIBCPP_INLINE_VISIBILITY
 constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept { return __il.begin(); }
 #endif

lib/libcxx/include/limits+4-5

lib/libcxx/include/limits.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- limits.h ---------------------------------===//	2	//===--------------------------- limits.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/list+86-72

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- list ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -130,11 +129,12 @@ public:
     void splice(const_iterator position, list&& x, const_iterator first,
                                                   const_iterator last);
-    void remove(const value_type& value);
+    size_type remove(const value_type& value);       // void before C++20
-    template <class Pred> void remove_if(Pred pred);
+    template <class Pred>
-    void unique();
+      size_type remove_if(Pred pred);                // void before C++20
+    size_type unique();                              // void before C++20
     template <class BinaryPredicate>
-        void unique(BinaryPredicate binary_pred);
+      size_type unique(BinaryPredicate binary_pred); // void before C++20
     void merge(list& x);
     void merge(list&& x);
     template <class Compare>
 @@ -648,9 +648,9 @@ protected:
     void swap(__list_imp& __c)
 #if _LIBCPP_STD_VER >= 14
-        _NOEXCEPT_DEBUG;
+        _NOEXCEPT;
 #else
-        _NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value ||
+        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
                     __is_nothrow_swappable<allocator_type>::value);
 #endif
 @@ -770,9 +770,9 @@ template <class _Tp, class _Alloc>
 void
 __list_imp<_Tp, _Alloc>::swap(__list_imp& __c)
 #if _LIBCPP_STD_VER >= 14
-        _NOEXCEPT_DEBUG
+        _NOEXCEPT
 #else
-        _NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value ||
+        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
                     __is_nothrow_swappable<allocator_type>::value)
 #endif
 {
 @@ -858,6 +858,11 @@ public:
     typedef typename base::const_iterator            const_iterator;
     typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
     typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
+#if _LIBCPP_STD_VER > 17
+    typedef size_type                                __remove_return_type;
+#else
+    typedef void                                     __remove_return_type;
+#endif
     _LIBCPP_INLINE_VISIBILITY
     list()
 @@ -1039,9 +1044,9 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     void swap(list& __c)
 #if _LIBCPP_STD_VER >= 14
-        _NOEXCEPT_DEBUG
+        _NOEXCEPT
 #else
-        _NOEXCEPT_DEBUG_(!__node_alloc_traits::propagate_on_container_swap::value ||
+        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
                    __is_nothrow_swappable<__node_allocator>::value)
 #endif
         {base::swap(__c);}
 @@ -1071,12 +1076,12 @@ public:
     void splice(const_iterator __p, list& __c, const_iterator __i);
     void splice(const_iterator __p, list& __c, const_iterator __f, const_iterator __l);
-    void remove(const value_type& __x);
+    __remove_return_type remove(const value_type& __x);
-    template <class _Pred> void remove_if(_Pred __pred);
+    template <class _Pred> __remove_return_type remove_if(_Pred __pred);
     _LIBCPP_INLINE_VISIBILITY
-    void unique();
+    __remove_return_type unique() { return unique(__equal_to<value_type>()); }
     template <class _BinaryPred>
-        void unique(_BinaryPred __binary_pred);
+        __remove_return_type unique(_BinaryPred __binary_pred);
     _LIBCPP_INLINE_VISIBILITY
     void merge(list& __c);
 #ifndef _LIBCPP_CXX03_LANG
 @@ -2014,22 +2019,24 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c)
         base::__sz() += __c.__sz();
         __c.__sz() = 0;
 #if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
+        if (&__c != this) {
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
+            __libcpp_db* __db = __get_db();
-        __c_node* __cn2 = __db->__find_c(&__c);
+            __c_node* __cn1 = __db->__find_c_and_lock(this);
-        for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
+            __c_node* __cn2 = __db->__find_c(&__c);
-        {
+            for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
-            --__ip;
-            iterator* __i = static_cast<iterator*>((*__ip)->__i_);
-            if (__i->__ptr_ != __c.__end_as_link())
             {
-                __cn1->__add(*__ip);
+                --__ip;
-                (*__ip)->__c_ = __cn1;
+                iterator* __i = static_cast<iterator*>((*__ip)->__i_);
-                if (--__cn2->end_ != __ip)
+                if (__i->__ptr_ != __c.__end_as_link())
-                    memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                {
+                    __cn1->__add(*__ip);
+                    (*__ip)->__c_ = __cn1;
+                    if (--__cn2->end_ != __ip)
+                        memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                }
             }
+            __db->unlock();
         }
-        __db->unlock();
 #endif
     }
 }
 @@ -2057,22 +2064,24 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __i)
         --__c.__sz();
         ++base::__sz();
 #if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
+        if (&__c != this) {
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
+            __libcpp_db* __db = __get_db();
-        __c_node* __cn2 = __db->__find_c(&__c);
+            __c_node* __cn1 = __db->__find_c_and_lock(this);
-        for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
+            __c_node* __cn2 = __db->__find_c(&__c);
-        {
+            for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
-            --__ip;
-            iterator* __j = static_cast<iterator*>((*__ip)->__i_);
-            if (__j->__ptr_ == __f)
             {
-                __cn1->__add(*__ip);
+                --__ip;
-                (*__ip)->__c_ = __cn1;
+                iterator* __j = static_cast<iterator*>((*__ip)->__i_);
-                if (--__cn2->end_ != __ip)
+                if (__j->__ptr_ == __f)
-                    memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                {
+                    __cn1->__add(*__ip);
+                    (*__ip)->__c_ = __cn1;
+                    if (--__cn2->end_ != __ip)
+                        memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                }
             }
+            __db->unlock();
         }
-        __db->unlock();
 #endif
     }
 }
 @@ -2111,32 +2120,34 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __f, con
         base::__unlink_nodes(__first, __last);
         __link_nodes(__p.__ptr_, __first, __last);
 #if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
+        if (&__c != this) {
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
+            __libcpp_db* __db = __get_db();
-        __c_node* __cn2 = __db->__find_c(&__c);
+            __c_node* __cn1 = __db->__find_c_and_lock(this);
-        for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
+            __c_node* __cn2 = __db->__find_c(&__c);
-        {
+            for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;)
-            --__ip;
-            iterator* __j = static_cast<iterator*>((*__ip)->__i_);
-            for (__link_pointer __k = __f.__ptr_;
-                                          __k != __l.__ptr_; __k = __k->__next_)
             {
-                if (__j->__ptr_ == __k)
+                --__ip;
+                iterator* __j = static_cast<iterator*>((*__ip)->__i_);
+                for (__link_pointer __k = __f.__ptr_;
+                                              __k != __l.__ptr_; __k = __k->__next_)
                 {
-                    __cn1->__add(*__ip);
+                    if (__j->__ptr_ == __k)
-                    (*__ip)->__c_ = __cn1;
+                    {
-                    if (--__cn2->end_ != __ip)
+                        __cn1->__add(*__ip);
-                        memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                        (*__ip)->__c_ = __cn1;
+                        if (--__cn2->end_ != __ip)
+                            memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*));
+                    }
                 }
             }
+            __db->unlock();
         }
-        __db->unlock();
 #endif
     }
 }
 template <class _Tp, class _Alloc>
-void
+typename list<_Tp, _Alloc>::__remove_return_type
 list<_Tp, _Alloc>::remove(const value_type& __x)
 {
     list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
 @@ -2155,13 +2166,16 @@ list<_Tp, _Alloc>::remove(const value_type& __x)
         else
             ++__i;
     }
+    return (__remove_return_type) __deleted_nodes.size();
 }
 template <class _Tp, class _Alloc>
 template <class _Pred>
-void
+typename list<_Tp, _Alloc>::__remove_return_type
 list<_Tp, _Alloc>::remove_if(_Pred __pred)
 {
+    list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
     for (iterator __i = begin(), __e = end(); __i != __e;)
     {
         if (__pred(*__i))
 @@ -2169,36 +2183,36 @@ list<_Tp, _Alloc>::remove_if(_Pred __pred)
             iterator __j = _VSTD::next(__i);
             for (; __j != __e && __pred(*__j); ++__j)
                 ;
-            __i = erase(__i, __j);
+            __deleted_nodes.splice(__deleted_nodes.end(), *this, __i, __j);
+            __i = __j;
             if (__i != __e)
                 ++__i;
         }
         else
             ++__i;
     }
-}
-template <class _Tp, class _Alloc>
+    return (__remove_return_type) __deleted_nodes.size();
-inline
-void
-list<_Tp, _Alloc>::unique()
-{
-    unique(__equal_to<value_type>());
 }
 template <class _Tp, class _Alloc>
 template <class _BinaryPred>
-void
+typename list<_Tp, _Alloc>::__remove_return_type
 list<_Tp, _Alloc>::unique(_BinaryPred __binary_pred)
 {
+    list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
     for (iterator __i = begin(), __e = end(); __i != __e;)
     {
         iterator __j = _VSTD::next(__i);
         for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
             ;
-        if (++__i != __j)
+        if (++__i != __j) {
-            __i = erase(__i, __j);
+            __deleted_nodes.splice(__deleted_nodes.end(), *this, __i, __j);
+            __i = __j;
+            }
     }
+    return (__remove_return_type) __deleted_nodes.size();
 }
 template <class _Tp, class _Alloc>

lib/libcxx/include/locale+7-14

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- locale ------------------------------------===//	2	//===-------------------------- locale ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -127,7 +126,7 @@ public:	...	@@ -127,7 +126,7 @@ public:
127	wbuffer_convert(const wbuffer_convert&) = delete; // C++14	126	wbuffer_convert(const wbuffer_convert&) = delete; // C++14
128	wbuffer_convert & operator=(const wbuffer_convert &) = delete; // C++14	127	wbuffer_convert & operator=(const wbuffer_convert &) = delete; // C++14
129	~wbuffer_convert(); // C++14	128	~wbuffer_convert(); // C++14
130		129
131	streambuf* rdbuf() const;	130	streambuf* rdbuf() const;
132	streambuf* rdbuf(streambuf* bytebuf);	131	streambuf* rdbuf(streambuf* bytebuf);
133		132
...	@@ -547,7 +546,7 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex	...	@@ -547,7 +546,7 @@ __num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __ex
547	__exp = 'P';	546	__exp = 'P';
548	else if ((__x & 0x5F) == __exp)	547	else if ((__x & 0x5F) == __exp)
549	{	548	{
550	__exp \|= 0x80;	549	__exp \|= (char) 0x80;
551	if (__in_units)	550	if (__in_units)
552	{	551	{
553	__in_units = false;	552	__in_units = false;
...	@@ -1373,10 +1372,6 @@ __pad_and_output(_OutputIterator __s,	...	@@ -1373,10 +1372,6 @@ __pad_and_output(_OutputIterator __s,
1373	return __s;	1372	return __s;
1374	}	1373	}
1375		1374
1376	#if !defined(__APPLE__) \|\| \
1377	(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) \|\| \
1378	(defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
1379
1380	template <class _CharT, class _Traits>	1375	template <class _CharT, class _Traits>
1381	_LIBCPP_HIDDEN	1376	_LIBCPP_HIDDEN
1382	ostreambuf_iterator<_CharT, _Traits>	1377	ostreambuf_iterator<_CharT, _Traits>
...	@@ -1423,8 +1418,6 @@ __pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,	...	@@ -1423,8 +1418,6 @@ __pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,
1423	return __s;	1418	return __s;
1424	}	1419	}
1425		1420
1426	#endif
1427
1428	template <class _CharT, class _OutputIterator>	1421	template <class _CharT, class _OutputIterator>
1429	_OutputIterator	1422	_OutputIterator
1430	num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,	1423	num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
...	@@ -3930,7 +3923,7 @@ private:	...	@@ -3930,7 +3923,7 @@ private:
3930	wbuffer_convert(const wbuffer_convert&);	3923	wbuffer_convert(const wbuffer_convert&);
3931	wbuffer_convert& operator=(const wbuffer_convert&);	3924	wbuffer_convert& operator=(const wbuffer_convert&);
3932	public:	3925	public:
3933	_LIBCPP_EXPLICIT_AFTER_CXX11 wbuffer_convert(streambuf* __bytebuf = 0,	3926	_LIBCPP_EXPLICIT_AFTER_CXX11 wbuffer_convert(streambuf* __bytebuf = 0,
3934	_Codecvt* __pcvt = new _Codecvt, state_type __state = state_type());	3927	_Codecvt* __pcvt = new _Codecvt, state_type __state = state_type());
3935	~wbuffer_convert();	3928	~wbuffer_convert();
3936		3929
...	@@ -4045,7 +4038,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow()	...	@@ -4045,7 +4038,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow()
4045	this->egptr(), __inext);	4038	this->egptr(), __inext);
4046	if (__r == codecvt_base::noconv)	4039	if (__r == codecvt_base::noconv)
4047	{	4040	{
4048	this->setg((char_type)__extbuf_, (char_type)__extbuf_,	4041	this->setg((char_type)__extbuf_, (char_type)__extbuf_,
4049	(char_type) const_cast<char >(__extbufend_));	4042	(char_type) const_cast<char >(__extbufend_));
4050	__c = *this->gptr();	4043	__c = *this->gptr();
4051	}	4044	}

lib/libcxx/include/locale.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- locale.h --------------------------------===//	2	//===---------------------------- locale.h --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/map+86-18

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------- map ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -194,8 +193,8 @@ public:
         const_iterator find(const K& x) const;  // C++14
     template<typename K>
       size_type count(const K& x) const;        // C++14
     size_type      count(const key_type& k) const;
+        bool contains(const key_type& x) const; // C++20
           iterator lower_bound(const key_type& k);
     const_iterator lower_bound(const key_type& k) const;
     template<typename K>
 @@ -408,8 +407,8 @@ public:
         const_iterator find(const K& x) const;  // C++14
     template<typename K>
       size_type count(const K& x) const;        // C++14
     size_type      count(const key_type& k) const;
+        bool contains(const key_type& x) const; // C++20
           iterator lower_bound(const key_type& k);
     const_iterator lower_bound(const key_type& k) const;
     template<typename K>
 @@ -903,12 +902,11 @@ public:
     typedef _Key                                     key_type;
     typedef _Tp                                      mapped_type;
     typedef pair<const key_type, mapped_type>        value_type;
-    typedef _Compare                                 key_compare;
+    typedef typename __identity<_Compare>::type      key_compare;
-    typedef _Allocator                               allocator_type;
+    typedef typename __identity<_Allocator>::type    allocator_type;
     typedef value_type&                              reference;
     typedef const value_type&                        const_reference;
-    static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
     static_assert((is_same<typename allocator_type::value_type, value_type>::value),
                   "Allocator::value_type must be same type as value_type");
 @@ -1086,6 +1084,11 @@ public:
             insert(__m.begin(), __m.end());
         }
+    _LIBCPP_INLINE_VISIBILITY
+    ~map() {
+        static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
+    }
     _LIBCPP_INLINE_VISIBILITY
           iterator begin() _NOEXCEPT {return __tree_.begin();}
     _LIBCPP_INLINE_VISIBILITY
 @@ -1395,6 +1398,12 @@ public:
     typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
     count(const _K2& __k) const {return __tree_.__count_multi(__k);}
 #endif
+#if _LIBCPP_STD_VER > 17
+    _LIBCPP_INLINE_VISIBILITY
+    bool contains(const key_type& __k) const {return find(__k) != end();}
+#endif // _LIBCPP_STD_VER > 17
     _LIBCPP_INLINE_VISIBILITY
     iterator lower_bound(const key_type& __k)
         {return __tree_.lower_bound(__k);}
 @@ -1462,6 +1471,32 @@ private:
 #endif
 };
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _InputIterator, class _Compare = less<__iter_key_type<_InputIterator>>,
+         class _Allocator = allocator<__iter_to_alloc_type<_InputIterator>>,
+         class = enable_if_t<!__is_allocator<_Compare>::value, void>,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+map(_InputIterator, _InputIterator, _Compare = _Compare(), _Allocator = _Allocator())
+  -> map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>, _Compare, _Allocator>;
+template<class _Key, class _Tp, class _Compare = less<remove_const_t<_Key>>,
+         class _Allocator = allocator<pair<const _Key, _Tp>>,
+         class = enable_if_t<!__is_allocator<_Compare>::value, void>,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+map(initializer_list<pair<_Key, _Tp>>, _Compare = _Compare(), _Allocator = _Allocator())
+  -> map<remove_const_t<_Key>, _Tp, _Compare, _Allocator>;
+template<class _InputIterator, class _Allocator,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+map(_InputIterator, _InputIterator, _Allocator)
+  -> map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
+         less<__iter_key_type<_InputIterator>>, _Allocator>;
+template<class _Key, class _Tp, class _Allocator,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+map(initializer_list<pair<_Key, _Tp>>, _Allocator)
+  -> map<remove_const_t<_Key>, _Tp, less<remove_const_t<_Key>>, _Allocator>;
+#endif
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Key, class _Tp, class _Compare, class _Allocator>
 @@ -1536,10 +1571,8 @@ map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k)
 {
     __parent_pointer __parent;
     __node_base_pointer& __child = __tree_.__find_equal(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
     if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
+        __throw_out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return static_cast<__node_pointer>(__child)->__value_.__get_value().second;
 }
 @@ -1549,10 +1582,8 @@ map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) const
 {
     __parent_pointer __parent;
     __node_base_pointer __child = __tree_.__find_equal(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
     if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
+        __throw_out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
     return static_cast<__node_pointer>(__child)->__value_.__get_value().second;
 }
 @@ -1638,12 +1669,11 @@ public:
     typedef _Key                                     key_type;
     typedef _Tp                                      mapped_type;
     typedef pair<const key_type, mapped_type>        value_type;
-    typedef _Compare                                 key_compare;
+    typedef typename __identity<_Compare>::type      key_compare;
-    typedef _Allocator                               allocator_type;
+    typedef typename __identity<_Allocator>::type    allocator_type;
     typedef value_type&                              reference;
     typedef const value_type&                        const_reference;
-    static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
     static_assert((is_same<typename allocator_type::value_type, value_type>::value),
                   "Allocator::value_type must be same type as value_type");
 @@ -1822,6 +1852,11 @@ public:
             insert(__m.begin(), __m.end());
         }
+    _LIBCPP_INLINE_VISIBILITY
+    ~multimap() {
+        static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
+    }
     _LIBCPP_INLINE_VISIBILITY
           iterator begin() _NOEXCEPT {return __tree_.begin();}
     _LIBCPP_INLINE_VISIBILITY
 @@ -2026,6 +2061,12 @@ public:
     typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
     count(const _K2& __k) const {return __tree_.__count_multi(__k);}
 #endif
+#if _LIBCPP_STD_VER > 17
+    _LIBCPP_INLINE_VISIBILITY
+    bool contains(const key_type& __k) const {return find(__k) != end();}
+#endif // _LIBCPP_STD_VER > 17
     _LIBCPP_INLINE_VISIBILITY
     iterator lower_bound(const key_type& __k)
         {return __tree_.lower_bound(__k);}
 @@ -2087,6 +2128,33 @@ private:
     typedef unique_ptr<__node, _Dp> __node_holder;
 };
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _InputIterator, class _Compare = less<__iter_key_type<_InputIterator>>,
+         class _Allocator = allocator<__iter_to_alloc_type<_InputIterator>>,
+         class = enable_if_t<!__is_allocator<_Compare>::value, void>,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+multimap(_InputIterator, _InputIterator, _Compare = _Compare(), _Allocator = _Allocator())
+  -> multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>, _Compare, _Allocator>;
+template<class _Key, class _Tp, class _Compare = less<remove_const_t<_Key>>,
+         class _Allocator = allocator<pair<const _Key, _Tp>>,
+         class = enable_if_t<!__is_allocator<_Compare>::value, void>,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+multimap(initializer_list<pair<_Key, _Tp>>, _Compare = _Compare(), _Allocator = _Allocator())
+  -> multimap<remove_const_t<_Key>, _Tp, _Compare, _Allocator>;
+template<class _InputIterator, class _Allocator,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+multimap(_InputIterator, _InputIterator, _Allocator)
+  -> multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
+         less<__iter_key_type<_InputIterator>>, _Allocator>;
+template<class _Key, class _Tp, class _Allocator,
+         class = enable_if_t<__is_allocator<_Allocator>::value, void>>
+multimap(initializer_list<pair<_Key, _Tp>>, _Allocator)
+  -> multimap<remove_const_t<_Key>, _Tp, less<remove_const_t<_Key>>, _Allocator>;
+#endif
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Key, class _Tp, class _Compare, class _Allocator>
 multimap<_Key, _Tp, _Compare, _Allocator>::multimap(multimap&& __m, const allocator_type& __a)

lib/libcxx/include/math.h+93-50

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- math.h ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -298,6 +297,9 @@ long double    truncl(long double x);
 #pragma GCC system_header
 #endif
+#define _LIBCPP_STDLIB_INCLUDE_NEXT
+#include <stdlib.h>
 #include_next <math.h>
 #ifdef __cplusplus
 @@ -755,20 +757,61 @@ isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 // abs
+#undef abs
+#undef labs
+#ifndef _LIBCPP_HAS_NO_LONG_LONG
+#undef llabs
+#endif
+// MSVCRT already has the correct prototype in <stdlib.h> if __cplusplus is defined
+#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
+inline _LIBCPP_INLINE_VISIBILITY long abs(long __x) _NOEXCEPT {
+  return ::labs(__x);
+}
+#ifndef _LIBCPP_HAS_NO_LONG_LONG
+inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {
+  return ::llabs(__x);
+}
+#endif // _LIBCPP_HAS_NO_LONG_LONG
+#endif // !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
 #if !(defined(_AIX) || defined(__sun__))
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY float abs(float __lcpp_x) _NOEXCEPT {
-float
+  return ::fabsf(__lcpp_x);
-abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);}
+}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY double abs(double __lcpp_x) _NOEXCEPT {
-double
+  return ::fabs(__lcpp_x);
-abs(double __lcpp_x) _NOEXCEPT {return ::fabs(__lcpp_x);}
+}
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY long double
-long double
+abs(long double __lcpp_x) _NOEXCEPT {
-abs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);}
+  return ::fabsl(__lcpp_x);
+}
 #endif // !(defined(_AIX) || defined(__sun__))
+// div
+#undef div
+#undef ldiv
+#ifndef _LIBCPP_HAS_NO_LONG_LONG
+#undef lldiv
+#endif
+// MSVCRT already has the correct prototype in <stdlib.h> if __cplusplus is defined
+#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
+inline _LIBCPP_INLINE_VISIBILITY ldiv_t div(long __x, long __y) _NOEXCEPT {
+  return ::ldiv(__x, __y);
+}
+#ifndef _LIBCPP_HAS_NO_LONG_LONG
+inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x,
+                                             long long __y) _NOEXCEPT {
+  return ::lldiv(__x, __y);
+}
+#endif // _LIBCPP_HAS_NO_LONG_LONG
+#endif // _LIBCPP_MSVCRT / __sun__ / _AIX
 // acos
 #if !(defined(_AIX) || defined(__sun__))
 @@ -814,7 +857,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double atan2(long double __lcpp_y, long do
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -823,8 +866,8 @@ typename std::__lazy_enable_if
 atan2(_A1 __lcpp_y, _A2 __lcpp_x) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::atan2((__result_type)__lcpp_y, (__result_type)__lcpp_x);
 }
 @@ -909,7 +952,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double fmod(long double __lcpp_x, long dou
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -918,8 +961,8 @@ typename std::__lazy_enable_if
 fmod(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::fmod((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -987,7 +1030,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double pow(long double __lcpp_x, long doub
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -996,8 +1039,8 @@ typename std::__lazy_enable_if
 pow(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::pow((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1114,7 +1157,7 @@ copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1123,8 +1166,8 @@ typename std::__lazy_enable_if
 copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1175,7 +1218,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double fdim(long double __lcpp_x, long dou
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1184,8 +1227,8 @@ typename std::__lazy_enable_if
 fdim(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::fdim((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1196,7 +1239,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double fma(long double __lcpp_x, long doub
 template <class _A1, class _A2, class _A3>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value &&
 @@ -1206,9 +1249,9 @@ typename std::__lazy_enable_if
 fma(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2, _A3>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value &&
+                     std::_IsSame<_A2, __result_type>::value &&
-                     std::is_same<_A3, __result_type>::value)), "");
+                     std::_IsSame<_A3, __result_type>::value)), "");
     return ::fma((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
 }
 @@ -1219,7 +1262,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double fmax(long double __lcpp_x, long dou
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1228,8 +1271,8 @@ typename std::__lazy_enable_if
 fmax(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::fmax((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1240,7 +1283,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double fmin(long double __lcpp_x, long dou
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1249,8 +1292,8 @@ typename std::__lazy_enable_if
 fmin(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::fmin((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1261,7 +1304,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double hypot(long double __lcpp_x, long do
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1270,8 +1313,8 @@ typename std::__lazy_enable_if
 hypot(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1384,7 +1427,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double nextafter(long double __lcpp_x, lon
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1393,8 +1436,8 @@ typename std::__lazy_enable_if
 nextafter(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::nextafter((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1415,7 +1458,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double remainder(long double __lcpp_x, lon
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1424,8 +1467,8 @@ typename std::__lazy_enable_if
 remainder(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::remainder((__result_type)__lcpp_x, (__result_type)__lcpp_y);
 }
 @@ -1436,7 +1479,7 @@ inline _LIBCPP_INLINE_VISIBILITY long double remquo(long double __lcpp_x, long d
 template <class _A1, class _A2>
 inline _LIBCPP_INLINE_VISIBILITY
-typename std::__lazy_enable_if
+typename std::_EnableIf
 <
     std::is_arithmetic<_A1>::value &&
     std::is_arithmetic<_A2>::value,
 @@ -1445,8 +1488,8 @@ typename std::__lazy_enable_if
 remquo(_A1 __lcpp_x, _A2 __lcpp_y, int* __lcpp_z) _NOEXCEPT
 {
     typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::is_same<_A1, __result_type>::value &&
+    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::is_same<_A2, __result_type>::value)), "");
+                     std::_IsSame<_A2, __result_type>::value)), "");
     return ::remquo((__result_type)__lcpp_x, (__result_type)__lcpp_y, __lcpp_z);
 }

lib/libcxx/include/memory+160-243

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- memory ------------------------------------===//	2	//===-------------------------- memory ------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -549,7 +548,7 @@ template<class T> void swap(weak_ptr<T>& a, weak_ptr<T>& b) noexcept;	...	@@ -549,7 +548,7 @@ template<class T> void swap(weak_ptr<T>& a, weak_ptr<T>& b) noexcept;
549	template<class T> struct owner_less;	548	template<class T> struct owner_less;
550		549
551	template<class T>	550	template<class T>
552	struct owner_less<shared_ptr<T>>	551	struct owner_less<shared_ptr<T> >
553	: binary_function<shared_ptr<T>, shared_ptr<T>, bool>	552	: binary_function<shared_ptr<T>, shared_ptr<T>, bool>
554	{	553	{
555	typedef bool result_type;	554	typedef bool result_type;
...	@@ -559,7 +558,7 @@ struct owner_less<shared_ptr<T>>	...	@@ -559,7 +558,7 @@ struct owner_less<shared_ptr<T>>
559	};	558	};
560		559
561	template<class T>	560	template<class T>
562	struct owner_less<weak_ptr<T>>	561	struct owner_less<weak_ptr<T> >
563	: binary_function<weak_ptr<T>, weak_ptr<T>, bool>	562	: binary_function<weak_ptr<T>, weak_ptr<T>, bool>
564	{	563	{
565	typedef bool result_type;	564	typedef bool result_type;
...	@@ -684,7 +683,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -684,7 +683,7 @@ inline _LIBCPP_INLINE_VISIBILITY
684	_ValueType __libcpp_relaxed_load(_ValueType const* __value) {	683	_ValueType __libcpp_relaxed_load(_ValueType const* __value) {
685	#if !defined(_LIBCPP_HAS_NO_THREADS) && \	684	#if !defined(_LIBCPP_HAS_NO_THREADS) && \
686	defined(__ATOMIC_RELAXED) && \	685	defined(__ATOMIC_RELAXED) && \
687	(__has_builtin(__atomic_load_n) \|\| _GNUC_VER >= 407)	686	(__has_builtin(__atomic_load_n) \|\| defined(_LIBCPP_COMPILER_GCC))
688	return __atomic_load_n(__value, __ATOMIC_RELAXED);	687	return __atomic_load_n(__value, __ATOMIC_RELAXED);
689	#else	688	#else
690	return *__value;	689	return *__value;
...	@@ -696,7 +695,7 @@ inline _LIBCPP_INLINE_VISIBILITY	...	@@ -696,7 +695,7 @@ inline _LIBCPP_INLINE_VISIBILITY
696	_ValueType __libcpp_acquire_load(_ValueType const* __value) {	695	_ValueType __libcpp_acquire_load(_ValueType const* __value) {
697	#if !defined(_LIBCPP_HAS_NO_THREADS) && \	696	#if !defined(_LIBCPP_HAS_NO_THREADS) && \
698	defined(__ATOMIC_ACQUIRE) && \	697	defined(__ATOMIC_ACQUIRE) && \
699	(__has_builtin(__atomic_load_n) \|\| _GNUC_VER >= 407)	698	(__has_builtin(__atomic_load_n) \|\| defined(_LIBCPP_COMPILER_GCC))
700	return __atomic_load_n(__value, __ATOMIC_ACQUIRE);	699	return __atomic_load_n(__value, __ATOMIC_ACQUIRE);
701	#else	700	#else
702	return *__value;	701	return *__value;
...	@@ -744,7 +743,7 @@ struct __pointer_traits_element_type;	...	@@ -744,7 +743,7 @@ struct __pointer_traits_element_type;
744	template <class _Ptr>	743	template <class _Ptr>
745	struct __pointer_traits_element_type<_Ptr, true>	744	struct __pointer_traits_element_type<_Ptr, true>
746	{	745	{
747	typedef typename _Ptr::element_type type;	746	typedef _LIBCPP_NODEBUG_TYPE typename _Ptr::element_type type;
748	};	747	};
749		748
750	#ifndef _LIBCPP_HAS_NO_VARIADICS	749	#ifndef _LIBCPP_HAS_NO_VARIADICS
...	@@ -752,13 +751,13 @@ struct __pointer_traits_element_type<_Ptr, true>	...	@@ -752,13 +751,13 @@ struct __pointer_traits_element_type<_Ptr, true>
752	template <template <class, class...> class _Sp, class _Tp, class ..._Args>	751	template <template <class, class...> class _Sp, class _Tp, class ..._Args>
753	struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, true>	752	struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, true>
754	{	753	{
755	typedef typename _Sp<_Tp, _Args...>::element_type type;	754	typedef _LIBCPP_NODEBUG_TYPE typename _Sp<_Tp, _Args...>::element_type type;
756	};	755	};
757		756
758	template <template <class, class...> class _Sp, class _Tp, class ..._Args>	757	template <template <class, class...> class _Sp, class _Tp, class ..._Args>
759	struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, false>	758	struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, false>
760	{	759	{
761	typedef _Tp type;	760	typedef _LIBCPP_NODEBUG_TYPE _Tp type;
762	};	761	};
763		762
764	#else // _LIBCPP_HAS_NO_VARIADICS	763	#else // _LIBCPP_HAS_NO_VARIADICS
...	@@ -825,13 +824,13 @@ struct __has_difference_type<_Tp,	...	@@ -825,13 +824,13 @@ struct __has_difference_type<_Tp,
825	template <class _Ptr, bool = __has_difference_type<_Ptr>::value>	824	template <class _Ptr, bool = __has_difference_type<_Ptr>::value>
826	struct __pointer_traits_difference_type	825	struct __pointer_traits_difference_type
827	{	826	{
828	typedef ptrdiff_t type;	827	typedef _LIBCPP_NODEBUG_TYPE ptrdiff_t type;
829	};	828	};
830		829
831	template <class _Ptr>	830	template <class _Ptr>
832	struct __pointer_traits_difference_type<_Ptr, true>	831	struct __pointer_traits_difference_type<_Ptr, true>
833	{	832	{
834	typedef typename _Ptr::difference_type type;	833	typedef _LIBCPP_NODEBUG_TYPE typename _Ptr::difference_type type;
835	};	834	};
836		835
837	template <class _Tp, class _Up>	836	template <class _Tp, class _Up>
...	@@ -849,9 +848,9 @@ template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>	...	@@ -849,9 +848,9 @@ template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
849	struct __pointer_traits_rebind	848	struct __pointer_traits_rebind
850	{	849	{
851	#ifndef _LIBCPP_CXX03_LANG	850	#ifndef _LIBCPP_CXX03_LANG
852	typedef typename _Tp::template rebind<_Up> type;	851	typedef _LIBCPP_NODEBUG_TYPE typename _Tp::template rebind<_Up> type;
853	#else	852	#else
854	typedef typename _Tp::template rebind<_Up>::other type;	853	typedef _LIBCPP_NODEBUG_TYPE typename _Tp::template rebind<_Up>::other type;
855	#endif	854	#endif
856	};	855	};
857		856
...	@@ -861,9 +860,9 @@ template <template <class, class...> class _Sp, class _Tp, class ..._Args, class	...	@@ -861,9 +860,9 @@ template <template <class, class...> class _Sp, class _Tp, class ..._Args, class
861	struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, true>	860	struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, true>
862	{	861	{
863	#ifndef _LIBCPP_CXX03_LANG	862	#ifndef _LIBCPP_CXX03_LANG
864	typedef typename _Sp<_Tp, _Args...>::template rebind<_Up> type;	863	typedef _LIBCPP_NODEBUG_TYPE typename _Sp<_Tp, _Args...>::template rebind<_Up> type;
865	#else	864	#else
866	typedef typename _Sp<_Tp, _Args...>::template rebind<_Up>::other type;	865	typedef _LIBCPP_NODEBUG_TYPE typename _Sp<_Tp, _Args...>::template rebind<_Up>::other type;
867	#endif	866	#endif
868	};	867	};
869		868
...	@@ -1014,13 +1013,13 @@ namespace __pointer_type_imp	...	@@ -1014,13 +1013,13 @@ namespace __pointer_type_imp
1014	template <class _Tp, class _Dp, bool = __has_pointer_type<_Dp>::value>	1013	template <class _Tp, class _Dp, bool = __has_pointer_type<_Dp>::value>
1015	struct __pointer_type	1014	struct __pointer_type
1016	{	1015	{
1017	typedef typename _Dp::pointer type;	1016	typedef _LIBCPP_NODEBUG_TYPE typename _Dp::pointer type;
1018	};	1017	};
1019		1018
1020	template <class _Tp, class _Dp>	1019	template <class _Tp, class _Dp>
1021	struct __pointer_type<_Tp, _Dp, false>	1020	struct __pointer_type<_Tp, _Dp, false>
1022	{	1021	{
1023	typedef _Tp* type;	1022	typedef _LIBCPP_NODEBUG_TYPE _Tp* type;
1024	};	1023	};
1025		1024
1026	} // __pointer_type_imp	1025	} // __pointer_type_imp
...	@@ -1028,7 +1027,7 @@ struct __pointer_type<_Tp, _Dp, false>	...	@@ -1028,7 +1027,7 @@ struct __pointer_type<_Tp, _Dp, false>
1028	template <class _Tp, class _Dp>	1027	template <class _Tp, class _Dp>
1029	struct __pointer_type	1028	struct __pointer_type
1030	{	1029	{
1031	typedef typename __pointer_type_imp::__pointer_type<_Tp, typename remove_reference<_Dp>::type>::type type;	1030	typedef _LIBCPP_NODEBUG_TYPE typename __pointer_type_imp::__pointer_type<_Tp, typename remove_reference<_Dp>::type>::type type;
1032	};	1031	};
1033		1032
1034	template <class _Tp, class = void>	1033	template <class _Tp, class = void>
...	@@ -1041,14 +1040,14 @@ struct __has_const_pointer<_Tp,	...	@@ -1041,14 +1040,14 @@ struct __has_const_pointer<_Tp,
1041	template <class _Tp, class _Ptr, class _Alloc, bool = __has_const_pointer<_Alloc>::value>	1040	template <class _Tp, class _Ptr, class _Alloc, bool = __has_const_pointer<_Alloc>::value>
1042	struct __const_pointer	1041	struct __const_pointer
1043	{	1042	{
1044	typedef typename _Alloc::const_pointer type;	1043	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::const_pointer type;
1045	};	1044	};
1046		1045
1047	template <class _Tp, class _Ptr, class _Alloc>	1046	template <class _Tp, class _Ptr, class _Alloc>
1048	struct __const_pointer<_Tp, _Ptr, _Alloc, false>	1047	struct __const_pointer<_Tp, _Ptr, _Alloc, false>
1049	{	1048	{
1050	#ifndef _LIBCPP_CXX03_LANG	1049	#ifndef _LIBCPP_CXX03_LANG
1051	typedef typename pointer_traits<_Ptr>::template rebind<const _Tp> type;	1050	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::template rebind<const _Tp> type;
1052	#else	1051	#else
1053	typedef typename pointer_traits<_Ptr>::template rebind<const _Tp>::other type;	1052	typedef typename pointer_traits<_Ptr>::template rebind<const _Tp>::other type;
1054	#endif	1053	#endif
...	@@ -1064,16 +1063,16 @@ struct __has_void_pointer<_Tp,	...	@@ -1064,16 +1063,16 @@ struct __has_void_pointer<_Tp,
1064	template <class _Ptr, class _Alloc, bool = __has_void_pointer<_Alloc>::value>	1063	template <class _Ptr, class _Alloc, bool = __has_void_pointer<_Alloc>::value>
1065	struct __void_pointer	1064	struct __void_pointer
1066	{	1065	{
1067	typedef typename _Alloc::void_pointer type;	1066	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::void_pointer type;
1068	};	1067	};
1069		1068
1070	template <class _Ptr, class _Alloc>	1069	template <class _Ptr, class _Alloc>
1071	struct __void_pointer<_Ptr, _Alloc, false>	1070	struct __void_pointer<_Ptr, _Alloc, false>
1072	{	1071	{
1073	#ifndef _LIBCPP_CXX03_LANG	1072	#ifndef _LIBCPP_CXX03_LANG
1074	typedef typename pointer_traits<_Ptr>::template rebind<void> type;	1073	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::template rebind<void> type;
1075	#else	1074	#else
1076	typedef typename pointer_traits<_Ptr>::template rebind<void>::other type;	1075	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::template rebind<void>::other type;
1077	#endif	1076	#endif
1078	};	1077	};
1079		1078
...	@@ -1087,16 +1086,16 @@ struct __has_const_void_pointer<_Tp,	...	@@ -1087,16 +1086,16 @@ struct __has_const_void_pointer<_Tp,
1087	template <class _Ptr, class _Alloc, bool = __has_const_void_pointer<_Alloc>::value>	1086	template <class _Ptr, class _Alloc, bool = __has_const_void_pointer<_Alloc>::value>
1088	struct __const_void_pointer	1087	struct __const_void_pointer
1089	{	1088	{
1090	typedef typename _Alloc::const_void_pointer type;	1089	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::const_void_pointer type;
1091	};	1090	};
1092		1091
1093	template <class _Ptr, class _Alloc>	1092	template <class _Ptr, class _Alloc>
1094	struct __const_void_pointer<_Ptr, _Alloc, false>	1093	struct __const_void_pointer<_Ptr, _Alloc, false>
1095	{	1094	{
1096	#ifndef _LIBCPP_CXX03_LANG	1095	#ifndef _LIBCPP_CXX03_LANG
1097	typedef typename pointer_traits<_Ptr>::template rebind<const void> type;	1096	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::template rebind<const void> type;
1098	#else	1097	#else
1099	typedef typename pointer_traits<_Ptr>::template rebind<const void>::other type;	1098	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::template rebind<const void>::other type;
1100	#endif	1099	#endif
1101	};	1100	};
1102		1101
...	@@ -1162,13 +1161,13 @@ struct __has_size_type<_Tp,	...	@@ -1162,13 +1161,13 @@ struct __has_size_type<_Tp,
1162	template <class _Alloc, class _DiffType, bool = __has_size_type<_Alloc>::value>	1161	template <class _Alloc, class _DiffType, bool = __has_size_type<_Alloc>::value>
1163	struct __size_type	1162	struct __size_type
1164	{	1163	{
1165	typedef typename make_unsigned<_DiffType>::type type;	1164	typedef _LIBCPP_NODEBUG_TYPE typename make_unsigned<_DiffType>::type type;
1166	};	1165	};
1167		1166
1168	template <class _Alloc, class _DiffType>	1167	template <class _Alloc, class _DiffType>
1169	struct __size_type<_Alloc, _DiffType, true>	1168	struct __size_type<_Alloc, _DiffType, true>
1170	{	1169	{
1171	typedef typename _Alloc::size_type type;	1170	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::size_type type;
1172	};	1171	};
1173		1172
1174	template <class _Tp, class = void>	1173	template <class _Tp, class = void>
...	@@ -1182,13 +1181,13 @@ struct __has_propagate_on_container_copy_assignment<_Tp,	...	@@ -1182,13 +1181,13 @@ struct __has_propagate_on_container_copy_assignment<_Tp,
1182	template <class _Alloc, bool = __has_propagate_on_container_copy_assignment<_Alloc>::value>	1181	template <class _Alloc, bool = __has_propagate_on_container_copy_assignment<_Alloc>::value>
1183	struct __propagate_on_container_copy_assignment	1182	struct __propagate_on_container_copy_assignment
1184	{	1183	{
1185	typedef false_type type;	1184	typedef _LIBCPP_NODEBUG_TYPE false_type type;
1186	};	1185	};
1187		1186
1188	template <class _Alloc>	1187	template <class _Alloc>
1189	struct __propagate_on_container_copy_assignment<_Alloc, true>	1188	struct __propagate_on_container_copy_assignment<_Alloc, true>
1190	{	1189	{
1191	typedef typename _Alloc::propagate_on_container_copy_assignment type;	1190	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::propagate_on_container_copy_assignment type;
1192	};	1191	};
1193		1192
1194	template <class _Tp, class = void>	1193	template <class _Tp, class = void>
...	@@ -1208,7 +1207,7 @@ struct __propagate_on_container_move_assignment	...	@@ -1208,7 +1207,7 @@ struct __propagate_on_container_move_assignment
1208	template <class _Alloc>	1207	template <class _Alloc>
1209	struct __propagate_on_container_move_assignment<_Alloc, true>	1208	struct __propagate_on_container_move_assignment<_Alloc, true>
1210	{	1209	{
1211	typedef typename _Alloc::propagate_on_container_move_assignment type;	1210	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::propagate_on_container_move_assignment type;
1212	};	1211	};
1213		1212
1214	template <class _Tp, class = void>	1213	template <class _Tp, class = void>
...	@@ -1228,7 +1227,7 @@ struct __propagate_on_container_swap	...	@@ -1228,7 +1227,7 @@ struct __propagate_on_container_swap
1228	template <class _Alloc>	1227	template <class _Alloc>
1229	struct __propagate_on_container_swap<_Alloc, true>	1228	struct __propagate_on_container_swap<_Alloc, true>
1230	{	1229	{
1231	typedef typename _Alloc::propagate_on_container_swap type;	1230	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::propagate_on_container_swap type;
1232	};	1231	};
1233		1232
1234	template <class _Tp, class = void>	1233	template <class _Tp, class = void>
...	@@ -1242,13 +1241,13 @@ struct __has_is_always_equal<_Tp,	...	@@ -1242,13 +1241,13 @@ struct __has_is_always_equal<_Tp,
1242	template <class _Alloc, bool = __has_is_always_equal<_Alloc>::value>	1241	template <class _Alloc, bool = __has_is_always_equal<_Alloc>::value>
1243	struct __is_always_equal	1242	struct __is_always_equal
1244	{	1243	{
1245	typedef typename _VSTD::is_empty<_Alloc>::type type;	1244	typedef _LIBCPP_NODEBUG_TYPE typename _VSTD::is_empty<_Alloc>::type type;
1246	};	1245	};
1247		1246
1248	template <class _Alloc>	1247	template <class _Alloc>
1249	struct __is_always_equal<_Alloc, true>	1248	struct __is_always_equal<_Alloc, true>
1250	{	1249	{
1251	typedef typename _Alloc::is_always_equal type;	1250	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::is_always_equal type;
1252	};	1251	};
1253		1252
1254	template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>	1253	template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
...	@@ -1271,7 +1270,7 @@ struct __has_rebind_other<_Tp, _Up, false>	...	@@ -1271,7 +1270,7 @@ struct __has_rebind_other<_Tp, _Up, false>
1271	template <class _Tp, class _Up, bool = __has_rebind_other<_Tp, _Up>::value>	1270	template <class _Tp, class _Up, bool = __has_rebind_other<_Tp, _Up>::value>
1272	struct __allocator_traits_rebind	1271	struct __allocator_traits_rebind
1273	{	1272	{
1274	typedef typename _Tp::template rebind<_Up>::other type;	1273	typedef _LIBCPP_NODEBUG_TYPE typename _Tp::template rebind<_Up>::other type;
1275	};	1274	};
1276		1275
1277	#ifndef _LIBCPP_HAS_NO_VARIADICS	1276	#ifndef _LIBCPP_HAS_NO_VARIADICS
...	@@ -1279,13 +1278,13 @@ struct __allocator_traits_rebind	...	@@ -1279,13 +1278,13 @@ struct __allocator_traits_rebind
1279	template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>	1278	template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
1280	struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, true>	1279	struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, true>
1281	{	1280	{
1282	typedef typename _Alloc<_Tp, _Args...>::template rebind<_Up>::other type;	1281	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc<_Tp, _Args...>::template rebind<_Up>::other type;
1283	};	1282	};
1284		1283
1285	template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>	1284	template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
1286	struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false>	1285	struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false>
1287	{	1286	{
1288	typedef _Alloc<_Up, _Args...> type;	1287	typedef _LIBCPP_NODEBUG_TYPE _Alloc<_Up, _Args...> type;
1289	};	1288	};
1290		1289
1291	#else // _LIBCPP_HAS_NO_VARIADICS	1290	#else // _LIBCPP_HAS_NO_VARIADICS
...	@@ -1493,13 +1492,13 @@ struct __has_select_on_container_copy_construction	...	@@ -1493,13 +1492,13 @@ struct __has_select_on_container_copy_construction
1493	template <class _Alloc, class _Ptr, bool = __has_difference_type<_Alloc>::value>	1492	template <class _Alloc, class _Ptr, bool = __has_difference_type<_Alloc>::value>
1494	struct __alloc_traits_difference_type	1493	struct __alloc_traits_difference_type
1495	{	1494	{
1496	typedef typename pointer_traits<_Ptr>::difference_type type;	1495	typedef _LIBCPP_NODEBUG_TYPE typename pointer_traits<_Ptr>::difference_type type;
1497	};	1496	};
1498		1497
1499	template <class _Alloc, class _Ptr>	1498	template <class _Alloc, class _Ptr>
1500	struct __alloc_traits_difference_type<_Alloc, _Ptr, true>	1499	struct __alloc_traits_difference_type<_Alloc, _Ptr, true>
1501	{	1500	{
1502	typedef typename _Alloc::difference_type type;	1501	typedef _LIBCPP_NODEBUG_TYPE typename _Alloc::difference_type type;
1503	};	1502	};
1504		1503
1505	template <class _Tp>	1504	template <class _Tp>
...	@@ -1534,7 +1533,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits	...	@@ -1534,7 +1533,7 @@ struct _LIBCPP_TEMPLATE_VIS allocator_traits
1534	#ifndef _LIBCPP_CXX03_LANG	1533	#ifndef _LIBCPP_CXX03_LANG
1535	template <class _Tp> using rebind_alloc =	1534	template <class _Tp> using rebind_alloc =
1536	typename __allocator_traits_rebind<allocator_type, _Tp>::type;	1535	typename __allocator_traits_rebind<allocator_type, _Tp>::type;
1537	template <class _Tp> using rebind_traits = allocator_traits<rebind_alloc<_Tp>>;	1536	template <class _Tp> using rebind_traits = allocator_traits<rebind_alloc<_Tp> >;
1538	#else // _LIBCPP_CXX03_LANG	1537	#else // _LIBCPP_CXX03_LANG
1539	template <class _Tp> struct rebind_alloc	1538	template <class _Tp> struct rebind_alloc
1540	{typedef typename __allocator_traits_rebind<allocator_type, _Tp>::type other;};	1539	{typedef typename __allocator_traits_rebind<allocator_type, _Tp>::type other;};
...	@@ -1769,7 +1768,7 @@ template <class _Traits, class _Tp>	...	@@ -1769,7 +1768,7 @@ template <class _Traits, class _Tp>
1769	struct __rebind_alloc_helper	1768	struct __rebind_alloc_helper
1770	{	1769	{
1771	#ifndef _LIBCPP_CXX03_LANG	1770	#ifndef _LIBCPP_CXX03_LANG
1772	typedef typename _Traits::template rebind_alloc<_Tp> type;	1771	typedef _LIBCPP_NODEBUG_TYPE typename _Traits::template rebind_alloc<_Tp> type;
1773	#else	1772	#else
1774	typedef typename _Traits::template rebind_alloc<_Tp>::other type;	1773	typedef typename _Traits::template rebind_alloc<_Tp>::other type;
1775	#endif	1774	#endif
...	@@ -2210,8 +2209,8 @@ struct __second_tag {};	...	@@ -2210,8 +2209,8 @@ struct __second_tag {};
2210	template <class _T1, class _T2>	2209	template <class _T1, class _T2>
2211	class __compressed_pair : private __compressed_pair_elem<_T1, 0>,	2210	class __compressed_pair : private __compressed_pair_elem<_T1, 0>,
2212	private __compressed_pair_elem<_T2, 1> {	2211	private __compressed_pair_elem<_T2, 1> {
2213	typedef __compressed_pair_elem<_T1, 0> _Base1;	2212	typedef _LIBCPP_NODEBUG_TYPE __compressed_pair_elem<_T1, 0> _Base1;
2214	typedef __compressed_pair_elem<_T2, 1> _Base2;	2213	typedef _LIBCPP_NODEBUG_TYPE __compressed_pair_elem<_T2, 1> _Base2;
2215		2214
2216	// NOTE: This static assert should never fire because __compressed_pair	2215	// NOTE: This static assert should never fire because __compressed_pair
2217	// is almost never used in a scenario where it's possible for T1 == T2.	2216	// is almost never used in a scenario where it's possible for T1 == T2.
...	@@ -2321,7 +2320,7 @@ struct _LIBCPP_TEMPLATE_VIS default_delete {	...	@@ -2321,7 +2320,7 @@ struct _LIBCPP_TEMPLATE_VIS default_delete {
2321	static_assert(!is_function<_Tp>::value,	2320	static_assert(!is_function<_Tp>::value,
2322	"default_delete cannot be instantiated for function types");	2321	"default_delete cannot be instantiated for function types");
2323	#ifndef _LIBCPP_CXX03_LANG	2322	#ifndef _LIBCPP_CXX03_LANG
2324	_LIBCPP_INLINE_VISIBILITY constexpr default_delete() noexcept = default;	2323	_LIBCPP_INLINE_VISIBILITY constexpr default_delete() _NOEXCEPT = default;
2325	#else	2324	#else
2326	_LIBCPP_INLINE_VISIBILITY default_delete() {}	2325	_LIBCPP_INLINE_VISIBILITY default_delete() {}
2327	#endif	2326	#endif
...	@@ -2349,7 +2348,7 @@ private:	...	@@ -2349,7 +2348,7 @@ private:
2349		2348
2350	public:	2349	public:
2351	#ifndef _LIBCPP_CXX03_LANG	2350	#ifndef _LIBCPP_CXX03_LANG
2352	_LIBCPP_INLINE_VISIBILITY constexpr default_delete() noexcept = default;	2351	_LIBCPP_INLINE_VISIBILITY constexpr default_delete() _NOEXCEPT = default;
2353	#else	2352	#else
2354	_LIBCPP_INLINE_VISIBILITY default_delete() {}	2353	_LIBCPP_INLINE_VISIBILITY default_delete() {}
2355	#endif	2354	#endif
...	@@ -2371,9 +2370,6 @@ public:	...	@@ -2371,9 +2370,6 @@ public:
2371	}	2370	}
2372	};	2371	};
2373		2372
2374
2375
2376	#ifndef _LIBCPP_CXX03_LANG
2377	template <class _Deleter>	2373	template <class _Deleter>
2378	struct __unique_ptr_deleter_sfinae {	2374	struct __unique_ptr_deleter_sfinae {
2379	static_assert(!is_reference<_Deleter>::value, "incorrect specialization");	2375	static_assert(!is_reference<_Deleter>::value, "incorrect specialization");
...	@@ -2395,14 +2391,13 @@ struct __unique_ptr_deleter_sfinae<_Deleter&> {	...	@@ -2395,14 +2391,13 @@ struct __unique_ptr_deleter_sfinae<_Deleter&> {
2395	typedef _Deleter&& __bad_rval_ref_type;	2391	typedef _Deleter&& __bad_rval_ref_type;
2396	typedef false_type __enable_rval_overload;	2392	typedef false_type __enable_rval_overload;
2397	};	2393	};
2398	#endif // !defined(_LIBCPP_CXX03_LANG)
2399		2394
2400	template <class _Tp, class _Dp = default_delete<_Tp> >	2395	template <class _Tp, class _Dp = default_delete<_Tp> >
2401	class _LIBCPP_TEMPLATE_VIS unique_ptr {	2396	class _LIBCPP_TEMPLATE_VIS unique_ptr {
2402	public:	2397	public:
2403	typedef _Tp element_type;	2398	typedef _Tp element_type;
2404	typedef _Dp deleter_type;	2399	typedef _Dp deleter_type;
2405	typedef typename __pointer_type<_Tp, deleter_type>::type pointer;	2400	typedef _LIBCPP_NODEBUG_TYPE typename __pointer_type<_Tp, deleter_type>::type pointer;
2406		2401
2407	static_assert(!is_rvalue_reference<deleter_type>::value,	2402	static_assert(!is_rvalue_reference<deleter_type>::value,
2408	"the specified deleter type cannot be an rvalue reference");	2403	"the specified deleter type cannot be an rvalue reference");
...	@@ -2412,39 +2407,38 @@ private:	...	@@ -2412,39 +2407,38 @@ private:
2412		2407
2413	struct __nat { int __for_bool_; };	2408	struct __nat { int __for_bool_; };
2414		2409
2415	#ifndef _LIBCPP_CXX03_LANG	2410	typedef _LIBCPP_NODEBUG_TYPE __unique_ptr_deleter_sfinae<_Dp> _DeleterSFINAE;
2416	typedef __unique_ptr_deleter_sfinae<_Dp> _DeleterSFINAE;
2417		2411
2418	template <bool _Dummy>	2412	template <bool _Dummy>
2419	using _LValRefType =	2413	using _LValRefType _LIBCPP_NODEBUG_TYPE =
2420	typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;	2414	typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;
2421		2415
2422	template <bool _Dummy>	2416	template <bool _Dummy>
2423	using _GoodRValRefType =	2417	using _GoodRValRefType _LIBCPP_NODEBUG_TYPE =
2424	typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;	2418	typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;
2425		2419
2426	template <bool _Dummy>	2420	template <bool _Dummy>
2427	using _BadRValRefType =	2421	using _BadRValRefType _LIBCPP_NODEBUG_TYPE =
2428	typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;	2422	typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;
2429		2423
2430	template <bool _Dummy, class _Deleter = typename __dependent_type<	2424	template <bool _Dummy, class _Deleter = typename __dependent_type<
2431	__identity<deleter_type>, _Dummy>::type>	2425	__identity<deleter_type>, _Dummy>::type>
2432	using _EnableIfDeleterDefaultConstructible =	2426	using _EnableIfDeleterDefaultConstructible _LIBCPP_NODEBUG_TYPE =
2433	typename enable_if<is_default_constructible<_Deleter>::value &&	2427	typename enable_if<is_default_constructible<_Deleter>::value &&
2434	!is_pointer<_Deleter>::value>::type;	2428	!is_pointer<_Deleter>::value>::type;
2435		2429
2436	template <class _ArgType>	2430	template <class _ArgType>
2437	using _EnableIfDeleterConstructible =	2431	using _EnableIfDeleterConstructible _LIBCPP_NODEBUG_TYPE =
2438	typename enable_if<is_constructible<deleter_type, _ArgType>::value>::type;	2432	typename enable_if<is_constructible<deleter_type, _ArgType>::value>::type;
2439		2433
2440	template <class _UPtr, class _Up>	2434	template <class _UPtr, class _Up>
2441	using _EnableIfMoveConvertible = typename enable_if<	2435	using _EnableIfMoveConvertible _LIBCPP_NODEBUG_TYPE = typename enable_if<
2442	is_convertible<typename _UPtr::pointer, pointer>::value &&	2436	is_convertible<typename _UPtr::pointer, pointer>::value &&
2443	!is_array<_Up>::value	2437	!is_array<_Up>::value
2444	>::type;	2438	>::type;
2445		2439
2446	template <class _UDel>	2440	template <class _UDel>
2447	using _EnableIfDeleterConvertible = typename enable_if<	2441	using _EnableIfDeleterConvertible _LIBCPP_NODEBUG_TYPE = typename enable_if<
2448	(is_reference<_Dp>::value && is_same<_Dp, _UDel>::value) \|\|	2442	(is_reference<_Dp>::value && is_same<_Dp, _UDel>::value) \|\|
2449	(!is_reference<_Dp>::value && is_convertible<_UDel, _Dp>::value)	2443	(!is_reference<_Dp>::value && is_convertible<_UDel, _Dp>::value)
2450	>::type;	2444	>::type;
...	@@ -2456,42 +2450,42 @@ private:	...	@@ -2456,42 +2450,42 @@ private:
2456		2450
2457	public:	2451	public:
2458	template <bool _Dummy = true,	2452	template <bool _Dummy = true,
2459	class = _EnableIfDeleterDefaultConstructible<_Dummy>>	2453	class = _EnableIfDeleterDefaultConstructible<_Dummy> >
2460	_LIBCPP_INLINE_VISIBILITY	2454	_LIBCPP_INLINE_VISIBILITY
2461	constexpr unique_ptr() noexcept : __ptr_(pointer()) {}	2455	_LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(pointer()) {}
2462		2456
2463	template <bool _Dummy = true,	2457	template <bool _Dummy = true,
2464	class = _EnableIfDeleterDefaultConstructible<_Dummy>>	2458	class = _EnableIfDeleterDefaultConstructible<_Dummy> >
2465	_LIBCPP_INLINE_VISIBILITY	2459	_LIBCPP_INLINE_VISIBILITY
2466	constexpr unique_ptr(nullptr_t) noexcept : __ptr_(pointer()) {}	2460	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(pointer()) {}
2467		2461
2468	template <bool _Dummy = true,	2462	template <bool _Dummy = true,
2469	class = _EnableIfDeleterDefaultConstructible<_Dummy>>	2463	class = _EnableIfDeleterDefaultConstructible<_Dummy> >
2470	_LIBCPP_INLINE_VISIBILITY	2464	_LIBCPP_INLINE_VISIBILITY
2471	explicit unique_ptr(pointer __p) noexcept : __ptr_(__p) {}	2465	explicit unique_ptr(pointer __p) _NOEXCEPT : __ptr_(__p) {}
2472		2466
2473	template <bool _Dummy = true,	2467	template <bool _Dummy = true,
2474	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy>>>	2468	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >
2475	_LIBCPP_INLINE_VISIBILITY	2469	_LIBCPP_INLINE_VISIBILITY
2476	unique_ptr(pointer __p, _LValRefType<_Dummy> __d) noexcept	2470	unique_ptr(pointer __p, _LValRefType<_Dummy> __d) _NOEXCEPT
2477	: __ptr_(__p, __d) {}	2471	: __ptr_(__p, __d) {}
2478		2472
2479	template <bool _Dummy = true,	2473	template <bool _Dummy = true,
2480	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy>>>	2474	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >
2481	_LIBCPP_INLINE_VISIBILITY	2475	_LIBCPP_INLINE_VISIBILITY
2482	unique_ptr(pointer __p, _GoodRValRefType<_Dummy> __d) noexcept	2476	unique_ptr(pointer __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
2483	: __ptr_(__p, _VSTD::move(__d)) {	2477	: __ptr_(__p, _VSTD::move(__d)) {
2484	static_assert(!is_reference<deleter_type>::value,	2478	static_assert(!is_reference<deleter_type>::value,
2485	"rvalue deleter bound to reference");	2479	"rvalue deleter bound to reference");
2486	}	2480	}
2487		2481
2488	template <bool _Dummy = true,	2482	template <bool _Dummy = true,
2489	class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy>>>	2483	class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> > >
2490	_LIBCPP_INLINE_VISIBILITY	2484	_LIBCPP_INLINE_VISIBILITY
2491	unique_ptr(pointer __p, _BadRValRefType<_Dummy> __d) = delete;	2485	unique_ptr(pointer __p, _BadRValRefType<_Dummy> __d) = delete;
2492		2486
2493	_LIBCPP_INLINE_VISIBILITY	2487	_LIBCPP_INLINE_VISIBILITY
2494	unique_ptr(unique_ptr&& __u) noexcept	2488	unique_ptr(unique_ptr&& __u) _NOEXCEPT
2495	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {	2489	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {
2496	}	2490	}
2497		2491
...	@@ -2508,7 +2502,7 @@ public:	...	@@ -2508,7 +2502,7 @@ public:
2508	_LIBCPP_INLINE_VISIBILITY	2502	_LIBCPP_INLINE_VISIBILITY
2509	unique_ptr(auto_ptr<_Up>&& __p,	2503	unique_ptr(auto_ptr<_Up>&& __p,
2510	typename enable_if<is_convertible<_Up, _Tp>::value &&	2504	typename enable_if<is_convertible<_Up, _Tp>::value &&
2511	is_same<_Dp, default_delete<_Tp>>::value,	2505	is_same<_Dp, default_delete<_Tp> >::value,
2512	__nat>::type = __nat()) _NOEXCEPT	2506	__nat>::type = __nat()) _NOEXCEPT
2513	: __ptr_(__p.release()) {}	2507	: __ptr_(__p.release()) {}
2514	#endif	2508	#endif
...	@@ -2531,65 +2525,6 @@ public:	...	@@ -2531,65 +2525,6 @@ public:
2531	return *this;	2525	return *this;
2532	}	2526	}
2533		2527
2534	#else // _LIBCPP_CXX03_LANG
2535	private:
2536	unique_ptr(unique_ptr&);
2537	template <class _Up, class _Ep> unique_ptr(unique_ptr<_Up, _Ep>&);
2538
2539	unique_ptr& operator=(unique_ptr&);
2540	template <class _Up, class _Ep> unique_ptr& operator=(unique_ptr<_Up, _Ep>&);
2541
2542	public:
2543	_LIBCPP_INLINE_VISIBILITY
2544	unique_ptr() : __ptr_(pointer())
2545	{
2546	static_assert(!is_pointer<deleter_type>::value,
2547	"unique_ptr constructed with null function pointer deleter");
2548	static_assert(is_default_constructible<deleter_type>::value,
2549	"unique_ptr::deleter_type is not default constructible");
2550	}
2551	_LIBCPP_INLINE_VISIBILITY
2552	unique_ptr(nullptr_t) : __ptr_(pointer())
2553	{
2554	static_assert(!is_pointer<deleter_type>::value,
2555	"unique_ptr constructed with null function pointer deleter");
2556	}
2557	_LIBCPP_INLINE_VISIBILITY
2558	explicit unique_ptr(pointer __p)
2559	: __ptr_(_VSTD::move(__p)) {
2560	static_assert(!is_pointer<deleter_type>::value,
2561	"unique_ptr constructed with null function pointer deleter");
2562	}
2563
2564	_LIBCPP_INLINE_VISIBILITY
2565	operator __rv<unique_ptr>() {
2566	return __rv<unique_ptr>(*this);
2567	}
2568
2569	_LIBCPP_INLINE_VISIBILITY
2570	unique_ptr(__rv<unique_ptr> __u)
2571	: __ptr_(__u->release(),
2572	_VSTD::forward<deleter_type>(__u->get_deleter())) {}
2573
2574	template <class _Up, class _Ep>
2575	_LIBCPP_INLINE_VISIBILITY
2576	typename enable_if<
2577	!is_array<_Up>::value &&
2578	is_convertible<typename unique_ptr<_Up, _Ep>::pointer,
2579	pointer>::value &&
2580	is_assignable<deleter_type&, _Ep&>::value,
2581	unique_ptr&>::type
2582	operator=(unique_ptr<_Up, _Ep> __u) {
2583	reset(__u.release());
2584	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
2585	return *this;
2586	}
2587
2588	_LIBCPP_INLINE_VISIBILITY
2589	unique_ptr(pointer __p, deleter_type __d)
2590	: __ptr_(_VSTD::move(__p), _VSTD::move(__d)) {}
2591	#endif // _LIBCPP_CXX03_LANG
2592
2593	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)	2528	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
2594	template <class _Up>	2529	template <class _Up>
2595	_LIBCPP_INLINE_VISIBILITY	2530	_LIBCPP_INLINE_VISIBILITY
...	@@ -2602,6 +2537,12 @@ public:	...	@@ -2602,6 +2537,12 @@ public:
2602	}	2537	}
2603	#endif	2538	#endif
2604		2539
		2540	#ifdef _LIBCPP_CXX03_LANG
		2541	unique_ptr(unique_ptr const&) = delete;
		2542	unique_ptr& operator=(unique_ptr const&) = delete;
		2543	#endif
		2544
		2545
2605	_LIBCPP_INLINE_VISIBILITY	2546	_LIBCPP_INLINE_VISIBILITY
2606	~unique_ptr() { reset(); }	2547	~unique_ptr() { reset(); }
2607		2548
...	@@ -2681,39 +2622,38 @@ private:	...	@@ -2681,39 +2622,38 @@ private:
2681	>	2622	>
2682	{};	2623	{};
2683		2624
2684	#ifndef _LIBCPP_CXX03_LANG
2685	typedef __unique_ptr_deleter_sfinae<_Dp> _DeleterSFINAE;	2625	typedef __unique_ptr_deleter_sfinae<_Dp> _DeleterSFINAE;
2686		2626
2687	template <bool _Dummy>	2627	template <bool _Dummy>
2688	using _LValRefType =	2628	using _LValRefType _LIBCPP_NODEBUG_TYPE =
2689	typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;	2629	typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;
2690		2630
2691	template <bool _Dummy>	2631	template <bool _Dummy>
2692	using _GoodRValRefType =	2632	using _GoodRValRefType _LIBCPP_NODEBUG_TYPE =
2693	typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;	2633	typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;
2694		2634
2695	template <bool _Dummy>	2635	template <bool _Dummy>
2696	using _BadRValRefType =	2636	using _BadRValRefType _LIBCPP_NODEBUG_TYPE =
2697	typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;	2637	typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;
2698		2638
2699	template <bool _Dummy, class _Deleter = typename __dependent_type<	2639	template <bool _Dummy, class _Deleter = typename __dependent_type<
2700	__identity<deleter_type>, _Dummy>::type>	2640	__identity<deleter_type>, _Dummy>::type>
2701	using _EnableIfDeleterDefaultConstructible =	2641	using _EnableIfDeleterDefaultConstructible _LIBCPP_NODEBUG_TYPE =
2702	typename enable_if<is_default_constructible<_Deleter>::value &&	2642	typename enable_if<is_default_constructible<_Deleter>::value &&
2703	!is_pointer<_Deleter>::value>::type;	2643	!is_pointer<_Deleter>::value>::type;
2704		2644
2705	template <class _ArgType>	2645	template <class _ArgType>
2706	using _EnableIfDeleterConstructible =	2646	using _EnableIfDeleterConstructible _LIBCPP_NODEBUG_TYPE =
2707	typename enable_if<is_constructible<deleter_type, _ArgType>::value>::type;	2647	typename enable_if<is_constructible<deleter_type, _ArgType>::value>::type;
2708		2648
2709	template <class _Pp>	2649	template <class _Pp>
2710	using _EnableIfPointerConvertible = typename enable_if<	2650	using _EnableIfPointerConvertible _LIBCPP_NODEBUG_TYPE = typename enable_if<
2711	_CheckArrayPointerConversion<_Pp>::value	2651	_CheckArrayPointerConversion<_Pp>::value
2712	>::type;	2652	>::type;
2713		2653
2714	template <class _UPtr, class _Up,	2654	template <class _UPtr, class _Up,
2715	class _ElemT = typename _UPtr::element_type>	2655	class _ElemT = typename _UPtr::element_type>
2716	using _EnableIfMoveConvertible = typename enable_if<	2656	using _EnableIfMoveConvertible _LIBCPP_NODEBUG_TYPE = typename enable_if<
2717	is_array<_Up>::value &&	2657	is_array<_Up>::value &&
2718	is_same<pointer, element_type*>::value &&	2658	is_same<pointer, element_type*>::value &&
2719	is_same<typename _UPtr::pointer, _ElemT*>::value &&	2659	is_same<typename _UPtr::pointer, _ElemT*>::value &&
...	@@ -2721,79 +2661,79 @@ private:	...	@@ -2721,79 +2661,79 @@ private:
2721	>::type;	2661	>::type;
2722		2662
2723	template <class _UDel>	2663	template <class _UDel>
2724	using _EnableIfDeleterConvertible = typename enable_if<	2664	using _EnableIfDeleterConvertible _LIBCPP_NODEBUG_TYPE = typename enable_if<
2725	(is_reference<_Dp>::value && is_same<_Dp, _UDel>::value) \|\|	2665	(is_reference<_Dp>::value && is_same<_Dp, _UDel>::value) \|\|
2726	(!is_reference<_Dp>::value && is_convertible<_UDel, _Dp>::value)	2666	(!is_reference<_Dp>::value && is_convertible<_UDel, _Dp>::value)
2727	>::type;	2667	>::type;
2728		2668
2729	template <class _UDel>	2669	template <class _UDel>
2730	using _EnableIfDeleterAssignable = typename enable_if<	2670	using _EnableIfDeleterAssignable _LIBCPP_NODEBUG_TYPE = typename enable_if<
2731	is_assignable<_Dp&, _UDel&&>::value	2671	is_assignable<_Dp&, _UDel&&>::value
2732	>::type;	2672	>::type;
2733		2673
2734	public:	2674	public:
2735	template <bool _Dummy = true,	2675	template <bool _Dummy = true,
2736	class = _EnableIfDeleterDefaultConstructible<_Dummy>>	2676	class = _EnableIfDeleterDefaultConstructible<_Dummy> >
2737	_LIBCPP_INLINE_VISIBILITY	2677	_LIBCPP_INLINE_VISIBILITY
2738	constexpr unique_ptr() noexcept : __ptr_(pointer()) {}	2678	_LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(pointer()) {}
2739		2679
2740	template <bool _Dummy = true,	2680	template <bool _Dummy = true,
2741	class = _EnableIfDeleterDefaultConstructible<_Dummy>>	2681	class = _EnableIfDeleterDefaultConstructible<_Dummy> >
2742	_LIBCPP_INLINE_VISIBILITY	2682	_LIBCPP_INLINE_VISIBILITY
2743	constexpr unique_ptr(nullptr_t) noexcept : __ptr_(pointer()) {}	2683	_LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(pointer()) {}
2744		2684
2745	template <class _Pp, bool _Dummy = true,	2685	template <class _Pp, bool _Dummy = true,
2746	class = _EnableIfDeleterDefaultConstructible<_Dummy>,	2686	class = _EnableIfDeleterDefaultConstructible<_Dummy>,
2747	class = _EnableIfPointerConvertible<_Pp>>	2687	class = _EnableIfPointerConvertible<_Pp> >
2748	_LIBCPP_INLINE_VISIBILITY	2688	_LIBCPP_INLINE_VISIBILITY
2749	explicit unique_ptr(_Pp __p) noexcept	2689	explicit unique_ptr(_Pp __p) _NOEXCEPT
2750	: __ptr_(__p) {}	2690	: __ptr_(__p) {}
2751		2691
2752	template <class _Pp, bool _Dummy = true,	2692	template <class _Pp, bool _Dummy = true,
2753	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy>>,	2693	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,
2754	class = _EnableIfPointerConvertible<_Pp>>	2694	class = _EnableIfPointerConvertible<_Pp> >
2755	_LIBCPP_INLINE_VISIBILITY	2695	_LIBCPP_INLINE_VISIBILITY
2756	unique_ptr(_Pp __p, _LValRefType<_Dummy> __d) noexcept	2696	unique_ptr(_Pp __p, _LValRefType<_Dummy> __d) _NOEXCEPT
2757	: __ptr_(__p, __d) {}	2697	: __ptr_(__p, __d) {}
2758		2698
2759	template <bool _Dummy = true,	2699	template <bool _Dummy = true,
2760	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy>>>	2700	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >
2761	_LIBCPP_INLINE_VISIBILITY	2701	_LIBCPP_INLINE_VISIBILITY
2762	unique_ptr(nullptr_t, _LValRefType<_Dummy> __d) noexcept	2702	unique_ptr(nullptr_t, _LValRefType<_Dummy> __d) _NOEXCEPT
2763	: __ptr_(nullptr, __d) {}	2703	: __ptr_(nullptr, __d) {}
2764		2704
2765	template <class _Pp, bool _Dummy = true,	2705	template <class _Pp, bool _Dummy = true,
2766	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy>>,	2706	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,
2767	class = _EnableIfPointerConvertible<_Pp>>	2707	class = _EnableIfPointerConvertible<_Pp> >
2768	_LIBCPP_INLINE_VISIBILITY	2708	_LIBCPP_INLINE_VISIBILITY
2769	unique_ptr(_Pp __p, _GoodRValRefType<_Dummy> __d) noexcept	2709	unique_ptr(_Pp __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
2770	: __ptr_(__p, _VSTD::move(__d)) {	2710	: __ptr_(__p, _VSTD::move(__d)) {
2771	static_assert(!is_reference<deleter_type>::value,	2711	static_assert(!is_reference<deleter_type>::value,
2772	"rvalue deleter bound to reference");	2712	"rvalue deleter bound to reference");
2773	}	2713	}
2774		2714
2775	template <bool _Dummy = true,	2715	template <bool _Dummy = true,
2776	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy>>>	2716	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >
2777	_LIBCPP_INLINE_VISIBILITY	2717	_LIBCPP_INLINE_VISIBILITY
2778	unique_ptr(nullptr_t, _GoodRValRefType<_Dummy> __d) noexcept	2718	unique_ptr(nullptr_t, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
2779	: __ptr_(nullptr, _VSTD::move(__d)) {	2719	: __ptr_(nullptr, _VSTD::move(__d)) {
2780	static_assert(!is_reference<deleter_type>::value,	2720	static_assert(!is_reference<deleter_type>::value,
2781	"rvalue deleter bound to reference");	2721	"rvalue deleter bound to reference");
2782	}	2722	}
2783		2723
2784	template <class _Pp, bool _Dummy = true,	2724	template <class _Pp, bool _Dummy = true,
2785	class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy>>,	2725	class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> >,
2786	class = _EnableIfPointerConvertible<_Pp>>	2726	class = _EnableIfPointerConvertible<_Pp> >
2787	_LIBCPP_INLINE_VISIBILITY	2727	_LIBCPP_INLINE_VISIBILITY
2788	unique_ptr(_Pp __p, _BadRValRefType<_Dummy> __d) = delete;	2728	unique_ptr(_Pp __p, _BadRValRefType<_Dummy> __d) = delete;
2789		2729
2790	_LIBCPP_INLINE_VISIBILITY	2730	_LIBCPP_INLINE_VISIBILITY
2791	unique_ptr(unique_ptr&& __u) noexcept	2731	unique_ptr(unique_ptr&& __u) _NOEXCEPT
2792	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {	2732	: __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {
2793	}	2733	}
2794		2734
2795	_LIBCPP_INLINE_VISIBILITY	2735	_LIBCPP_INLINE_VISIBILITY
2796	unique_ptr& operator=(unique_ptr&& __u) noexcept {	2736	unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
2797	reset(__u.release());	2737	reset(__u.release());
2798	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());	2738	__ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
2799	return *this;	2739	return *this;
...	@@ -2804,7 +2744,7 @@ public:	...	@@ -2804,7 +2744,7 @@ public:
2804	class = _EnableIfDeleterConvertible<_Ep>	2744	class = _EnableIfDeleterConvertible<_Ep>
2805	>	2745	>
2806	_LIBCPP_INLINE_VISIBILITY	2746	_LIBCPP_INLINE_VISIBILITY
2807	unique_ptr(unique_ptr<_Up, _Ep>&& __u) noexcept	2747	unique_ptr(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
2808	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {	2748	: __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {
2809	}	2749	}
2810		2750
...	@@ -2814,73 +2754,16 @@ public:	...	@@ -2814,73 +2754,16 @@ public:
2814	>	2754	>
2815	_LIBCPP_INLINE_VISIBILITY	2755	_LIBCPP_INLINE_VISIBILITY
2816	unique_ptr&	2756	unique_ptr&
2817	operator=(unique_ptr<_Up, _Ep>&& __u) noexcept {	2757	operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT {
2818	reset(__u.release());	2758	reset(__u.release());
2819	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());	2759	__ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
2820	return *this;	2760	return *this;
2821	}	2761	}
2822		2762
2823	#else // _LIBCPP_CXX03_LANG	2763	#ifdef _LIBCPP_CXX03_LANG
2824	private:	2764	unique_ptr(unique_ptr const&) = delete;
2825	template <class _Up> explicit unique_ptr(_Up);	2765	unique_ptr& operator=(unique_ptr const&) = delete;
2826		2766	#endif
2827	unique_ptr(unique_ptr&);
2828	template <class _Up> unique_ptr(unique_ptr<_Up>&);
2829
2830	unique_ptr& operator=(unique_ptr&);
2831	template <class _Up> unique_ptr& operator=(unique_ptr<_Up>&);
2832
2833	template <class _Up>
2834	unique_ptr(_Up __u,
2835	typename conditional<
2836	is_reference<deleter_type>::value, deleter_type,
2837	typename add_lvalue_reference<const deleter_type>::type>::type,
2838	typename enable_if<is_convertible<_Up, pointer>::value,
2839	__nat>::type = __nat());
2840	public:
2841	_LIBCPP_INLINE_VISIBILITY
2842	unique_ptr() : __ptr_(pointer()) {
2843	static_assert(!is_pointer<deleter_type>::value,
2844	"unique_ptr constructed with null function pointer deleter");
2845	}
2846	_LIBCPP_INLINE_VISIBILITY
2847	unique_ptr(nullptr_t) : __ptr_(pointer()) {
2848	static_assert(!is_pointer<deleter_type>::value,
2849	"unique_ptr constructed with null function pointer deleter");
2850	}
2851
2852	_LIBCPP_INLINE_VISIBILITY
2853	explicit unique_ptr(pointer __p) : __ptr_(__p) {
2854	static_assert(!is_pointer<deleter_type>::value,
2855	"unique_ptr constructed with null function pointer deleter");
2856	}
2857
2858	_LIBCPP_INLINE_VISIBILITY
2859	unique_ptr(pointer __p, deleter_type __d)
2860	: __ptr_(__p, _VSTD::forward<deleter_type>(__d)) {}
2861
2862	_LIBCPP_INLINE_VISIBILITY
2863	unique_ptr(nullptr_t, deleter_type __d)
2864	: __ptr_(pointer(), _VSTD::forward<deleter_type>(__d)) {}
2865
2866	_LIBCPP_INLINE_VISIBILITY
2867	operator __rv<unique_ptr>() {
2868	return __rv<unique_ptr>(*this);
2869	}
2870
2871	_LIBCPP_INLINE_VISIBILITY
2872	unique_ptr(__rv<unique_ptr> __u)
2873	: __ptr_(__u->release(),
2874	_VSTD::forward<deleter_type>(__u->get_deleter())) {}
2875
2876	_LIBCPP_INLINE_VISIBILITY
2877	unique_ptr& operator=(__rv<unique_ptr> __u) {
2878	reset(__u->release());
2879	__ptr_.second() = _VSTD::forward<deleter_type>(__u->get_deleter());
2880	return *this;
2881	}
2882
2883	#endif // _LIBCPP_CXX03_LANG
2884		2767
2885	public:	2768	public:
2886	_LIBCPP_INLINE_VISIBILITY	2769	_LIBCPP_INLINE_VISIBILITY
...	@@ -3092,18 +2975,6 @@ operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x)	...	@@ -3092,18 +2975,6 @@ operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x)
3092	return !(nullptr < __x);	2975	return !(nullptr < __x);
3093	}	2976	}
3094		2977
3095	#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3096
3097	template <class _Tp, class _Dp>
3098	inline _LIBCPP_INLINE_VISIBILITY
3099	unique_ptr<_Tp, _Dp>
3100	move(unique_ptr<_Tp, _Dp>& __t)
3101	{
3102	return unique_ptr<_Tp, _Dp>(__rv<unique_ptr<_Tp, _Dp> >(__t));
3103	}
3104
3105	#endif
3106
3107	#if _LIBCPP_STD_VER > 11	2978	#if _LIBCPP_STD_VER > 11
3108		2979
3109	template<class _Tp>	2980	template<class _Tp>
...	@@ -3152,7 +3023,7 @@ template <class _Tp, class _Dp>	...	@@ -3152,7 +3023,7 @@ template <class _Tp, class _Dp>
3152	struct _LIBCPP_TEMPLATE_VIS hash<unique_ptr<_Tp, _Dp> >	3023	struct _LIBCPP_TEMPLATE_VIS hash<unique_ptr<_Tp, _Dp> >
3153	#else	3024	#else
3154	struct _LIBCPP_TEMPLATE_VIS hash<__enable_hash_helper<	3025	struct _LIBCPP_TEMPLATE_VIS hash<__enable_hash_helper<
3155	unique_ptr<_Tp, _Dp>, typename unique_ptr<_Tp, _Dp>::pointer>>	3026	unique_ptr<_Tp, _Dp>, typename unique_ptr<_Tp, _Dp>::pointer> >
3156	#endif	3027	#endif
3157	{	3028	{
3158	typedef unique_ptr<_Tp, _Dp> argument_type;	3029	typedef unique_ptr<_Tp, _Dp> argument_type;
...	@@ -3207,10 +3078,10 @@ public:	...	@@ -3207,10 +3078,10 @@ public:
3207	template <class _Alloc>	3078	template <class _Alloc>
3208	class __allocator_destructor	3079	class __allocator_destructor
3209	{	3080	{
3210	typedef allocator_traits<_Alloc> __alloc_traits;	3081	typedef _LIBCPP_NODEBUG_TYPE allocator_traits<_Alloc> __alloc_traits;
3211	public:	3082	public:
3212	typedef typename __alloc_traits::pointer pointer;	3083	typedef _LIBCPP_NODEBUG_TYPE typename __alloc_traits::pointer pointer;
3213	typedef typename __alloc_traits::size_type size_type;	3084	typedef _LIBCPP_NODEBUG_TYPE typename __alloc_traits::size_type size_type;
3214	private:	3085	private:
3215	_Alloc& __alloc_;	3086	_Alloc& __alloc_;
3216	size_type __s_;	3087	size_type __s_;
...	@@ -3467,7 +3338,7 @@ uninitialized_move_n(_InputIt __first, _Size __n, _ForwardIt __first_res) {	...	@@ -3467,7 +3338,7 @@ uninitialized_move_n(_InputIt __first, _Size __n, _ForwardIt __first_res) {
3467	&& defined(__ATOMIC_RELAXED) \	3338	&& defined(__ATOMIC_RELAXED) \
3468	&& defined(__ATOMIC_ACQ_REL)	3339	&& defined(__ATOMIC_ACQ_REL)
3469	# define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT	3340	# define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT
3470	#elif !defined(__clang__) && defined(_GNUC_VER) && _GNUC_VER >= 407	3341	#elif defined(_LIBCPP_COMPILER_GCC)
3471	# define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT	3342	# define _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT
3472	#endif	3343	#endif
3473		3344
...	@@ -5669,6 +5540,52 @@ struct __is_allocator<_Alloc,	...	@@ -5669,6 +5540,52 @@ struct __is_allocator<_Alloc,
5669	>	5540	>
5670	: true_type {};	5541	: true_type {};
5671		5542
		5543	// __builtin_new_allocator -- A non-templated helper for allocating and
		5544	// deallocating memory using __builtin_operator_new and
		5545	// __builtin_operator_delete. It should be used in preference to
		5546	// `std::allocator<T>` to avoid additional instantiations.
		5547	struct __builtin_new_allocator {
		5548	struct __builtin_new_deleter {
		5549	typedef void* pointer_type;
		5550
		5551	_LIBCPP_CONSTEXPR explicit __builtin_new_deleter(size_t __size, size_t __align)
		5552	: __size_(__size), __align_(__align) {}
		5553
		5554	void operator()(void* p) const _NOEXCEPT {
		5555	std::__libcpp_deallocate(p, __size_, __align_);
		5556	}
		5557
		5558	private:
		5559	size_t __size_;
		5560	size_t __align_;
		5561	};
		5562
		5563	typedef unique_ptr<void, __builtin_new_deleter> __holder_t;
		5564
		5565	static __holder_t __allocate_bytes(size_t __s, size_t __align) {
		5566	return __holder_t(std::__libcpp_allocate(__s, __align),
		5567	__builtin_new_deleter(__s, __align));
		5568	}
		5569
		5570	static void __deallocate_bytes(void* __p, size_t __s,
		5571	size_t __align) _NOEXCEPT {
		5572	std::__libcpp_deallocate(__p, __s, __align);
		5573	}
		5574
		5575	template <class _Tp>
		5576	_LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
		5577	static __holder_t __allocate_type(size_t __n) {
		5578	return __allocate_bytes(__n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
		5579	}
		5580
		5581	template <class _Tp>
		5582	_LIBCPP_NODEBUG _LIBCPP_ALWAYS_INLINE
		5583	static void __deallocate_type(void* __p, size_t __n) _NOEXCEPT {
		5584	__deallocate_bytes(__p, __n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
		5585	}
		5586	};
		5587
		5588
5672	_LIBCPP_END_NAMESPACE_STD	5589	_LIBCPP_END_NAMESPACE_STD
5673		5590
5674	_LIBCPP_POP_MACROS	5591	_LIBCPP_POP_MACROS

lib/libcxx/include/module.modulemap+4-1

 @@ -24,7 +24,10 @@ module std [system] {
       header "errno.h"
       export *
     }
-    // <fenv.h> provided by C library.
+    module fenv_h {
+      header "fenv.h"
+      export *
+    }
     // <float.h> provided by compiler or C library.
     module inttypes_h {
       header "inttypes.h"

lib/libcxx/include/mutex+17-9

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- mutex ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -189,6 +188,7 @@ template<class Callable, class ...Args>
 #include <__config>
 #include <__mutex_base>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #ifndef _LIBCPP_CXX03_LANG
 @@ -576,11 +576,18 @@ struct _LIBCPP_TEMPLATE_VIS once_flag
     _LIBCPP_CONSTEXPR
         once_flag() _NOEXCEPT : __state_(0) {}
+#if defined(_LIBCPP_ABI_MICROSOFT)
+   typedef uintptr_t _State_type;
+#else
+   typedef unsigned long _State_type;
+#endif
 private:
     once_flag(const once_flag&); // = delete;
     once_flag& operator=(const once_flag&); // = delete;
-    unsigned long __state_;
+    _State_type __state_;
 #ifndef _LIBCPP_CXX03_LANG
     template<class _Callable, class... _Args>
 @@ -650,7 +657,8 @@ __call_once_proxy(void* __vp)
     (*__p)();
 }
-_LIBCPP_FUNC_VIS void __call_once(volatile unsigned long&, void*, void(*)(void*));
+_LIBCPP_FUNC_VIS void __call_once(volatile once_flag::_State_type&, void*,
+                                  void (*)(void*));
 #ifndef _LIBCPP_CXX03_LANG
 @@ -659,7 +667,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 void
 call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args)
 {
-    if (__libcpp_acquire_load(&__flag.__state_) != ~0ul)
+    if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))
     {
         typedef tuple<_Callable&&, _Args&&...> _Gp;
         _Gp __f(_VSTD::forward<_Callable>(__func), _VSTD::forward<_Args>(__args)...);
 @@ -675,7 +683,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 void
 call_once(once_flag& __flag, _Callable& __func)
 {
-    if (__libcpp_acquire_load(&__flag.__state_) != ~0ul)
+    if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))
     {
         __call_once_param<_Callable> __p(__func);
         __call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>);
 @@ -687,7 +695,7 @@ inline _LIBCPP_INLINE_VISIBILITY
 void
 call_once(once_flag& __flag, const _Callable& __func)
 {
-    if (__libcpp_acquire_load(&__flag.__state_) != ~0ul)
+    if (__libcpp_acquire_load(&__flag.__state_) != ~once_flag::_State_type(0))
     {
         __call_once_param<const _Callable> __p(__func);
         __call_once(__flag.__state_, &__p, &__call_once_proxy<const _Callable>);

lib/libcxx/include/new+28-14

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===----------------------------- new ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -34,6 +33,12 @@ public:
 };
 enum class align_val_t : size_t {}; // C++17
+struct destroying_delete_t { // C++20
+  explicit destroying_delete_t() = default;
+};
+inline constexpr destroying_delete_t destroying_delete{}; // C++20
 struct nothrow_t {};
 extern const nothrow_t nothrow;
 typedef void (*new_handler)();
 @@ -90,7 +95,7 @@ void  operator delete[](void* ptr, void*) noexcept;
 #include <cstdlib>
 #endif
-#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
+#if defined(_LIBCPP_ABI_VCRUNTIME)
 #include <new.h>
 #endif
 @@ -120,7 +125,7 @@ void  operator delete[](void* ptr, void*) noexcept;
 namespace std  // purposefully not using versioning namespace
 {
-#if !defined(_LIBCPP_ABI_MICROSOFT) || defined(_LIBCPP_NO_VCRUNTIME)
+#if !defined(_LIBCPP_ABI_VCRUNTIME)
 struct _LIBCPP_TYPE_VIS nothrow_t {};
 extern _LIBCPP_FUNC_VIS const nothrow_t nothrow;
 @@ -146,12 +151,12 @@ typedef void (*new_handler)();
 _LIBCPP_FUNC_VIS new_handler set_new_handler(new_handler) _NOEXCEPT;
 _LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT;
-#endif // !_LIBCPP_ABI_MICROSOFT || _LIBCPP_NO_VCRUNTIME
+#endif // !_LIBCPP_ABI_VCRUNTIME
 _LIBCPP_NORETURN _LIBCPP_FUNC_VIS void __throw_bad_alloc();  // not in C++ spec
 #if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) && \
-    !defined(_LIBCPP_DEFER_NEW_TO_VCRUNTIME)
+    !defined(_LIBCPP_ABI_VCRUNTIME)
 #ifndef _LIBCPP_CXX03_LANG
 enum class _LIBCPP_ENUM_VIS align_val_t : size_t { };
 #else
 @@ -159,6 +164,15 @@ enum align_val_t { __zero = 0, __max = (size_t)-1 };
 #endif
 #endif
+#if _LIBCPP_STD_VER > 17
+// Enable the declaration even if the compiler doesn't support the language
+// feature.
+struct destroying_delete_t {
+  explicit destroying_delete_t() = default;
+};
+_LIBCPP_INLINE_VAR constexpr destroying_delete_t destroying_delete{};
+#endif // _LIBCPP_STD_VER > 17
 }  // std
 #if defined(_LIBCPP_CXX03_LANG)
 @@ -167,10 +181,10 @@ enum align_val_t { __zero = 0, __max = (size_t)-1 };
 #define _THROW_BAD_ALLOC
 #endif
-#if !defined(_LIBCPP_DEFER_NEW_TO_VCRUNTIME)
+#if !defined(_LIBCPP_ABI_VCRUNTIME)
 _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz) _THROW_BAD_ALLOC;
-_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete(void* __p) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
 #ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
 @@ -178,7 +192,7 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_AVAILABILITY_SIZED_NEW_DELETE void  operato
 #endif
 _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz) _THROW_BAD_ALLOC;
-_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete[](void* __p) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
 #ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
 @@ -187,7 +201,7 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_AVAILABILITY_SIZED_NEW_DELETE void  operato
 #ifndef _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
 _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, std::align_val_t) _THROW_BAD_ALLOC;
-_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new(std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete(void* __p, std::align_val_t) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete(void* __p, std::align_val_t, const std::nothrow_t&) _NOEXCEPT;
 #ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
 @@ -195,7 +209,7 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_AVAILABILITY_SIZED_NEW_DELETE void  operato
 #endif
 _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz, std::align_val_t) _THROW_BAD_ALLOC;
-_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_OVERRIDABLE_FUNC_VIS void* operator new[](std::size_t __sz, std::align_val_t, const std::nothrow_t&) _NOEXCEPT _LIBCPP_NOALIAS;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete[](void* __p, std::align_val_t) _NOEXCEPT;
 _LIBCPP_OVERRIDABLE_FUNC_VIS void  operator delete[](void* __p, std::align_val_t, const std::nothrow_t&) _NOEXCEPT;
 #ifndef _LIBCPP_HAS_NO_LIBRARY_SIZED_DEALLOCATION
 @@ -208,7 +222,7 @@ _LIBCPP_NODISCARD_AFTER_CXX17 inline _LIBCPP_INLINE_VISIBILITY void* operator ne
 inline _LIBCPP_INLINE_VISIBILITY void  operator delete  (void*, void*) _NOEXCEPT {}
 inline _LIBCPP_INLINE_VISIBILITY void  operator delete[](void*, void*) _NOEXCEPT {}
-#endif // !_LIBCPP_DEFER_NEW_TO_VCRUNTIME
+#endif // !_LIBCPP_ABI_VCRUNTIME
 _LIBCPP_BEGIN_NAMESPACE_STD

lib/libcxx/include/numeric+73-11

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- numeric ---------------------------------===//	2	//===---------------------------- numeric ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -134,6 +133,10 @@ template <class M, class N>	...	@@ -134,6 +133,10 @@ template <class M, class N>
134	template <class M, class N>	133	template <class M, class N>
135	constexpr common_type_t<M,N> lcm(M m, N n); // C++17	134	constexpr common_type_t<M,N> lcm(M m, N n); // C++17
136		135
		136	integer midpoint(integer a, integer b); // C++20
		137	pointer midpoint(pointer a, pointer b); // C++20
		138	floating_point midpoint(floating_point a, floating_point b); // C++20
		139
137	} // std	140	} // std
138		141
139	*/	142	*/
...	@@ -142,6 +145,7 @@ template <class M, class N>	...	@@ -142,6 +145,7 @@ template <class M, class N>
142	#include <iterator>	145	#include <iterator>
143	#include <limits> // for numeric_limits	146	#include <limits> // for numeric_limits
144	#include <functional>	147	#include <functional>
		148	#include <cmath> // for isnormal
145	#include <version>	149	#include <version>
146		150
147	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	151	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -456,10 +460,10 @@ iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value_)	...	@@ -456,10 +460,10 @@ iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value_)
456		460
457		461
458	#if _LIBCPP_STD_VER > 14	462	#if _LIBCPP_STD_VER > 14
459	template <typename _Result, typename _Source, bool _IsSigned = is_signed<_Source>::value> struct __abs;	463	template <typename _Result, typename _Source, bool _IsSigned = is_signed<_Source>::value> struct __ct_abs;
460		464
461	template <typename _Result, typename _Source>	465	template <typename _Result, typename _Source>
462	struct __abs<_Result, _Source, true> {	466	struct __ct_abs<_Result, _Source, true> {
463	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY	467	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
464	_Result operator()(_Source __t) const noexcept	468	_Result operator()(_Source __t) const noexcept
465	{	469	{
...	@@ -470,7 +474,7 @@ struct __abs<_Result, _Source, true> {	...	@@ -470,7 +474,7 @@ struct __abs<_Result, _Source, true> {
470	};	474	};
471		475
472	template <typename _Result, typename _Source>	476	template <typename _Result, typename _Source>
473	struct __abs<_Result, _Source, false> {	477	struct __ct_abs<_Result, _Source, false> {
474	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY	478	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
475	_Result operator()(_Source __t) const noexcept { return __t; }	479	_Result operator()(_Source __t) const noexcept { return __t; }
476	};	480	};
...	@@ -496,8 +500,8 @@ gcd(_Tp __m, _Up __n)	...	@@ -496,8 +500,8 @@ gcd(_Tp __m, _Up __n)
496	using _Rp = common_type_t<_Tp,_Up>;	500	using _Rp = common_type_t<_Tp,_Up>;
497	using _Wp = make_unsigned_t<_Rp>;	501	using _Wp = make_unsigned_t<_Rp>;
498	return static_cast<_Rp>(_VSTD::__gcd(	502	return static_cast<_Rp>(_VSTD::__gcd(
499	static_cast<_Wp>(__abs<_Rp, _Tp>()(__m)),	503	static_cast<_Wp>(__ct_abs<_Rp, _Tp>()(__m)),
500	static_cast<_Wp>(__abs<_Rp, _Up>()(__n))));	504	static_cast<_Wp>(__ct_abs<_Rp, _Up>()(__n))));
501	}	505	}
502		506
503	template<class _Tp, class _Up>	507	template<class _Tp, class _Up>
...	@@ -512,14 +516,72 @@ lcm(_Tp __m, _Up __n)	...	@@ -512,14 +516,72 @@ lcm(_Tp __m, _Up __n)
512	return 0;	516	return 0;
513		517
514	using _Rp = common_type_t<_Tp,_Up>;	518	using _Rp = common_type_t<_Tp,_Up>;
515	_Rp __val1 = __abs<_Rp, _Tp>()(__m) / _VSTD::gcd(__m, __n);	519	_Rp __val1 = __ct_abs<_Rp, _Tp>()(__m) / _VSTD::gcd(__m, __n);
516	_Rp __val2 = __abs<_Rp, _Up>()(__n);	520	_Rp __val2 = __ct_abs<_Rp, _Up>()(__n);
517	_LIBCPP_ASSERT((numeric_limits<_Rp>::max() / __val1 > __val2), "Overflow in lcm");	521	_LIBCPP_ASSERT((numeric_limits<_Rp>::max() / __val1 > __val2), "Overflow in lcm");
518	return __val1 * __val2;	522	return __val1 * __val2;
519	}	523	}
520		524
521	#endif /* _LIBCPP_STD_VER > 14 */	525	#endif /* _LIBCPP_STD_VER > 14 */
522		526
		527	#if _LIBCPP_STD_VER > 17
		528	template <class _Tp>
		529	_LIBCPP_INLINE_VISIBILITY constexpr
		530	enable_if_t<is_integral_v<_Tp> && !is_same_v<bool, _Tp> && !is_null_pointer_v<_Tp>, _Tp>
		531	midpoint(_Tp __a, _Tp __b) noexcept
		532	_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
		533	{
		534	using _Up = std::make_unsigned_t<_Tp>;
		535
		536	int __sign = 1;
		537	_Up __m = __a;
		538	_Up __M = __b;
		539	if (__a > __b)
		540	{
		541	__sign = -1;
		542	__m = __b;
		543	__M = __a;
		544	}
		545	return __a + __sign * _Tp(_Up(__M-__m) >> 1);
		546	}
		547
		548
		549	template <class _TPtr>
		550	_LIBCPP_INLINE_VISIBILITY constexpr
		551	enable_if_t<is_pointer_v<_TPtr>
		552	&& is_object_v<remove_pointer_t<_TPtr>>
		553	&& ! is_void_v<remove_pointer_t<_TPtr>>
		554	&& (sizeof(remove_pointer_t<_TPtr>) > 0), _TPtr>
		555	midpoint(_TPtr __a, _TPtr __b) noexcept
		556	{
		557	return __a + _VSTD::midpoint(ptrdiff_t(0), __b - __a);
		558	}
		559
		560
		561	template <typename _Tp>
		562	constexpr int __sign(_Tp __val) {
		563	return (_Tp(0) < __val) - (__val < _Tp(0));
		564	}
		565
		566	template <typename _Fp>
		567	constexpr _Fp __fp_abs(_Fp __f) { return __f >= 0 ? __f : -__f; }
		568
		569	template <class _Fp>
		570	_LIBCPP_INLINE_VISIBILITY constexpr
		571	enable_if_t<is_floating_point_v<_Fp>, _Fp>
		572	midpoint(_Fp __a, _Fp __b) noexcept
		573	{
		574	constexpr _Fp __lo = numeric_limits<_Fp>::min()*2;
		575	constexpr _Fp __hi = numeric_limits<_Fp>::max()/2;
		576	return __fp_abs(__a) <= __hi && __fp_abs(__b) <= __hi ? // typical case: overflow is impossible
		577	(__a + __b)/2 : // always correctly rounded
		578	__fp_abs(__a) < __lo ? __a + __b/2 : // not safe to halve a
		579	__fp_abs(__a) < __lo ? __a/2 + __b : // not safe to halve b
		580	__a/2 + __b/2; // otherwise correctly rounded
		581	}
		582
		583	#endif // _LIBCPP_STD_VER > 17
		584
523	_LIBCPP_END_NAMESPACE_STD	585	_LIBCPP_END_NAMESPACE_STD
524		586
525	_LIBCPP_POP_MACROS	587	_LIBCPP_POP_MACROS

lib/libcxx/include/optional+60-54

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- optional ----------------------------------===//	2	//===-------------------------- optional ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -593,7 +592,7 @@ public:	...	@@ -593,7 +592,7 @@ public:
593		592
594	private:	593	private:
595	// Disable the reference extension using this static assert.	594	// Disable the reference extension using this static assert.
596	static_assert(!is_same_v<value_type, in_place_t>,	595	static_assert(!is_same_v<__uncvref_t<value_type>, in_place_t>,
597	"instantiation of optional with in_place_t is ill-formed");	596	"instantiation of optional with in_place_t is ill-formed");
598	static_assert(!is_same_v<__uncvref_t<value_type>, nullopt_t>,	597	static_assert(!is_same_v<__uncvref_t<value_type>, nullopt_t>,
599	"instantiation of optional with nullopt_t is ill-formed");	598	"instantiation of optional with nullopt_t is ill-formed");
...	@@ -601,6 +600,8 @@ private:	...	@@ -601,6 +600,8 @@ private:
601	"instantiation of optional with a reference type is ill-formed");	600	"instantiation of optional with a reference type is ill-formed");
602	static_assert(is_destructible_v<value_type>,	601	static_assert(is_destructible_v<value_type>,
603	"instantiation of optional with a non-destructible type is ill-formed");	602	"instantiation of optional with a non-destructible type is ill-formed");
		603	static_assert(!is_array_v<value_type>,
		604	"instantiation of optional with an array type is ill-formed");
604		605
605	// LWG2756: conditionally explicit conversion from _Up	606	// LWG2756: conditionally explicit conversion from _Up
606	struct _CheckOptionalArgsConstructor {	607	struct _CheckOptionalArgsConstructor {
...	@@ -617,16 +618,16 @@ private:	...	@@ -617,16 +618,16 @@ private:
617	}	618	}
618	};	619	};
619	template <class _Up>	620	template <class _Up>
620	using _CheckOptionalArgsCtor = conditional_t<	621	using _CheckOptionalArgsCtor = _If<
621	!is_same_v<__uncvref_t<_Up>, in_place_t> &&	622	_IsNotSame<__uncvref_t<_Up>, in_place_t>::value &&
622	!is_same_v<__uncvref_t<_Up>, optional>,	623	_IsNotSame<__uncvref_t<_Up>, optional>::value,
623	_CheckOptionalArgsConstructor,	624	_CheckOptionalArgsConstructor,
624	__check_tuple_constructor_fail	625	__check_tuple_constructor_fail
625	>;	626	>;
626	template <class _QualUp>	627	template <class _QualUp>
627	struct _CheckOptionalLikeConstructor {	628	struct _CheckOptionalLikeConstructor {
628	template <class _Up, class _Opt = optional<_Up>>	629	template <class _Up, class _Opt = optional<_Up>>
629	using __check_constructible_from_opt = __lazy_or<	630	using __check_constructible_from_opt = _Or<
630	is_constructible<_Tp, _Opt&>,	631	is_constructible<_Tp, _Opt&>,
631	is_constructible<_Tp, _Opt const&>,	632	is_constructible<_Tp, _Opt const&>,
632	is_constructible<_Tp, _Opt&&>,	633	is_constructible<_Tp, _Opt&&>,
...	@@ -637,7 +638,7 @@ private:	...	@@ -637,7 +638,7 @@ private:
637	is_convertible<_Opt const&&, _Tp>	638	is_convertible<_Opt const&&, _Tp>
638	>;	639	>;
639	template <class _Up, class _Opt = optional<_Up>>	640	template <class _Up, class _Opt = optional<_Up>>
640	using __check_assignable_from_opt = __lazy_or<	641	using __check_assignable_from_opt = _Or<
641	is_assignable<_Tp&, _Opt&>,	642	is_assignable<_Tp&, _Opt&>,
642	is_assignable<_Tp&, _Opt const&>,	643	is_assignable<_Tp&, _Opt const&>,
643	is_assignable<_Tp&, _Opt&&>,	644	is_assignable<_Tp&, _Opt&&>,
...	@@ -663,18 +664,18 @@ private:	...	@@ -663,18 +664,18 @@ private:
663	};	664	};
664		665
665	template <class _Up, class _QualUp>	666	template <class _Up, class _QualUp>
666	using _CheckOptionalLikeCtor = conditional_t<	667	using _CheckOptionalLikeCtor = _If<
667	__lazy_and<	668	_And<
668	__lazy_not<is_same<_Up, _Tp>>,	669	_IsNotSame<_Up, _Tp>,
669	is_constructible<_Tp, _QualUp>	670	is_constructible<_Tp, _QualUp>
670	>::value,	671	>::value,
671	_CheckOptionalLikeConstructor<_QualUp>,	672	_CheckOptionalLikeConstructor<_QualUp>,
672	__check_tuple_constructor_fail	673	__check_tuple_constructor_fail
673	>;	674	>;
674	template <class _Up, class _QualUp>	675	template <class _Up, class _QualUp>
675	using _CheckOptionalLikeAssign = conditional_t<	676	using _CheckOptionalLikeAssign = _If<
676	__lazy_and<	677	_And<
677	__lazy_not<is_same<_Up, _Tp>>,	678	_IsNotSame<_Up, _Tp>,
678	is_constructible<_Tp, _QualUp>,	679	is_constructible<_Tp, _QualUp>,
679	is_assignable<_Tp&, _QualUp>	680	is_assignable<_Tp&, _QualUp>
680	>::value,	681	>::value,
...	@@ -688,28 +689,32 @@ public:	...	@@ -688,28 +689,32 @@ public:
688	_LIBCPP_INLINE_VISIBILITY constexpr optional(optional&&) = default;	689	_LIBCPP_INLINE_VISIBILITY constexpr optional(optional&&) = default;
689	_LIBCPP_INLINE_VISIBILITY constexpr optional(nullopt_t) noexcept {}	690	_LIBCPP_INLINE_VISIBILITY constexpr optional(nullopt_t) noexcept {}
690		691
691	template <class... _Args, class = enable_if_t<	692	template <class _InPlaceT, class... _Args, class = _EnableIf<
692	is_constructible_v<value_type, _Args...>>	693	_And<
		694	_IsSame<_InPlaceT, in_place_t>,
		695	is_constructible<value_type, _Args...>
		696	>::value
		697	>
693	>	698	>
694	_LIBCPP_INLINE_VISIBILITY	699	_LIBCPP_INLINE_VISIBILITY
695	constexpr explicit optional(in_place_t, _Args&&... __args)	700	constexpr explicit optional(_InPlaceT, _Args&&... __args)
696	: __base(in_place, _VSTD::forward<_Args>(__args)...) {}	701	: __base(in_place, _VSTD::forward<_Args>(__args)...) {}
697		702
698	template <class _Up, class... _Args, class = enable_if_t<	703	template <class _Up, class... _Args, class = _EnableIf<
699	is_constructible_v<value_type, initializer_list<_Up>&, _Args...>>	704	is_constructible_v<value_type, initializer_list<_Up>&, _Args...>>
700	>	705	>
701	_LIBCPP_INLINE_VISIBILITY	706	_LIBCPP_INLINE_VISIBILITY
702	constexpr explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args)	707	constexpr explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args)
703	: __base(in_place, __il, _VSTD::forward<_Args>(__args)...) {}	708	: __base(in_place, __il, _VSTD::forward<_Args>(__args)...) {}
704		709
705	template <class _Up = value_type, enable_if_t<	710	template <class _Up = value_type, _EnableIf<
706	_CheckOptionalArgsCtor<_Up>::template __enable_implicit<_Up>()	711	_CheckOptionalArgsCtor<_Up>::template __enable_implicit<_Up>()
707	, int> = 0>	712	, int> = 0>
708	_LIBCPP_INLINE_VISIBILITY	713	_LIBCPP_INLINE_VISIBILITY
709	constexpr optional(_Up&& __v)	714	constexpr optional(_Up&& __v)
710	: __base(in_place, _VSTD::forward<_Up>(__v)) {}	715	: __base(in_place, _VSTD::forward<_Up>(__v)) {}
711		716
712	template <class _Up, enable_if_t<	717	template <class _Up, _EnableIf<
713	_CheckOptionalArgsCtor<_Up>::template __enable_explicit<_Up>()	718	_CheckOptionalArgsCtor<_Up>::template __enable_explicit<_Up>()
714	, int> = 0>	719	, int> = 0>
715	_LIBCPP_INLINE_VISIBILITY	720	_LIBCPP_INLINE_VISIBILITY
...	@@ -717,7 +722,7 @@ public:	...	@@ -717,7 +722,7 @@ public:
717	: __base(in_place, _VSTD::forward<_Up>(__v)) {}	722	: __base(in_place, _VSTD::forward<_Up>(__v)) {}
718		723
719	// LWG2756: conditionally explicit conversion from const optional<_Up>&	724	// LWG2756: conditionally explicit conversion from const optional<_Up>&
720	template <class _Up, enable_if_t<	725	template <class _Up, _EnableIf<
721	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>()	726	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>()
722	, int> = 0>	727	, int> = 0>
723	_LIBCPP_INLINE_VISIBILITY	728	_LIBCPP_INLINE_VISIBILITY
...	@@ -725,7 +730,7 @@ public:	...	@@ -725,7 +730,7 @@ public:
725	{	730	{
726	this->__construct_from(__v);	731	this->__construct_from(__v);
727	}	732	}
728	template <class _Up, enable_if_t<	733	template <class _Up, _EnableIf<
729	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>()	734	_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>()
730	, int> = 0>	735	, int> = 0>
731	_LIBCPP_INLINE_VISIBILITY	736	_LIBCPP_INLINE_VISIBILITY
...	@@ -735,7 +740,7 @@ public:	...	@@ -735,7 +740,7 @@ public:
735	}	740	}
736		741
737	// LWG2756: conditionally explicit conversion from optional<_Up>&&	742	// LWG2756: conditionally explicit conversion from optional<_Up>&&
738	template <class _Up, enable_if_t<	743	template <class _Up, _EnableIf<
739	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_implicit<_Up>()	744	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_implicit<_Up>()
740	, int> = 0>	745	, int> = 0>
741	_LIBCPP_INLINE_VISIBILITY	746	_LIBCPP_INLINE_VISIBILITY
...	@@ -743,7 +748,7 @@ public:	...	@@ -743,7 +748,7 @@ public:
743	{	748	{
744	this->__construct_from(_VSTD::move(__v));	749	this->__construct_from(_VSTD::move(__v));
745	}	750	}
746	template <class _Up, enable_if_t<	751	template <class _Up, _EnableIf<
747	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_explicit<_Up>()	752	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_explicit<_Up>()
748	, int> = 0>	753	, int> = 0>
749	_LIBCPP_INLINE_VISIBILITY	754	_LIBCPP_INLINE_VISIBILITY
...	@@ -764,11 +769,12 @@ public:	...	@@ -764,11 +769,12 @@ public:
764		769
765	// LWG2756	770	// LWG2756
766	template <class _Up = value_type,	771	template <class _Up = value_type,
767	class = enable_if_t	772	class = _EnableIf<
768	<__lazy_and<	773	_And<
769	integral_constant<bool,	774	_IsNotSame<__uncvref_t<_Up>, optional>,
770	!is_same_v<__uncvref_t<_Up>, optional> &&	775	_Or<
771	!(is_same_v<_Up, value_type> && is_scalar_v<value_type>)	776	_IsNotSame<__uncvref_t<_Up>, value_type>,
		777	_Not<is_scalar<value_type>>
772	>,	778	>,
773	is_constructible<value_type, _Up>,	779	is_constructible<value_type, _Up>,
774	is_assignable<value_type&, _Up>	780	is_assignable<value_type&, _Up>
...	@@ -786,7 +792,7 @@ public:	...	@@ -786,7 +792,7 @@ public:
786	}	792	}
787		793
788	// LWG2756	794	// LWG2756
789	template <class _Up, enable_if_t<	795	template <class _Up, _EnableIf<
790	_CheckOptionalLikeAssign<_Up, _Up const&>::template __enable_assign<_Up>()	796	_CheckOptionalLikeAssign<_Up, _Up const&>::template __enable_assign<_Up>()
791	, int> = 0>	797	, int> = 0>
792	_LIBCPP_INLINE_VISIBILITY	798	_LIBCPP_INLINE_VISIBILITY
...	@@ -798,7 +804,7 @@ public:	...	@@ -798,7 +804,7 @@ public:
798	}	804	}
799		805
800	// LWG2756	806	// LWG2756
801	template <class _Up, enable_if_t<	807	template <class _Up, _EnableIf<
802	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_assign<_Up>()	808	_CheckOptionalLikeCtor<_Up, _Up &&>::template __enable_assign<_Up>()
803	, int> = 0>	809	, int> = 0>
804	_LIBCPP_INLINE_VISIBILITY	810	_LIBCPP_INLINE_VISIBILITY
...	@@ -810,7 +816,7 @@ public:	...	@@ -810,7 +816,7 @@ public:
810	}	816	}
811		817
812	template <class... _Args,	818	template <class... _Args,
813	class = enable_if_t	819	class = _EnableIf
814	<	820	<
815	is_constructible_v<value_type, _Args...>	821	is_constructible_v<value_type, _Args...>
816	>	822	>
...	@@ -825,7 +831,7 @@ public:	...	@@ -825,7 +831,7 @@ public:
825	}	831	}
826		832
827	template <class _Up, class... _Args,	833	template <class _Up, class... _Args,
828	class = enable_if_t	834	class = _EnableIf
829	<	835	<
830	is_constructible_v<value_type, initializer_list<_Up>&, _Args...>	836	is_constructible_v<value_type, initializer_list<_Up>&, _Args...>
831	>	837	>
...	@@ -1021,7 +1027,7 @@ template<class T>	...	@@ -1021,7 +1027,7 @@ template<class T>
1021	// Comparisons between optionals	1027	// Comparisons between optionals
1022	template <class _Tp, class _Up>	1028	template <class _Tp, class _Up>
1023	_LIBCPP_INLINE_VISIBILITY constexpr	1029	_LIBCPP_INLINE_VISIBILITY constexpr
1024	enable_if_t<	1030	_EnableIf<
1025	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==	1031	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
1026	_VSTD::declval<const _Up&>()), bool>,	1032	_VSTD::declval<const _Up&>()), bool>,
1027	bool	1033	bool
...	@@ -1037,7 +1043,7 @@ operator==(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1037,7 +1043,7 @@ operator==(const optional<_Tp>& __x, const optional<_Up>& __y)
1037		1043
1038	template <class _Tp, class _Up>	1044	template <class _Tp, class _Up>
1039	_LIBCPP_INLINE_VISIBILITY constexpr	1045	_LIBCPP_INLINE_VISIBILITY constexpr
1040	enable_if_t<	1046	_EnableIf<
1041	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=	1047	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
1042	_VSTD::declval<const _Up&>()), bool>,	1048	_VSTD::declval<const _Up&>()), bool>,
1043	bool	1049	bool
...	@@ -1053,7 +1059,7 @@ operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1053,7 +1059,7 @@ operator!=(const optional<_Tp>& __x, const optional<_Up>& __y)
1053		1059
1054	template <class _Tp, class _Up>	1060	template <class _Tp, class _Up>
1055	_LIBCPP_INLINE_VISIBILITY constexpr	1061	_LIBCPP_INLINE_VISIBILITY constexpr
1056	enable_if_t<	1062	_EnableIf<
1057	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <	1063	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
1058	_VSTD::declval<const _Up&>()), bool>,	1064	_VSTD::declval<const _Up&>()), bool>,
1059	bool	1065	bool
...	@@ -1069,7 +1075,7 @@ operator<(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1069,7 +1075,7 @@ operator<(const optional<_Tp>& __x, const optional<_Up>& __y)
1069		1075
1070	template <class _Tp, class _Up>	1076	template <class _Tp, class _Up>
1071	_LIBCPP_INLINE_VISIBILITY constexpr	1077	_LIBCPP_INLINE_VISIBILITY constexpr
1072	enable_if_t<	1078	_EnableIf<
1073	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >	1079	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
1074	_VSTD::declval<const _Up&>()), bool>,	1080	_VSTD::declval<const _Up&>()), bool>,
1075	bool	1081	bool
...	@@ -1085,7 +1091,7 @@ operator>(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1085,7 +1091,7 @@ operator>(const optional<_Tp>& __x, const optional<_Up>& __y)
1085		1091
1086	template <class _Tp, class _Up>	1092	template <class _Tp, class _Up>
1087	_LIBCPP_INLINE_VISIBILITY constexpr	1093	_LIBCPP_INLINE_VISIBILITY constexpr
1088	enable_if_t<	1094	_EnableIf<
1089	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=	1095	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
1090	_VSTD::declval<const _Up&>()), bool>,	1096	_VSTD::declval<const _Up&>()), bool>,
1091	bool	1097	bool
...	@@ -1101,7 +1107,7 @@ operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)	...	@@ -1101,7 +1107,7 @@ operator<=(const optional<_Tp>& __x, const optional<_Up>& __y)
1101		1107
1102	template <class _Tp, class _Up>	1108	template <class _Tp, class _Up>
1103	_LIBCPP_INLINE_VISIBILITY constexpr	1109	_LIBCPP_INLINE_VISIBILITY constexpr
1104	enable_if_t<	1110	_EnableIf<
1105	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=	1111	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
1106	_VSTD::declval<const _Up&>()), bool>,	1112	_VSTD::declval<const _Up&>()), bool>,
1107	bool	1113	bool
...	@@ -1215,7 +1221,7 @@ operator>=(nullopt_t, const optional<_Tp>& __x) noexcept	...	@@ -1215,7 +1221,7 @@ operator>=(nullopt_t, const optional<_Tp>& __x) noexcept
1215	// Comparisons with T	1221	// Comparisons with T
1216	template <class _Tp, class _Up>	1222	template <class _Tp, class _Up>
1217	_LIBCPP_INLINE_VISIBILITY constexpr	1223	_LIBCPP_INLINE_VISIBILITY constexpr
1218	enable_if_t<	1224	_EnableIf<
1219	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==	1225	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
1220	_VSTD::declval<const _Up&>()), bool>,	1226	_VSTD::declval<const _Up&>()), bool>,
1221	bool	1227	bool
...	@@ -1227,7 +1233,7 @@ operator==(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1227,7 +1233,7 @@ operator==(const optional<_Tp>& __x, const _Up& __v)
1227		1233
1228	template <class _Tp, class _Up>	1234	template <class _Tp, class _Up>
1229	_LIBCPP_INLINE_VISIBILITY constexpr	1235	_LIBCPP_INLINE_VISIBILITY constexpr
1230	enable_if_t<	1236	_EnableIf<
1231	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==	1237	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() ==
1232	_VSTD::declval<const _Up&>()), bool>,	1238	_VSTD::declval<const _Up&>()), bool>,
1233	bool	1239	bool
...	@@ -1239,7 +1245,7 @@ operator==(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1239,7 +1245,7 @@ operator==(const _Tp& __v, const optional<_Up>& __x)
1239		1245
1240	template <class _Tp, class _Up>	1246	template <class _Tp, class _Up>
1241	_LIBCPP_INLINE_VISIBILITY constexpr	1247	_LIBCPP_INLINE_VISIBILITY constexpr
1242	enable_if_t<	1248	_EnableIf<
1243	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=	1249	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
1244	_VSTD::declval<const _Up&>()), bool>,	1250	_VSTD::declval<const _Up&>()), bool>,
1245	bool	1251	bool
...	@@ -1251,7 +1257,7 @@ operator!=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1251,7 +1257,7 @@ operator!=(const optional<_Tp>& __x, const _Up& __v)
1251		1257
1252	template <class _Tp, class _Up>	1258	template <class _Tp, class _Up>
1253	_LIBCPP_INLINE_VISIBILITY constexpr	1259	_LIBCPP_INLINE_VISIBILITY constexpr
1254	enable_if_t<	1260	_EnableIf<
1255	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=	1261	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() !=
1256	_VSTD::declval<const _Up&>()), bool>,	1262	_VSTD::declval<const _Up&>()), bool>,
1257	bool	1263	bool
...	@@ -1263,7 +1269,7 @@ operator!=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1263,7 +1269,7 @@ operator!=(const _Tp& __v, const optional<_Up>& __x)
1263		1269
1264	template <class _Tp, class _Up>	1270	template <class _Tp, class _Up>
1265	_LIBCPP_INLINE_VISIBILITY constexpr	1271	_LIBCPP_INLINE_VISIBILITY constexpr
1266	enable_if_t<	1272	_EnableIf<
1267	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <	1273	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
1268	_VSTD::declval<const _Up&>()), bool>,	1274	_VSTD::declval<const _Up&>()), bool>,
1269	bool	1275	bool
...	@@ -1275,7 +1281,7 @@ operator<(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1275,7 +1281,7 @@ operator<(const optional<_Tp>& __x, const _Up& __v)
1275		1281
1276	template <class _Tp, class _Up>	1282	template <class _Tp, class _Up>
1277	_LIBCPP_INLINE_VISIBILITY constexpr	1283	_LIBCPP_INLINE_VISIBILITY constexpr
1278	enable_if_t<	1284	_EnableIf<
1279	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <	1285	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <
1280	_VSTD::declval<const _Up&>()), bool>,	1286	_VSTD::declval<const _Up&>()), bool>,
1281	bool	1287	bool
...	@@ -1287,7 +1293,7 @@ operator<(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1287,7 +1293,7 @@ operator<(const _Tp& __v, const optional<_Up>& __x)
1287		1293
1288	template <class _Tp, class _Up>	1294	template <class _Tp, class _Up>
1289	_LIBCPP_INLINE_VISIBILITY constexpr	1295	_LIBCPP_INLINE_VISIBILITY constexpr
1290	enable_if_t<	1296	_EnableIf<
1291	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=	1297	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
1292	_VSTD::declval<const _Up&>()), bool>,	1298	_VSTD::declval<const _Up&>()), bool>,
1293	bool	1299	bool
...	@@ -1299,7 +1305,7 @@ operator<=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1299,7 +1305,7 @@ operator<=(const optional<_Tp>& __x, const _Up& __v)
1299		1305
1300	template <class _Tp, class _Up>	1306	template <class _Tp, class _Up>
1301	_LIBCPP_INLINE_VISIBILITY constexpr	1307	_LIBCPP_INLINE_VISIBILITY constexpr
1302	enable_if_t<	1308	_EnableIf<
1303	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=	1309	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() <=
1304	_VSTD::declval<const _Up&>()), bool>,	1310	_VSTD::declval<const _Up&>()), bool>,
1305	bool	1311	bool
...	@@ -1311,7 +1317,7 @@ operator<=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1311,7 +1317,7 @@ operator<=(const _Tp& __v, const optional<_Up>& __x)
1311		1317
1312	template <class _Tp, class _Up>	1318	template <class _Tp, class _Up>
1313	_LIBCPP_INLINE_VISIBILITY constexpr	1319	_LIBCPP_INLINE_VISIBILITY constexpr
1314	enable_if_t<	1320	_EnableIf<
1315	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >	1321	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
1316	_VSTD::declval<const _Up&>()), bool>,	1322	_VSTD::declval<const _Up&>()), bool>,
1317	bool	1323	bool
...	@@ -1323,7 +1329,7 @@ operator>(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1323,7 +1329,7 @@ operator>(const optional<_Tp>& __x, const _Up& __v)
1323		1329
1324	template <class _Tp, class _Up>	1330	template <class _Tp, class _Up>
1325	_LIBCPP_INLINE_VISIBILITY constexpr	1331	_LIBCPP_INLINE_VISIBILITY constexpr
1326	enable_if_t<	1332	_EnableIf<
1327	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >	1333	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >
1328	_VSTD::declval<const _Up&>()), bool>,	1334	_VSTD::declval<const _Up&>()), bool>,
1329	bool	1335	bool
...	@@ -1335,7 +1341,7 @@ operator>(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1335,7 +1341,7 @@ operator>(const _Tp& __v, const optional<_Up>& __x)
1335		1341
1336	template <class _Tp, class _Up>	1342	template <class _Tp, class _Up>
1337	_LIBCPP_INLINE_VISIBILITY constexpr	1343	_LIBCPP_INLINE_VISIBILITY constexpr
1338	enable_if_t<	1344	_EnableIf<
1339	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=	1345	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
1340	_VSTD::declval<const _Up&>()), bool>,	1346	_VSTD::declval<const _Up&>()), bool>,
1341	bool	1347	bool
...	@@ -1347,7 +1353,7 @@ operator>=(const optional<_Tp>& __x, const _Up& __v)	...	@@ -1347,7 +1353,7 @@ operator>=(const optional<_Tp>& __x, const _Up& __v)
1347		1353
1348	template <class _Tp, class _Up>	1354	template <class _Tp, class _Up>
1349	_LIBCPP_INLINE_VISIBILITY constexpr	1355	_LIBCPP_INLINE_VISIBILITY constexpr
1350	enable_if_t<	1356	_EnableIf<
1351	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=	1357	is_convertible_v<decltype(_VSTD::declval<const _Tp&>() >=
1352	_VSTD::declval<const _Up&>()), bool>,	1358	_VSTD::declval<const _Up&>()), bool>,
1353	bool	1359	bool
...	@@ -1360,7 +1366,7 @@ operator>=(const _Tp& __v, const optional<_Up>& __x)	...	@@ -1360,7 +1366,7 @@ operator>=(const _Tp& __v, const optional<_Up>& __x)
1360		1366
1361	template <class _Tp>	1367	template <class _Tp>
1362	inline _LIBCPP_INLINE_VISIBILITY	1368	inline _LIBCPP_INLINE_VISIBILITY
1363	enable_if_t<	1369	_EnableIf<
1364	is_move_constructible_v<_Tp> && is_swappable_v<_Tp>,	1370	is_move_constructible_v<_Tp> && is_swappable_v<_Tp>,
1365	void	1371	void
1366	>	1372	>

lib/libcxx/include/ostream+8-4

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- ostream -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -57,6 +56,7 @@ public:
     basic_ostream& operator<<(long double f);
     basic_ostream& operator<<(const void* p);
     basic_ostream& operator<<(basic_streambuf<char_type,traits>* sb);
+    basic_ostream& operator<<(nullptr_t);
     // 27.7.2.7 Unformatted output:
     basic_ostream& put(char_type c);
 @@ -219,6 +219,10 @@ public:
     basic_ostream& operator<<(const void* __p);
     basic_ostream& operator<<(basic_streambuf<char_type, traits_type>* __sb);
+    _LIBCPP_INLINE_VISIBILITY
+    basic_ostream& operator<<(nullptr_t)
+    { return *this << "nullptr"; }
     // 27.7.2.7 Unformatted output:
     basic_ostream& put(char_type __c);
     basic_ostream& write(const char_type* __s, streamsize __n);

lib/libcxx/include/queue+13-14

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- queue ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -71,8 +70,8 @@ public:
 template<class Container>
   queue(Container) -> queue<typename Container::value_type, Container>; // C++17
 template<class Container, class Allocator>
   queue(Container, Allocator) -> queue<typename Container::value_type, Container>; // C++17
 template <class T, class Container>
 @@ -166,13 +165,13 @@ public:
 template <class Compare, class Container>
 priority_queue(Compare, Container)
     -> priority_queue<typename Container::value_type, Container, Compare>; // C++17
 template<class InputIterator,
          class Compare = less<typename iterator_traits<InputIterator>::value_type>,
          class Container = vector<typename iterator_traits<InputIterator>::value_type>>
 priority_queue(InputIterator, InputIterator, Compare = Compare(), Container = Container())
     -> priority_queue<typename iterator_traits<InputIterator>::value_type, Container, Compare>; // C++17
 template<class Compare, class Container, class Allocator>
 priority_queue(Compare, Container, Allocator)
     -> priority_queue<typename Container::value_type, Container, Compare>; // C++17
 @@ -347,7 +346,7 @@ template<class _Container,
 >
 queue(_Container)
     -> queue<typename _Container::value_type, _Container>;
 template<class _Container,
          class _Alloc,
          class = typename enable_if<!__is_allocator<_Container>::value, nullptr_t>::type,
 @@ -559,8 +558,8 @@ template <class _Compare,
 >
 priority_queue(_Compare, _Container)
     -> priority_queue<typename _Container::value_type, _Container, _Compare>;
 template<class _InputIterator,
          class _Compare   = less<typename iterator_traits<_InputIterator>::value_type>,
          class _Container = vector<typename iterator_traits<_InputIterator>::value_type>,
          class = typename enable_if< __is_input_iterator<_InputIterator>::value, nullptr_t>::type,
 @@ -569,8 +568,8 @@ template<class _InputIterator,
 >
 priority_queue(_InputIterator, _InputIterator, _Compare = _Compare(), _Container = _Container())
     -> priority_queue<typename iterator_traits<_InputIterator>::value_type, _Container, _Compare>;
 template<class _Compare,
          class _Container,
          class _Alloc,
          class = typename enable_if<!__is_allocator<_Compare>::value, nullptr_t>::type,

lib/libcxx/include/random+11-12

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- random -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -2227,19 +2226,19 @@ template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::state_size;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::shift_size;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::mask_bits;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 @@ -2251,7 +2250,7 @@ template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_u;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 @@ -2263,7 +2262,7 @@ template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_s;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 @@ -2275,7 +2274,7 @@ template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_t;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 @@ -2287,7 +2286,7 @@ template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
     _LIBCPP_CONSTEXPR const size_t
     mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_l;
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
 @@ -6427,7 +6426,7 @@ public:
             param_type(size_t __nw, result_type __xmin, result_type __xmax,
                        _UnaryOperation __fw);
         param_type & operator=(const param_type& __rhs);
         _LIBCPP_INLINE_VISIBILITY
         vector<result_type> intervals() const {return __b_;}
         _LIBCPP_INLINE_VISIBILITY

lib/libcxx/include/ratio+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- ratio -----------------------------------===//	2	//===---------------------------- ratio -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/regex+89-46

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- regex ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -678,7 +677,7 @@ public:
                    regex_constants::match_flag_type m = regex_constants::match_default);
     regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
                    const regex_type&& __re,
                    regex_constants::match_flag_type __m
                                      = regex_constants::match_default) = delete; // C++14
     regex_iterator(const regex_iterator&);
     regex_iterator& operator=(const regex_iterator&);
 @@ -794,7 +793,11 @@ enum syntax_option_type
     nosubs     = 1 << 1,
     optimize   = 1 << 2,
     collate    = 1 << 3,
+#ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
+    ECMAScript = 1 << 9,
+#else
     ECMAScript = 0,
+#endif
     basic      = 1 << 4,
     extended   = 1 << 5,
     awk        = 1 << 6,
 @@ -802,6 +805,16 @@ enum syntax_option_type
     egrep      = 1 << 8
 };
+inline _LIBCPP_CONSTEXPR
+syntax_option_type __get_grammar(syntax_option_type __g)
+{
+#ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
+    return static_cast<syntax_option_type>(__g & 0x3F0);
+#else
+    return static_cast<syntax_option_type>(__g & 0x1F0);
+#endif
+}
 inline _LIBCPP_INLINE_VISIBILITY
 _LIBCPP_CONSTEXPR
 syntax_option_type
 @@ -988,16 +1001,7 @@ public:
     typedef locale                  locale_type;
     typedef ctype_base::mask        char_class_type;
-#if defined(__mips__) && defined(__GLIBC__)
+    static const char_class_type __regex_word = ctype_base::__regex_word;
-    static const char_class_type __regex_word = static_cast<char_class_type>(_ISbit(15));
-#elif defined(__NetBSD__)
-    // NetBSD defines classes up to 0x2000
-    // see sys/ctype_bits.h, _CTYPE_Q
-    static const char_class_type __regex_word = 0x8000;
-#else
-    static const char_class_type __regex_word = 0x80;
-#endif
 private:
     locale __loc_;
     const ctype<char_type>* __ct_;
 @@ -2293,7 +2297,7 @@ public:
             else
             {
                 if (__b.size() != 1 || __e.size() != 1)
-                    __throw_regex_error<regex_constants::error_collate>();
+                    __throw_regex_error<regex_constants::error_range>();
                 if (__icase_)
                 {
                     __b[0] = __traits_.translate_nocase(__b[0]);
 @@ -2527,19 +2531,27 @@ public:
     // construct/copy/destroy:
     _LIBCPP_INLINE_VISIBILITY
     basic_regex()
-        : __flags_(), __marked_count_(0), __loop_count_(0), __open_count_(0),
+        : __flags_(regex_constants::ECMAScript), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
         {}
     _LIBCPP_INLINE_VISIBILITY
     explicit basic_regex(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
-        {__parse(__p, __p + __traits_.length(__p));}
+        {
+        if (__get_grammar(__flags_) == 0) __flags_ |= regex_constants::ECMAScript;
+        __parse(__p, __p + __traits_.length(__p));
+        }
     _LIBCPP_INLINE_VISIBILITY
     basic_regex(const value_type* __p, size_t __len, flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
-        {__parse(__p, __p + __len);}
+        {
+        if (__get_grammar(__flags_) == 0) __flags_ |= regex_constants::ECMAScript;
+        __parse(__p, __p + __len);
+        }
 //     basic_regex(const basic_regex&) = default;
 //     basic_regex(basic_regex&&) = default;
     template <class _ST, class _SA>
 @@ -2548,21 +2560,31 @@ public:
                              flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
-        {__parse(__p.begin(), __p.end());}
+        {
+        if (__get_grammar(__flags_) == 0) __flags_ |= regex_constants::ECMAScript;
+        __parse(__p.begin(), __p.end());
+        }
     template <class _ForwardIterator>
         _LIBCPP_INLINE_VISIBILITY
         basic_regex(_ForwardIterator __first, _ForwardIterator __last,
                     flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
-        {__parse(__first, __last);}
+        {
+        if (__get_grammar(__flags_) == 0) __flags_ |= regex_constants::ECMAScript;
+        __parse(__first, __last);
+        }
 #ifndef _LIBCPP_CXX03_LANG
     _LIBCPP_INLINE_VISIBILITY
     basic_regex(initializer_list<value_type> __il,
                 flag_type __f = regex_constants::ECMAScript)
         : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
           __end_(0)
-        {__parse(__il.begin(), __il.end());}
+        {
+        if (__get_grammar(__flags_) == 0) __flags_ |= regex_constants::ECMAScript;
+        __parse(__il.begin(), __il.end());
+        }
 #endif  // _LIBCPP_CXX03_LANG
 //    ~basic_regex() = default;
 @@ -3044,7 +3066,7 @@ basic_regex<_CharT, _Traits>::__parse(_ForwardIterator __first,
         __h.release();
         __end_ = __start_.get();
     }
-    switch (__flags_ & 0x1F0)
+    switch (__get_grammar(__flags_))
     {
     case ECMAScript:
         __first = __parse_ecma_exp(__first, __last);
 @@ -3379,7 +3401,7 @@ basic_regex<_CharT, _Traits>::__parse_BACKREF(_ForwardIterator __first,
         if (__temp != __last)
         {
             if (*__first == '\\')
             {
                 int __val = __traits_.value(*__temp, 10);
                 if (__val >= 1 && __val <= 9)
                 {
 @@ -3513,7 +3535,7 @@ basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first,
                     __first = ++__temp;
                     break;
                 default:
-                    if ((__flags_ & 0x1F0) == awk)
+                    if (__get_grammar(__flags_) == awk)
                         __first = __parse_awk_escape(++__first, __last);
                     break;
                 }
 @@ -3597,7 +3619,7 @@ basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first,
 {
     if (__first != __last)
     {
-        unsigned __grammar = __flags_ & 0x1F0;
+        unsigned __grammar = __get_grammar(__flags_);
         switch (*__first)
         {
         case '*':
 @@ -3718,7 +3740,7 @@ basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __firs
         // __ml owned by *this
         if (__first == __last)
             __throw_regex_error<regex_constants::error_brack>();
-        if ((__flags_ & 0x1F0) != ECMAScript && *__first == ']')
+        if (__get_grammar(__flags_) != ECMAScript && *__first == ']')
         {
             __ml->__add_char(']');
             ++__first;
 @@ -3779,7 +3801,7 @@ basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
             else if (*__temp == '.')
                 __first = __parse_collating_symbol(++__temp, __last, __start_range);
         }
-        unsigned __grammar = __flags_ & 0x1F0;
+        unsigned __grammar = __get_grammar(__flags_);
         if (__start_range.empty())
         {
             if ((__grammar == ECMAScript || __grammar == awk) && *__first == '\\')
 @@ -4076,7 +4098,7 @@ basic_regex<_CharT, _Traits>::__parse_DUP_COUNT(_ForwardIterator __first,
         if ( __val != -1 )
         {
             __c = __val;
             for (++__first;
                  __first != __last && ( __val = __traits_.value(*__first, 10)) != -1;
                  ++__first)
             {
 @@ -4456,7 +4478,7 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first,
         case 'c':
             if ((__t = _VSTD::next(__first)) != __last)
             {
                 if (('A' <= *__t && *__t <= 'Z') ||
                     ('a' <= *__t && *__t <= 'z'))
                 {
                     if (__str)
 @@ -4465,7 +4487,7 @@ basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first,
                         __push_char(_CharT(*__t % 32));
                     __first = ++__t;
                 }
                 else
                     __throw_regex_error<regex_constants::error_escape>();
             }
             else
 @@ -5265,21 +5287,41 @@ public:
     // element access:
     _LIBCPP_INLINE_VISIBILITY
     difference_type length(size_type __sub = 0) const
-        {return (*this)[__sub].length();}
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::length() called when not ready");
+        return (*this)[__sub].length();
+        }
     _LIBCPP_INLINE_VISIBILITY
     difference_type position(size_type __sub = 0) const
-        {return _VSTD::distance(__position_start_, (*this)[__sub].first);}
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::position() called when not ready");
+        return _VSTD::distance(__position_start_, (*this)[__sub].first);
+        }
     _LIBCPP_INLINE_VISIBILITY
     string_type str(size_type __sub = 0) const
-        {return (*this)[__sub].str();}
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::str() called when not ready");
+        return (*this)[__sub].str();
+        }
     _LIBCPP_INLINE_VISIBILITY
     const_reference operator[](size_type __n) const
-        {return __n < __matches_.size() ? __matches_[__n] : __unmatched_;}
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::operator[]() called when not ready");
+        return __n < __matches_.size() ? __matches_[__n] : __unmatched_;
+        }
     _LIBCPP_INLINE_VISIBILITY
-    const_reference prefix() const {return __prefix_;}
+    const_reference prefix() const
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::prefix() called when not ready");
+        return __prefix_;
+        }
     _LIBCPP_INLINE_VISIBILITY
-    const_reference suffix() const {return __suffix_;}
+    const_reference suffix() const
+        {
+        _LIBCPP_ASSERT(ready(), "match_results::suffix() called when not ready");
+        return __suffix_;
+        }
     _LIBCPP_INLINE_VISIBILITY
     const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin();}
 @@ -5417,6 +5459,7 @@ match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __output_i
         const char_type* __fmt_first, const char_type* __fmt_last,
         regex_constants::match_flag_type __flags) const
 {
+    _LIBCPP_ASSERT(ready(), "match_results::format() called when not ready");
     if (__flags & regex_constants::format_sed)
     {
         for (; __fmt_first != __fmt_last; ++__fmt_first)
 @@ -5849,7 +5892,7 @@ basic_regex<_CharT, _Traits>::__match_at_start(
         match_results<const _CharT*, _Allocator>& __m,
         regex_constants::match_flag_type __flags, bool __at_first) const
 {
-    if ((__flags_ & 0x1F0) == ECMAScript)
+    if (__get_grammar(__flags_) == ECMAScript)
         return __match_at_start_ecma(__first, __last, __m, __flags, __at_first);
     if (mark_count() == 0)
         return __match_at_start_posix_nosubs(__first, __last, __m, __flags, __at_first);
 @@ -5866,7 +5909,7 @@ basic_regex<_CharT, _Traits>::__search(
 {
     __m.__init(1 + mark_count(), __first, __last,
                                     __flags & regex_constants::__no_update_pos);
     if (__match_at_start(__first, __last, __m, __flags,
                                     !(__flags & regex_constants::__no_update_pos)))
     {
         __m.__prefix_.second = __m[0].first;
 @@ -6012,7 +6055,7 @@ bool
 regex_search(const basic_string<_Cp, _ST, _SA>&& __s,
              match_results<typename basic_string<_Cp, _ST, _SA>::const_iterator, _Ap>&,
              const basic_regex<_Cp, _Tp>& __e,
              regex_constants::match_flag_type __flags = regex_constants::match_default) = delete;
 #endif
 // regex_match
 @@ -6076,7 +6119,7 @@ bool
 regex_match(const basic_string<_CharT, _ST, _SA>&& __s,
             match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
             const basic_regex<_CharT, _Traits>& __e,
             regex_constants::match_flag_type __flags = regex_constants::match_default) = delete;
 #endif
 template <class _CharT, class _Traits>
 @@ -6129,7 +6172,7 @@ public:
 #if _LIBCPP_STD_VER > 11
     regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
                    const regex_type&& __re,
                    regex_constants::match_flag_type __m
                                      = regex_constants::match_default) = delete;
 #endif
 @@ -6140,7 +6183,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     reference operator*() const {return  __match_;}
     _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const  {return &__match_;}
+    pointer operator->() const  {return _VSTD::addressof(__match_);}
     regex_iterator& operator++();
     _LIBCPP_INLINE_VISIBILITY
 @@ -6164,7 +6207,7 @@ regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
                    const regex_type& __re, regex_constants::match_flag_type __m)
     : __begin_(__a),
       __end_(__b),
-      __pregex_(&__re),
+      __pregex_(_VSTD::addressof(__re)),
       __flags_(__m)
 {
     _VSTD::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
 @@ -6325,7 +6368,7 @@ private:
             __result_ = &__position_->prefix();
         else
             __result_ = &(*__position_)[__subs_[__n_]];
         }
 };
 template <class _BidirectionalIterator, class _CharT, class _Traits>
 @@ -6405,7 +6448,7 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
                              regex_constants::match_flag_type __m)
     : __position_(__a, __b, __re, __m),
       __n_(0),
-      __subs_(__submatches, __submatches + _Np)
+      __subs_(begin(__submatches), end(__submatches))
 {
     __init(__a, __b);
 }

lib/libcxx/include/scoped_allocator+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- scoped_allocator --------------------------===//	2	//===-------------------------- scoped_allocator --------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/set+87-11

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- set -------------------------------------===//	2	//===---------------------------- set -------------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -156,9 +155,9 @@ public:	...	@@ -156,9 +155,9 @@ public:
156	template<typename K>	155	template<typename K>
157	const_iterator find(const K& x) const; // C++14	156	const_iterator find(const K& x) const; // C++14
158	template<typename K>	157	template<typename K>
159	size_type count(const K& x) const; // C++14	158	size_type count(const K& x) const; // C++14
160
161	size_type count(const key_type& k) const;	159	size_type count(const key_type& k) const;
		160	bool contains(const key_type& x) const; // C++20
162	iterator lower_bound(const key_type& k);	161	iterator lower_bound(const key_type& k);
163	const_iterator lower_bound(const key_type& k) const;	162	const_iterator lower_bound(const key_type& k) const;
164	template<typename K>	163	template<typename K>
...	@@ -355,8 +354,10 @@ public:	...	@@ -355,8 +354,10 @@ public:
355	iterator find(const K& x);	354	iterator find(const K& x);
356	template<typename K>	355	template<typename K>
357	const_iterator find(const K& x) const; // C++14	356	const_iterator find(const K& x) const; // C++14
358		357	template<typename K>
		358	size_type count(const K& x) const; // C++14
359	size_type count(const key_type& k) const;	359	size_type count(const key_type& k) const;
		360	bool contains(const key_type& x) const; // C++20
360	iterator lower_bound(const key_type& k);	361	iterator lower_bound(const key_type& k);
361	const_iterator lower_bound(const key_type& k) const;	362	const_iterator lower_bound(const key_type& k) const;
362	template<typename K>	363	template<typename K>
...	@@ -447,11 +448,10 @@ public:	...	@@ -447,11 +448,10 @@ public:
447	typedef key_type value_type;	448	typedef key_type value_type;
448	typedef _Compare key_compare;	449	typedef _Compare key_compare;
449	typedef key_compare value_compare;	450	typedef key_compare value_compare;
450	typedef _Allocator allocator_type;	451	typedef typename __identity<_Allocator>::type allocator_type;
451	typedef value_type& reference;	452	typedef value_type& reference;
452	typedef const value_type& const_reference;	453	typedef const value_type& const_reference;
453		454
454	static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
455	static_assert((is_same<typename allocator_type::value_type, value_type>::value),	455	static_assert((is_same<typename allocator_type::value_type, value_type>::value),
456	"Allocator::value_type must be same type as value_type");	456	"Allocator::value_type must be same type as value_type");
457		457
...	@@ -597,6 +597,11 @@ public:	...	@@ -597,6 +597,11 @@ public:
597	}	597	}
598	#endif // _LIBCPP_CXX03_LANG	598	#endif // _LIBCPP_CXX03_LANG
599		599
		600	_LIBCPP_INLINE_VISIBILITY
		601	~set() {
		602	static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
		603	}
		604
600	_LIBCPP_INLINE_VISIBILITY	605	_LIBCPP_INLINE_VISIBILITY
601	iterator begin() _NOEXCEPT {return __tree_.begin();}	606	iterator begin() _NOEXCEPT {return __tree_.begin();}
602	_LIBCPP_INLINE_VISIBILITY	607	_LIBCPP_INLINE_VISIBILITY
...	@@ -784,6 +789,12 @@ public:	...	@@ -784,6 +789,12 @@ public:
784	typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type	789	typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
785	count(const _K2& __k) const {return __tree_.__count_multi(__k);}	790	count(const _K2& __k) const {return __tree_.__count_multi(__k);}
786	#endif	791	#endif
		792
		793	#if _LIBCPP_STD_VER > 17
		794	_LIBCPP_INLINE_VISIBILITY
		795	bool contains(const key_type& __k) const {return find(__k) != end();}
		796	#endif // _LIBCPP_STD_VER > 17
		797
787	_LIBCPP_INLINE_VISIBILITY	798	_LIBCPP_INLINE_VISIBILITY
788	iterator lower_bound(const key_type& __k)	799	iterator lower_bound(const key_type& __k)
789	{return __tree_.lower_bound(__k);}	800	{return __tree_.lower_bound(__k);}
...	@@ -837,6 +848,34 @@ public:	...	@@ -837,6 +848,34 @@ public:
837	#endif	848	#endif
838	};	849	};
839		850
		851	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		852	template<class _InputIterator,
		853	class _Compare = less<typename iterator_traits<_InputIterator>::value_type>,
		854	class _Allocator = allocator<typename iterator_traits<_InputIterator>::value_type>,
		855	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type,
		856	class = typename enable_if<!__is_allocator<_Compare>::value, void>::type>
		857	set(_InputIterator, _InputIterator, _Compare = _Compare(), _Allocator = _Allocator())
		858	-> set<typename iterator_traits<_InputIterator>::value_type, _Compare, _Allocator>;
		859
		860	template<class _Key, class _Compare = less<_Key>,
		861	class _Allocator = allocator<_Key>,
		862	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type,
		863	class = typename enable_if<!__is_allocator<_Compare>::value, void>::type>
		864	set(initializer_list<_Key>, _Compare = _Compare(), _Allocator = _Allocator())
		865	-> set<_Key, _Compare, _Allocator>;
		866
		867	template<class _InputIterator, class _Allocator,
		868	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type>
		869	set(_InputIterator, _InputIterator, _Allocator)
		870	-> set<typename iterator_traits<_InputIterator>::value_type,
		871	less<typename iterator_traits<_InputIterator>::value_type>, _Allocator>;
		872
		873	template<class _Key, class _Allocator,
		874	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type>
		875	set(initializer_list<_Key>, _Allocator)
		876	-> set<_Key, less<_Key>, _Allocator>;
		877	#endif
		878
840	#ifndef _LIBCPP_CXX03_LANG	879	#ifndef _LIBCPP_CXX03_LANG
841		880
842	template <class _Key, class _Compare, class _Allocator>	881	template <class _Key, class _Compare, class _Allocator>
...	@@ -935,11 +974,10 @@ public:	...	@@ -935,11 +974,10 @@ public:
935	typedef key_type value_type;	974	typedef key_type value_type;
936	typedef _Compare key_compare;	975	typedef _Compare key_compare;
937	typedef key_compare value_compare;	976	typedef key_compare value_compare;
938	typedef _Allocator allocator_type;	977	typedef typename __identity<_Allocator>::type allocator_type;
939	typedef value_type& reference;	978	typedef value_type& reference;
940	typedef const value_type& const_reference;	979	typedef const value_type& const_reference;
941		980
942	static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
943	static_assert((is_same<typename allocator_type::value_type, value_type>::value),	981	static_assert((is_same<typename allocator_type::value_type, value_type>::value),
944	"Allocator::value_type must be same type as value_type");	982	"Allocator::value_type must be same type as value_type");
945		983
...	@@ -1084,6 +1122,11 @@ public:	...	@@ -1084,6 +1122,11 @@ public:
1084	}	1122	}
1085	#endif // _LIBCPP_CXX03_LANG	1123	#endif // _LIBCPP_CXX03_LANG
1086		1124
		1125	_LIBCPP_INLINE_VISIBILITY
		1126	~multiset() {
		1127	static_assert(sizeof(__diagnose_non_const_comparator<_Key, _Compare>()), "");
		1128	}
		1129
1087	_LIBCPP_INLINE_VISIBILITY	1130	_LIBCPP_INLINE_VISIBILITY
1088	iterator begin() _NOEXCEPT {return __tree_.begin();}	1131	iterator begin() _NOEXCEPT {return __tree_.begin();}
1089	_LIBCPP_INLINE_VISIBILITY	1132	_LIBCPP_INLINE_VISIBILITY
...	@@ -1272,6 +1315,11 @@ public:	...	@@ -1272,6 +1315,11 @@ public:
1272	count(const _K2& __k) const {return __tree_.__count_multi(__k);}	1315	count(const _K2& __k) const {return __tree_.__count_multi(__k);}
1273	#endif	1316	#endif
1274		1317
		1318	#if _LIBCPP_STD_VER > 17
		1319	_LIBCPP_INLINE_VISIBILITY
		1320	bool contains(const key_type& __k) const {return find(__k) != end();}
		1321	#endif // _LIBCPP_STD_VER > 17
		1322
1275	_LIBCPP_INLINE_VISIBILITY	1323	_LIBCPP_INLINE_VISIBILITY
1276	iterator lower_bound(const key_type& __k)	1324	iterator lower_bound(const key_type& __k)
1277	{return __tree_.lower_bound(__k);}	1325	{return __tree_.lower_bound(__k);}
...	@@ -1325,6 +1373,34 @@ public:	...	@@ -1325,6 +1373,34 @@ public:
1325	#endif	1373	#endif
1326	};	1374	};
1327		1375
		1376	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		1377	template<class _InputIterator,
		1378	class _Compare = less<typename iterator_traits<_InputIterator>::value_type>,
		1379	class _Allocator = allocator<typename iterator_traits<_InputIterator>::value_type>,
		1380	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type,
		1381	class = typename enable_if<!__is_allocator<_Compare>::value, void>::type>
		1382	multiset(_InputIterator, _InputIterator, _Compare = _Compare(), _Allocator = _Allocator())
		1383	-> multiset<typename iterator_traits<_InputIterator>::value_type, _Compare, _Allocator>;
		1384
		1385	template<class _Key, class _Compare = less<_Key>,
		1386	class _Allocator = allocator<_Key>,
		1387	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type,
		1388	class = typename enable_if<!__is_allocator<_Compare>::value, void>::type>
		1389	multiset(initializer_list<_Key>, _Compare = _Compare(), _Allocator = _Allocator())
		1390	-> multiset<_Key, _Compare, _Allocator>;
		1391
		1392	template<class _InputIterator, class _Allocator,
		1393	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type>
		1394	multiset(_InputIterator, _InputIterator, _Allocator)
		1395	-> multiset<typename iterator_traits<_InputIterator>::value_type,
		1396	less<typename iterator_traits<_InputIterator>::value_type>, _Allocator>;
		1397
		1398	template<class _Key, class _Allocator,
		1399	class = typename enable_if<__is_allocator<_Allocator>::value, void>::type>
		1400	multiset(initializer_list<_Key>, _Allocator)
		1401	-> multiset<_Key, less<_Key>, _Allocator>;
		1402	#endif
		1403
1328	#ifndef _LIBCPP_CXX03_LANG	1404	#ifndef _LIBCPP_CXX03_LANG
1329		1405
1330	template <class _Key, class _Compare, class _Allocator>	1406	template <class _Key, class _Compare, class _Allocator>

lib/libcxx/include/setjmp.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- setjmp.h ---------------------------------===//	2	//===--------------------------- setjmp.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/shared_mutex+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------ shared_mutex --------------------------------===//	2	//===------------------------ shared_mutex --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/span+139-112

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------ span ---------------------------------===//	2	//===------------------------------ span ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===---------------------------------------------------------------------===//	8	//===---------------------------------------------------------------------===//
10		9
...	@@ -17,33 +16,35 @@	...	@@ -17,33 +16,35 @@
17	namespace std {	16	namespace std {
18		17
19	// constants	18	// constants
20	inline constexpr ptrdiff_t dynamic_extent = -1;	19	inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max();
21		20
22	// [views.span], class template span	21	// [views.span], class template span
23	template <class ElementType, ptrdiff_t Extent = dynamic_extent>	22	template <class ElementType, size_t Extent = dynamic_extent>
24	class span;	23	class span;
25		24
26	// [span.objectrep], views of object representation	25	// [span.objectrep], views of object representation
27	template <class ElementType, ptrdiff_t Extent>	26	template <class ElementType, size_t Extent>
28	span<const byte, ((Extent == dynamic_extent) ? dynamic_extent :	27	span<const byte, ((Extent == dynamic_extent) ? dynamic_extent :
29	(static_cast<ptrdiff_t>(sizeof(ElementType)) * Extent))> as_bytes(span<ElementType, Extent> s) noexcept;	28	(sizeof(ElementType) * Extent))> as_bytes(span<ElementType, Extent> s) noexcept;
30		29
31	template <class ElementType, ptrdiff_t Extent>	30	template <class ElementType, size_t Extent>
32	span< byte, ((Extent == dynamic_extent) ? dynamic_extent :	31	span< byte, ((Extent == dynamic_extent) ? dynamic_extent :
33	(static_cast<ptrdiff_t>(sizeof(ElementType)) * Extent))> as_writable_bytes(span<ElementType, Extent> s) noexcept;	32	(sizeof(ElementType) * Extent))> as_writable_bytes(span<ElementType, Extent> s) noexcept;
34		33
35		34
36	namespace std {	35	namespace std {
37	template <class ElementType, ptrdiff_t Extent = dynamic_extent>	36	template <class ElementType, size_t Extent = dynamic_extent>
38	class span {	37	class span {
39	public:	38	public:
40	// constants and types	39	// constants and types
41	using element_type = ElementType;	40	using element_type = ElementType;
42	using value_type = remove_cv_t<ElementType>;	41	using value_type = remove_cv_t<ElementType>;
43	using index_type = ptrdiff_t;	42	using index_type = size_t;
44	using difference_type = ptrdiff_t;	43	using difference_type = ptrdiff_t;
45	using pointer = element_type*;	44	using pointer = element_type*;
		45	using const_pointer = const element_type*;
46	using reference = element_type&;	46	using reference = element_type&;
		47	using const_reference = const element_type&;
47	using iterator = implementation-defined;	48	using iterator = implementation-defined;
48	using const_iterator = implementation-defined;	49	using const_iterator = implementation-defined;
49	using reverse_iterator = std::reverse_iterator<iterator>;	50	using reverse_iterator = std::reverse_iterator<iterator>;
...	@@ -65,17 +66,17 @@ public:	...	@@ -65,17 +66,17 @@ public:
65	template <class Container>	66	template <class Container>
66	constexpr span(const Container& cont);	67	constexpr span(const Container& cont);
67	constexpr span(const span& other) noexcept = default;	68	constexpr span(const span& other) noexcept = default;
68	template <class OtherElementType, ptrdiff_t OtherExtent>	69	template <class OtherElementType, size_t OtherExtent>
69	constexpr span(const span<OtherElementType, OtherExtent>& s) noexcept;	70	constexpr span(const span<OtherElementType, OtherExtent>& s) noexcept;
70	~span() noexcept = default;	71	~span() noexcept = default;
71	constexpr span& operator=(const span& other) noexcept = default;	72	constexpr span& operator=(const span& other) noexcept = default;
72		73
73	// [span.sub], span subviews	74	// [span.sub], span subviews
74	template <ptrdiff_t Count>	75	template <size_t Count>
75	constexpr span<element_type, Count> first() const;	76	constexpr span<element_type, Count> first() const;
76	template <ptrdiff_t Count>	77	template <size_t Count>
77	constexpr span<element_type, Count> last() const;	78	constexpr span<element_type, Count> last() const;
78	template <ptrdiff_t Offset, ptrdiff_t Count = dynamic_extent>	79	template <size_t Offset, size_t Count = dynamic_extent>
79	constexpr span<element_type, see below> subspan() const;	80	constexpr span<element_type, see below> subspan() const;
80		81
81	constexpr span<element_type, dynamic_extent> first(index_type count) const;	82	constexpr span<element_type, dynamic_extent> first(index_type count) const;
...	@@ -89,7 +90,8 @@ public:	...	@@ -89,7 +90,8 @@ public:
89		90
90	// [span.elem], span element access	91	// [span.elem], span element access
91	constexpr reference operator[](index_type idx) const;	92	constexpr reference operator[](index_type idx) const;
92	constexpr reference operator()(index_type idx) const;	93	constexpr reference front() const;
		94	constexpr reference back() const;
93	constexpr pointer data() const noexcept;	95	constexpr pointer data() const noexcept;
94		96
95	// [span.iterators], span iterator support	97	// [span.iterators], span iterator support
...	@@ -141,14 +143,14 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -141,14 +143,14 @@ _LIBCPP_BEGIN_NAMESPACE_STD
141		143
142	#if _LIBCPP_STD_VER > 17	144	#if _LIBCPP_STD_VER > 17
143		145
144	inline constexpr ptrdiff_t dynamic_extent = -1;	146	inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max();
145	template <typename _Tp, ptrdiff_t _Extent = dynamic_extent> class span;	147	template <typename _Tp, size_t _Extent = dynamic_extent> class span;
146		148
147		149
148	template <class _Tp>	150	template <class _Tp>
149	struct __is_span_impl : public false_type {};	151	struct __is_span_impl : public false_type {};
150		152
151	template <class _Tp, ptrdiff_t _Extent>	153	template <class _Tp, size_t _Extent>
152	struct __is_span_impl<span<_Tp, _Extent>> : public true_type {};	154	struct __is_span_impl<span<_Tp, _Extent>> : public true_type {};
153		155
154	template <class _Tp>	156	template <class _Tp>
...	@@ -187,25 +189,24 @@ struct __is_span_compatible_container<_Tp, _ElementType,	...	@@ -187,25 +189,24 @@ struct __is_span_compatible_container<_Tp, _ElementType,
187	: public true_type {};	189	: public true_type {};
188		190
189		191
190	template <typename _Tp, ptrdiff_t _Extent>	192	template <typename _Tp, size_t _Extent>
191	class _LIBCPP_TEMPLATE_VIS span {	193	class _LIBCPP_TEMPLATE_VIS span {
192	public:	194	public:
193	// constants and types	195	// constants and types
194	using element_type = _Tp;	196	using element_type = _Tp;
195	using value_type = remove_cv_t<_Tp>;	197	using value_type = remove_cv_t<_Tp>;
196	using index_type = ptrdiff_t;	198	using index_type = size_t;
197	using difference_type = ptrdiff_t;	199	using difference_type = ptrdiff_t;
198	using pointer = _Tp *;	200	using pointer = _Tp *;
199	using const_pointer = const _Tp *; // not in standard	201	using const_pointer = const _Tp *;
200	using reference = _Tp &;	202	using reference = _Tp &;
201	using const_reference = const _Tp &; // not in standard	203	using const_reference = const _Tp &;
202	using iterator = __wrap_iter<pointer>;	204	using iterator = __wrap_iter<pointer>;
203	using const_iterator = __wrap_iter<const_pointer>;	205	using const_iterator = __wrap_iter<const_pointer>;
204	using reverse_iterator = _VSTD::reverse_iterator<iterator>;	206	using reverse_iterator = _VSTD::reverse_iterator<iterator>;
205	using const_reverse_iterator = _VSTD::reverse_iterator<const_iterator>;	207	using const_reverse_iterator = _VSTD::reverse_iterator<const_iterator>;
206		208
207	static constexpr index_type extent = _Extent;	209	static constexpr index_type extent = _Extent;
208	static_assert (_Extent >= 0, "Can't have a span with an extent < 0");
209		210
210	// [span.cons], span constructors, copy, assignment, and destructor	211	// [span.cons], span constructors, copy, assignment, and destructor
211	_LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data{nullptr}	212	_LIBCPP_INLINE_VISIBILITY constexpr span() noexcept : __data{nullptr}
...	@@ -223,22 +224,8 @@ public:	...	@@ -223,22 +224,8 @@ public:
223	_LIBCPP_INLINE_VISIBILITY constexpr span( array<value_type, _Extent>& __arr) noexcept : __data{__arr.data()} {}	224	_LIBCPP_INLINE_VISIBILITY constexpr span( array<value_type, _Extent>& __arr) noexcept : __data{__arr.data()} {}
224	_LIBCPP_INLINE_VISIBILITY constexpr span(const array<value_type, _Extent>& __arr) noexcept : __data{__arr.data()} {}	225	_LIBCPP_INLINE_VISIBILITY constexpr span(const array<value_type, _Extent>& __arr) noexcept : __data{__arr.data()} {}
225		226
226	template <class _Container>
227	inline _LIBCPP_INLINE_VISIBILITY
228	constexpr span( _Container& __c,
229	enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, nullptr_t> = nullptr)
230	: __data{_VSTD::data(__c)}
231	{ _LIBCPP_ASSERT(_Extent == _VSTD::size(__c), "size mismatch in span's constructor (container)"); }
232
233	template <class _Container>
234	inline _LIBCPP_INLINE_VISIBILITY
235	constexpr span(const _Container& __c,
236	enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, nullptr_t> = nullptr)
237	: __data{_VSTD::data(__c)}
238	{ _LIBCPP_ASSERT(_Extent == _VSTD::size(__c), "size mismatch in span's constructor (const container)"); }
239
240	template <class _OtherElementType>	227	template <class _OtherElementType>
241	inline _LIBCPP_INLINE_VISIBILITY	228	_LIBCPP_INLINE_VISIBILITY
242	constexpr span(const span<_OtherElementType, _Extent>& __other,	229	constexpr span(const span<_OtherElementType, _Extent>& __other,
243	enable_if_t<	230	enable_if_t<
244	is_convertible_v<_OtherElementType()[], element_type ()[]>,	231	is_convertible_v<_OtherElementType()[], element_type ()[]>,
...	@@ -246,7 +233,7 @@ public:	...	@@ -246,7 +233,7 @@ public:
246	: __data{__other.data()} {}	233	: __data{__other.data()} {}
247		234
248	template <class _OtherElementType>	235	template <class _OtherElementType>
249	inline _LIBCPP_INLINE_VISIBILITY	236	_LIBCPP_INLINE_VISIBILITY
250	constexpr span(const span<_OtherElementType, dynamic_extent>& __other,	237	constexpr span(const span<_OtherElementType, dynamic_extent>& __other,
251	enable_if_t<	238	enable_if_t<
252	is_convertible_v<_OtherElementType()[], element_type ()[]>,	239	is_convertible_v<_OtherElementType()[], element_type ()[]>,
...	@@ -256,20 +243,18 @@ public:	...	@@ -256,20 +243,18 @@ public:
256		243
257	// ~span() noexcept = default;	244	// ~span() noexcept = default;
258		245
259	template <ptrdiff_t _Count>	246	template <size_t _Count>
260	inline _LIBCPP_INLINE_VISIBILITY	247	_LIBCPP_INLINE_VISIBILITY
261	constexpr span<element_type, _Count> first() const noexcept	248	constexpr span<element_type, _Count> first() const noexcept
262	{	249	{
263	static_assert(_Count >= 0, "Count must be >= 0 in span::first()");
264	static_assert(_Count <= _Extent, "Count out of range in span::first()");	250	static_assert(_Count <= _Extent, "Count out of range in span::first()");
265	return {data(), _Count};	251	return {data(), _Count};
266	}	252	}
267		253
268	template <ptrdiff_t _Count>	254	template <size_t _Count>
269	inline _LIBCPP_INLINE_VISIBILITY	255	_LIBCPP_INLINE_VISIBILITY
270	constexpr span<element_type, _Count> last() const noexcept	256	constexpr span<element_type, _Count> last() const noexcept
271	{	257	{
272	static_assert(_Count >= 0, "Count must be >= 0 in span::last()");
273	static_assert(_Count <= _Extent, "Count out of range in span::last()");	258	static_assert(_Count <= _Extent, "Count out of range in span::last()");
274	return {data() + size() - _Count, _Count};	259	return {data() + size() - _Count, _Count};
275	}	260	}
...	@@ -277,36 +262,36 @@ public:	...	@@ -277,36 +262,36 @@ public:
277	_LIBCPP_INLINE_VISIBILITY	262	_LIBCPP_INLINE_VISIBILITY
278	constexpr span<element_type, dynamic_extent> first(index_type __count) const noexcept	263	constexpr span<element_type, dynamic_extent> first(index_type __count) const noexcept
279	{	264	{
280	_LIBCPP_ASSERT(__count >= 0 && __count <= size(), "Count out of range in span::first(count)");	265	_LIBCPP_ASSERT(__count <= size(), "Count out of range in span::first(count)");
281	return {data(), __count};	266	return {data(), __count};
282	}	267	}
283		268
284	_LIBCPP_INLINE_VISIBILITY	269	_LIBCPP_INLINE_VISIBILITY
285	constexpr span<element_type, dynamic_extent> last(index_type __count) const noexcept	270	constexpr span<element_type, dynamic_extent> last(index_type __count) const noexcept
286	{	271	{
287	_LIBCPP_ASSERT(__count >= 0 && __count <= size(), "Count out of range in span::last(count)");	272	_LIBCPP_ASSERT(__count <= size(), "Count out of range in span::last(count)");
288	return {data() + size() - __count, __count};	273	return {data() + size() - __count, __count};
289	}	274	}
290		275
291	template <ptrdiff_t _Offset, ptrdiff_t _Count = dynamic_extent>	276	template <size_t _Offset, size_t _Count = dynamic_extent>
292	inline _LIBCPP_INLINE_VISIBILITY	277	_LIBCPP_INLINE_VISIBILITY
293	constexpr auto subspan() const noexcept	278	constexpr auto subspan() const noexcept
294	-> span<element_type, _Count != dynamic_extent ? _Count : _Extent - _Offset>	279	-> span<element_type, _Count != dynamic_extent ? _Count : _Extent - _Offset>
295	{	280	{
296	_LIBCPP_ASSERT(_Offset >= 0 && _Offset <= size(), "Offset out of range in span::subspan()");	281	static_assert(_Offset <= _Extent, "Offset out of range in span::subspan()");
297	return {data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count};	282	return {data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count};
298	}	283	}
299		284
300		285
301	inline _LIBCPP_INLINE_VISIBILITY	286	_LIBCPP_INLINE_VISIBILITY
302	constexpr span<element_type, dynamic_extent>	287	constexpr span<element_type, dynamic_extent>
303	subspan(index_type __offset, index_type __count = dynamic_extent) const noexcept	288	subspan(index_type __offset, index_type __count = dynamic_extent) const noexcept
304	{	289	{
305	_LIBCPP_ASSERT( __offset >= 0 && __offset <= size(), "Offset out of range in span::subspan(offset, count)");	290	_LIBCPP_ASSERT(__offset <= size(), "Offset out of range in span::subspan(offset, count)");
306	_LIBCPP_ASSERT((__count >= 0 && __count <= size()) \|\| __count == dynamic_extent, "Count out of range in span::subspan(offset, count)");	291	_LIBCPP_ASSERT(__count <= size() \|\| __count == dynamic_extent, "Count out of range in span::subspan(offset, count)");
307	if (__count == dynamic_extent)	292	if (__count == dynamic_extent)
308	return {data() + __offset, size() - __offset};	293	return {data() + __offset, size() - __offset};
309	_LIBCPP_ASSERT(__offset + __count <= size(), "count + offset out of range in span::subspan(offset, count)");	294	_LIBCPP_ASSERT(__offset <= size() - __count, "count + offset out of range in span::subspan(offset, count)");
310	return {data() + __offset, __count};	295	return {data() + __offset, __count};
311	}	296	}
312		297
...	@@ -320,10 +305,16 @@ public:	...	@@ -320,10 +305,16 @@ public:
320	return __data[__idx];	305	return __data[__idx];
321	}	306	}
322		307
323	_LIBCPP_INLINE_VISIBILITY constexpr reference operator()(index_type __idx) const noexcept	308	_LIBCPP_INLINE_VISIBILITY constexpr reference front() const noexcept
324	{	309	{
325	_LIBCPP_ASSERT(__idx >= 0 && __idx < size(), "span<T,N>() index out of bounds");	310	static_assert(_Extent > 0, "span<T,N>[].front() on empty span");
326	return __data[__idx];	311	return __data[0];
		312	}
		313
		314	_LIBCPP_INLINE_VISIBILITY constexpr reference back() const noexcept
		315	{
		316	static_assert(_Extent > 0, "span<T,N>[].back() on empty span");
		317	return __data[size()-1];
327	}	318	}
328		319
329	_LIBCPP_INLINE_VISIBILITY constexpr pointer data() const noexcept { return __data; }	320	_LIBCPP_INLINE_VISIBILITY constexpr pointer data() const noexcept { return __data; }
...	@@ -348,7 +339,7 @@ public:	...	@@ -348,7 +339,7 @@ public:
348	_LIBCPP_INLINE_VISIBILITY span<const byte, _Extent * sizeof(element_type)> __as_bytes() const noexcept	339	_LIBCPP_INLINE_VISIBILITY span<const byte, _Extent * sizeof(element_type)> __as_bytes() const noexcept
349	{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; }	340	{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; }
350		341
351	_LIBCPP_INLINE_VISIBILITY span<byte, _Extent * sizeof(element_type)> __as_writeable_bytes() const noexcept	342	_LIBCPP_INLINE_VISIBILITY span<byte, _Extent * sizeof(element_type)> __as_writable_bytes() const noexcept
352	{ return {reinterpret_cast<byte *>(data()), size_bytes()}; }	343	{ return {reinterpret_cast<byte *>(data()), size_bytes()}; }
353		344
354	private:	345	private:
...	@@ -365,12 +356,12 @@ public:	...	@@ -365,12 +356,12 @@ public:
365	// constants and types	356	// constants and types
366	using element_type = _Tp;	357	using element_type = _Tp;
367	using value_type = remove_cv_t<_Tp>;	358	using value_type = remove_cv_t<_Tp>;
368	using index_type = ptrdiff_t;	359	using index_type = size_t;
369	using difference_type = ptrdiff_t;	360	using difference_type = ptrdiff_t;
370	using pointer = _Tp *;	361	using pointer = _Tp *;
371	using const_pointer = const _Tp *; // not in standard	362	using const_pointer = const _Tp *;
372	using reference = _Tp &;	363	using reference = _Tp &;
373	using const_reference = const _Tp &; // not in standard	364	using const_reference = const _Tp &;
374	using iterator = __wrap_iter<pointer>;	365	using iterator = __wrap_iter<pointer>;
375	using const_iterator = __wrap_iter<const_pointer>;	366	using const_iterator = __wrap_iter<const_pointer>;
376	using reverse_iterator = _VSTD::reverse_iterator<iterator>;	367	using reverse_iterator = _VSTD::reverse_iterator<iterator>;
...	@@ -385,35 +376,35 @@ public:	...	@@ -385,35 +376,35 @@ public:
385	constexpr span& operator=(const span&) noexcept = default;	376	constexpr span& operator=(const span&) noexcept = default;
386		377
387	_LIBCPP_INLINE_VISIBILITY constexpr span(pointer __ptr, index_type __count) : __data{__ptr}, __size{__count} {}	378	_LIBCPP_INLINE_VISIBILITY constexpr span(pointer __ptr, index_type __count) : __data{__ptr}, __size{__count} {}
388	_LIBCPP_INLINE_VISIBILITY constexpr span(pointer __f, pointer __l) : __data{__f}, __size{distance(__f, __l)} {}	379	_LIBCPP_INLINE_VISIBILITY constexpr span(pointer __f, pointer __l) : __data{__f}, __size{static_cast<size_t>(distance(__f, __l))} {}
389		380
390	template <size_t _Sz>	381	template <size_t _Sz>
391	inline _LIBCPP_INLINE_VISIBILITY	382	_LIBCPP_INLINE_VISIBILITY
392	constexpr span(element_type (&__arr)[_Sz]) noexcept : __data{__arr}, __size{_Sz} {}	383	constexpr span(element_type (&__arr)[_Sz]) noexcept : __data{__arr}, __size{_Sz} {}
393		384
394	template <size_t _Sz>	385	template <size_t _Sz>
395	inline _LIBCPP_INLINE_VISIBILITY	386	_LIBCPP_INLINE_VISIBILITY
396	constexpr span(array<value_type, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}	387	constexpr span(array<value_type, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
397		388
398	template <size_t _Sz>	389	template <size_t _Sz>
399	inline _LIBCPP_INLINE_VISIBILITY	390	_LIBCPP_INLINE_VISIBILITY
400	constexpr span(const array<value_type, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}	391	constexpr span(const array<value_type, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
401		392
402	template <class _Container>	393	template <class _Container>
403	inline _LIBCPP_INLINE_VISIBILITY	394	_LIBCPP_INLINE_VISIBILITY
404	constexpr span( _Container& __c,	395	constexpr span( _Container& __c,
405	enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, nullptr_t> = nullptr)	396	enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, nullptr_t> = nullptr)
406	: __data{_VSTD::data(__c)}, __size{(index_type) _VSTD::size(__c)} {}	397	: __data{_VSTD::data(__c)}, __size{(index_type) _VSTD::size(__c)} {}
407		398
408	template <class _Container>	399	template <class _Container>
409	inline _LIBCPP_INLINE_VISIBILITY	400	_LIBCPP_INLINE_VISIBILITY
410	constexpr span(const _Container& __c,	401	constexpr span(const _Container& __c,
411	enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, nullptr_t> = nullptr)	402	enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, nullptr_t> = nullptr)
412	: __data{_VSTD::data(__c)}, __size{(index_type) _VSTD::size(__c)} {}	403	: __data{_VSTD::data(__c)}, __size{(index_type) _VSTD::size(__c)} {}
413		404
414		405
415	template <class _OtherElementType, ptrdiff_t _OtherExtent>	406	template <class _OtherElementType, size_t _OtherExtent>
416	inline _LIBCPP_INLINE_VISIBILITY	407	_LIBCPP_INLINE_VISIBILITY
417	constexpr span(const span<_OtherElementType, _OtherExtent>& __other,	408	constexpr span(const span<_OtherElementType, _OtherExtent>& __other,
418	enable_if_t<	409	enable_if_t<
419	is_convertible_v<_OtherElementType()[], element_type ()[]>,	410	is_convertible_v<_OtherElementType()[], element_type ()[]>,
...	@@ -422,20 +413,18 @@ public:	...	@@ -422,20 +413,18 @@ public:
422		413
423	// ~span() noexcept = default;	414	// ~span() noexcept = default;
424		415
425	template <ptrdiff_t _Count>	416	template <size_t _Count>
426	inline _LIBCPP_INLINE_VISIBILITY	417	_LIBCPP_INLINE_VISIBILITY
427	constexpr span<element_type, _Count> first() const noexcept	418	constexpr span<element_type, _Count> first() const noexcept
428	{	419	{
429	static_assert(_Count >= 0, "Count must be >= 0 in span::first()");
430	_LIBCPP_ASSERT(_Count <= size(), "Count out of range in span::first()");	420	_LIBCPP_ASSERT(_Count <= size(), "Count out of range in span::first()");
431	return {data(), _Count};	421	return {data(), _Count};
432	}	422	}
433		423
434	template <ptrdiff_t _Count>	424	template <size_t _Count>
435	inline _LIBCPP_INLINE_VISIBILITY	425	_LIBCPP_INLINE_VISIBILITY
436	constexpr span<element_type, _Count> last() const noexcept	426	constexpr span<element_type, _Count> last() const noexcept
437	{	427	{
438	static_assert(_Count >= 0, "Count must be >= 0 in span::last()");
439	_LIBCPP_ASSERT(_Count <= size(), "Count out of range in span::last()");	428	_LIBCPP_ASSERT(_Count <= size(), "Count out of range in span::last()");
440	return {data() + size() - _Count, _Count};	429	return {data() + size() - _Count, _Count};
441	}	430	}
...	@@ -443,35 +432,35 @@ public:	...	@@ -443,35 +432,35 @@ public:
443	_LIBCPP_INLINE_VISIBILITY	432	_LIBCPP_INLINE_VISIBILITY
444	constexpr span<element_type, dynamic_extent> first(index_type __count) const noexcept	433	constexpr span<element_type, dynamic_extent> first(index_type __count) const noexcept
445	{	434	{
446	_LIBCPP_ASSERT(__count >= 0 && __count <= size(), "Count out of range in span::first(count)");	435	_LIBCPP_ASSERT(__count <= size(), "Count out of range in span::first(count)");
447	return {data(), __count};	436	return {data(), __count};
448	}	437	}
449		438
450	_LIBCPP_INLINE_VISIBILITY	439	_LIBCPP_INLINE_VISIBILITY
451	constexpr span<element_type, dynamic_extent> last (index_type __count) const noexcept	440	constexpr span<element_type, dynamic_extent> last (index_type __count) const noexcept
452	{	441	{
453	_LIBCPP_ASSERT(__count >= 0 && __count <= size(), "Count out of range in span::last(count)");	442	_LIBCPP_ASSERT(__count <= size(), "Count out of range in span::last(count)");
454	return {data() + size() - __count, __count};	443	return {data() + size() - __count, __count};
455	}	444	}
456		445
457	template <ptrdiff_t _Offset, ptrdiff_t _Count = dynamic_extent>	446	template <size_t _Offset, size_t _Count = dynamic_extent>
458	inline _LIBCPP_INLINE_VISIBILITY	447	_LIBCPP_INLINE_VISIBILITY
459	constexpr span<_Tp, dynamic_extent> subspan() const noexcept	448	constexpr span<_Tp, dynamic_extent> subspan() const noexcept
460	{	449	{
461	_LIBCPP_ASSERT(_Offset >= 0 && _Offset <= size(), "Offset out of range in span::subspan()");	450	_LIBCPP_ASSERT(_Offset <= size(), "Offset out of range in span::subspan()");
462	_LIBCPP_ASSERT(_Count == dynamic_extent \|\| _Offset + _Count <= size(), "Count out of range in span::subspan()");	451	_LIBCPP_ASSERT(_Count == dynamic_extent \|\| _Offset + _Count <= size(), "Count out of range in span::subspan()");
463	return {data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count};	452	return {data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count};
464	}	453	}
465		454
466	constexpr span<element_type, dynamic_extent>	455	constexpr span<element_type, dynamic_extent>
467	inline _LIBCPP_INLINE_VISIBILITY	456	_LIBCPP_INLINE_VISIBILITY
468	subspan(index_type __offset, index_type __count = dynamic_extent) const noexcept	457	subspan(index_type __offset, index_type __count = dynamic_extent) const noexcept
469	{	458	{
470	_LIBCPP_ASSERT( __offset >= 0 && __offset <= size(), "Offset out of range in span::subspan(offset, count)");	459	_LIBCPP_ASSERT(__offset <= size(), "Offset out of range in span::subspan(offset, count)");
471	_LIBCPP_ASSERT((__count >= 0 && __count <= size()) \|\| __count == dynamic_extent, "count out of range in span::subspan(offset, count)");	460	_LIBCPP_ASSERT(__count <= size() \|\| __count == dynamic_extent, "count out of range in span::subspan(offset, count)");
472	if (__count == dynamic_extent)	461	if (__count == dynamic_extent)
473	return {data() + __offset, size() - __offset};	462	return {data() + __offset, size() - __offset};
474	_LIBCPP_ASSERT(__offset + __count <= size(), "Offset + count out of range in span::subspan(offset, count)");	463	_LIBCPP_ASSERT(__offset <= size() - __count, "Offset + count out of range in span::subspan(offset, count)");
475	return {data() + __offset, __count};	464	return {data() + __offset, __count};
476	}	465	}
477		466
...	@@ -485,12 +474,19 @@ public:	...	@@ -485,12 +474,19 @@ public:
485	return __data[__idx];	474	return __data[__idx];
486	}	475	}
487		476
488	_LIBCPP_INLINE_VISIBILITY constexpr reference operator()(index_type __idx) const noexcept	477	_LIBCPP_INLINE_VISIBILITY constexpr reference front() const noexcept
489	{	478	{
490	_LIBCPP_ASSERT(__idx >= 0 && __idx < size(), "span<T>() index out of bounds");	479	_LIBCPP_ASSERT(!empty(), "span<T>[].front() on empty span");
491	return __data[__idx];	480	return __data[0];
492	}	481	}
493		482
		483	_LIBCPP_INLINE_VISIBILITY constexpr reference back() const noexcept
		484	{
		485	_LIBCPP_ASSERT(!empty(), "span<T>[].back() on empty span");
		486	return __data[size()-1];
		487	}
		488
		489
494	_LIBCPP_INLINE_VISIBILITY constexpr pointer data() const noexcept { return __data; }	490	_LIBCPP_INLINE_VISIBILITY constexpr pointer data() const noexcept { return __data; }
495		491
496	// [span.iter], span iterator support	492	// [span.iter], span iterator support
...	@@ -517,7 +513,7 @@ public:	...	@@ -517,7 +513,7 @@ public:
517	_LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> __as_bytes() const noexcept	513	_LIBCPP_INLINE_VISIBILITY span<const byte, dynamic_extent> __as_bytes() const noexcept
518	{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; }	514	{ return {reinterpret_cast<const byte *>(data()), size_bytes()}; }
519		515
520	_LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> __as_writeable_bytes() const noexcept	516	_LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> __as_writable_bytes() const noexcept
521	{ return {reinterpret_cast<byte *>(data()), size_bytes()}; }	517	{ return {reinterpret_cast<byte *>(data()), size_bytes()}; }
522		518
523	private:	519	private:
...	@@ -525,20 +521,51 @@ private:	...	@@ -525,20 +521,51 @@ private:
525	index_type __size;	521	index_type __size;
526	};	522	};
527		523
528	// as_bytes & as_writeable_bytes	524	// tuple interface
529	template <class _Tp, ptrdiff_t _Extent>	525	template <class _Tp, size_t _Size>
530	auto as_bytes(span<_Tp, _Extent> __s) noexcept	526	struct _LIBCPP_TEMPLATE_VIS tuple_size<span<_Tp, _Size>>
531	-> decltype(__s.__as_bytes())	527	: public integral_constant<size_t, _Size> {};
532	{ return __s.__as_bytes(); }
533		528
534	template <class _Tp, ptrdiff_t _Extent>	529	template <class _Tp>
535	auto as_writeable_bytes(span<_Tp, _Extent> __s) noexcept	530	struct _LIBCPP_TEMPLATE_VIS tuple_size<span<_Tp, dynamic_extent>>; // declared but not defined
536	-> typename enable_if<!is_const_v<_Tp>, decltype(__s.__as_writeable_bytes())>::type	531
537	{ return __s.__as_writeable_bytes(); }	532
		533	template <size_t _Ip, class _Tp, size_t _Size>
		534	struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, span<_Tp, _Size>>
		535	{
		536	static_assert( dynamic_extent != _Size, "std::tuple_element<> not supported for std::span<T, dynamic_extent>");
		537	static_assert(_Ip < _Size, "Index out of bounds in std::tuple_element<> (std::span)");
		538	typedef _Tp type;
		539	};
538		540
539	template <class _Tp, ptrdiff_t _Extent>	541	template <size_t _Ip, class _Tp, size_t _Size>
540	constexpr void swap(span<_Tp, _Extent> &__lhs, span<_Tp, _Extent> &__rhs) noexcept	542	_LIBCPP_INLINE_VISIBILITY constexpr
541	{ __lhs.swap(__rhs); }	543	_Tp&
		544	get(span<_Tp, _Size> __s) noexcept
		545	{
		546	static_assert( dynamic_extent != _Size, "std::get<> not supported for std::span<T, dynamic_extent>");
		547	static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::span)");
		548	return __s[_Ip];
		549	}
		550
		551
		552	// as_bytes & as_writable_bytes
		553	template <class _Tp, size_t _Extent>
		554	_LIBCPP_INLINE_VISIBILITY
		555	auto as_bytes(span<_Tp, _Extent> __s) noexcept
		556	-> decltype(__s.__as_bytes())
		557	{ return __s.__as_bytes(); }
		558
		559	template <class _Tp, size_t _Extent>
		560	_LIBCPP_INLINE_VISIBILITY
		561	auto as_writable_bytes(span<_Tp, _Extent> __s) noexcept
		562	-> enable_if_t<!is_const_v<_Tp>, decltype(__s.__as_writable_bytes())>
		563	{ return __s.__as_writable_bytes(); }
		564
		565	template <class _Tp, size_t _Extent>
		566	_LIBCPP_INLINE_VISIBILITY
		567	constexpr void swap(span<_Tp, _Extent> &__lhs, span<_Tp, _Extent> &__rhs) noexcept
		568	{ __lhs.swap(__rhs); }
542		569
543		570
544	// Deduction guides	571	// Deduction guides

lib/libcxx/include/sstream+4-5

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- sstream ----------------------------------===//	2	//===--------------------------- sstream ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -559,7 +558,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c)	...	@@ -559,7 +558,7 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c)
559	char_type* __p = const_cast<char_type*>(__str_.data());	558	char_type* __p = const_cast<char_type*>(__str_.data());
560	this->setg(__p, __p + __ninp, __hm_);	559	this->setg(__p, __p + __ninp, __hm_);
561	}	560	}
562	return this->sputc(__c);	561	return this->sputc(traits_type::to_char_type(__c));
563	}	562	}
564	return traits_type::not_eof(__c);	563	return traits_type::not_eof(__c);
565	}	564	}

lib/libcxx/include/stack+8-9

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===---------------------------- stack -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -63,8 +62,8 @@ public:
 template<class Container>
   stack(Container) -> stack<typename Container::value_type, Container>;  // C++17
 template<class Container, class Allocator>
   stack(Container, Allocator) -> stack<typename Container::value_type, Container>; // C++17
 template <class T, class Container>
 @@ -119,7 +118,7 @@ public:
     typedef typename container_type::const_reference const_reference;
     typedef typename container_type::size_type       size_type;
     static_assert((is_same<_Tp, value_type>::value), "" );
 protected:
     container_type c;
 @@ -241,12 +240,12 @@ template<class _Container,
 >
 stack(_Container)
     -> stack<typename _Container::value_type, _Container>;
 template<class _Container,
          class _Alloc,
          class = typename enable_if<!__is_allocator<_Container>::value, nullptr_t>::type,
          class = typename enable_if< __is_allocator<_Alloc>::value, nullptr_t>::type
          >
 stack(_Container, _Alloc)
     -> stack<typename _Container::value_type, _Container>;
 #endif

lib/libcxx/include/stdbool.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- stdbool.h --------------------------------===//	2	//===--------------------------- stdbool.h --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	#ifndef _LIBCPP_STDBOOL_H	9	#ifndef _LIBCPP_STDBOOL_H

lib/libcxx/include/stddef.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- stddef.h ---------------------------------===//	2	//===--------------------------- stddef.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/stdexcept+31-5

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- stdexcept --------------------------------===//	2	//===--------------------------- stdexcept --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -55,6 +54,7 @@ public:	...	@@ -55,6 +54,7 @@ public:
55		54
56	_LIBCPP_BEGIN_NAMESPACE_STD	55	_LIBCPP_BEGIN_NAMESPACE_STD
57		56
		57	#ifndef _LIBCPP_ABI_VCRUNTIME
58	class _LIBCPP_HIDDEN __libcpp_refstring	58	class _LIBCPP_HIDDEN __libcpp_refstring
59	{	59	{
60	const char* __imp_;	60	const char* __imp_;
...	@@ -68,6 +68,7 @@ public:	...	@@ -68,6 +68,7 @@ public:
68		68
69	const char* c_str() const _NOEXCEPT {return __imp_;}	69	const char* c_str() const _NOEXCEPT {return __imp_;}
70	};	70	};
		71	#endif // !_LIBCPP_ABI_VCRUNTIME
71		72
72	_LIBCPP_END_NAMESPACE_STD	73	_LIBCPP_END_NAMESPACE_STD
73		74
...	@@ -77,6 +78,7 @@ namespace std // purposefully not using versioning namespace	...	@@ -77,6 +78,7 @@ namespace std // purposefully not using versioning namespace
77	class _LIBCPP_EXCEPTION_ABI logic_error	78	class _LIBCPP_EXCEPTION_ABI logic_error
78	: public exception	79	: public exception
79	{	80	{
		81	#ifndef _LIBCPP_ABI_VCRUNTIME
80	private:	82	private:
81	_VSTD::__libcpp_refstring __imp_;	83	_VSTD::__libcpp_refstring __imp_;
82	public:	84	public:
...	@@ -89,11 +91,17 @@ public:	...	@@ -89,11 +91,17 @@ public:
89	virtual ~logic_error() _NOEXCEPT;	91	virtual ~logic_error() _NOEXCEPT;
90		92
91	virtual const char* what() const _NOEXCEPT;	93	virtual const char* what() const _NOEXCEPT;
		94	#else
		95	public:
		96	explicit logic_error(const _VSTD::string&); // Symbol uses versioned std::string
		97	_LIBCPP_INLINE_VISIBILITY explicit logic_error(const char* __s) : exception(__s) {}
		98	#endif
92	};	99	};
93		100
94	class _LIBCPP_EXCEPTION_ABI runtime_error	101	class _LIBCPP_EXCEPTION_ABI runtime_error
95	: public exception	102	: public exception
96	{	103	{
		104	#ifndef _LIBCPP_ABI_VCRUNTIME
97	private:	105	private:
98	_VSTD::__libcpp_refstring __imp_;	106	_VSTD::__libcpp_refstring __imp_;
99	public:	107	public:
...	@@ -106,6 +114,11 @@ public:	...	@@ -106,6 +114,11 @@ public:
106	virtual ~runtime_error() _NOEXCEPT;	114	virtual ~runtime_error() _NOEXCEPT;
107		115
108	virtual const char* what() const _NOEXCEPT;	116	virtual const char* what() const _NOEXCEPT;
		117	#else
		118	public:
		119	explicit runtime_error(const _VSTD::string&); // Symbol uses versioned std::string
		120	_LIBCPP_INLINE_VISIBILITY explicit runtime_error(const char* __s) : exception(__s) {}
		121	#endif // _LIBCPP_ABI_VCRUNTIME
109	};	122	};
110		123
111	class _LIBCPP_EXCEPTION_ABI domain_error	124	class _LIBCPP_EXCEPTION_ABI domain_error
...	@@ -115,7 +128,9 @@ public:	...	@@ -115,7 +128,9 @@ public:
115	_LIBCPP_INLINE_VISIBILITY explicit domain_error(const string& __s) : logic_error(__s) {}	128	_LIBCPP_INLINE_VISIBILITY explicit domain_error(const string& __s) : logic_error(__s) {}
116	_LIBCPP_INLINE_VISIBILITY explicit domain_error(const char* __s) : logic_error(__s) {}	129	_LIBCPP_INLINE_VISIBILITY explicit domain_error(const char* __s) : logic_error(__s) {}
117		130
		131	#ifndef _LIBCPP_ABI_VCRUNTIME
118	virtual ~domain_error() _NOEXCEPT;	132	virtual ~domain_error() _NOEXCEPT;
		133	#endif
119	};	134	};
120		135
121	class _LIBCPP_EXCEPTION_ABI invalid_argument	136	class _LIBCPP_EXCEPTION_ABI invalid_argument
...	@@ -125,7 +140,9 @@ public:	...	@@ -125,7 +140,9 @@ public:
125	_LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const string& __s) : logic_error(__s) {}	140	_LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const string& __s) : logic_error(__s) {}
126	_LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const char* __s) : logic_error(__s) {}	141	_LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const char* __s) : logic_error(__s) {}
127		142
		143	#ifndef _LIBCPP_ABI_VCRUNTIME
128	virtual ~invalid_argument() _NOEXCEPT;	144	virtual ~invalid_argument() _NOEXCEPT;
		145	#endif
129	};	146	};
130		147
131	class _LIBCPP_EXCEPTION_ABI length_error	148	class _LIBCPP_EXCEPTION_ABI length_error
...	@@ -134,8 +151,9 @@ class _LIBCPP_EXCEPTION_ABI length_error	...	@@ -134,8 +151,9 @@ class _LIBCPP_EXCEPTION_ABI length_error
134	public:	151	public:
135	_LIBCPP_INLINE_VISIBILITY explicit length_error(const string& __s) : logic_error(__s) {}	152	_LIBCPP_INLINE_VISIBILITY explicit length_error(const string& __s) : logic_error(__s) {}
136	_LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s) : logic_error(__s) {}	153	_LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s) : logic_error(__s) {}
137		154	#ifndef _LIBCPP_ABI_VCRUNTIME
138	virtual ~length_error() _NOEXCEPT;	155	virtual ~length_error() _NOEXCEPT;
		156	#endif
139	};	157	};
140		158
141	class _LIBCPP_EXCEPTION_ABI out_of_range	159	class _LIBCPP_EXCEPTION_ABI out_of_range
...	@@ -145,7 +163,9 @@ public:	...	@@ -145,7 +163,9 @@ public:
145	_LIBCPP_INLINE_VISIBILITY explicit out_of_range(const string& __s) : logic_error(__s) {}	163	_LIBCPP_INLINE_VISIBILITY explicit out_of_range(const string& __s) : logic_error(__s) {}
146	_LIBCPP_INLINE_VISIBILITY explicit out_of_range(const char* __s) : logic_error(__s) {}	164	_LIBCPP_INLINE_VISIBILITY explicit out_of_range(const char* __s) : logic_error(__s) {}
147		165
		166	#ifndef _LIBCPP_ABI_VCRUNTIME
148	virtual ~out_of_range() _NOEXCEPT;	167	virtual ~out_of_range() _NOEXCEPT;
		168	#endif
149	};	169	};
150		170
151	class _LIBCPP_EXCEPTION_ABI range_error	171	class _LIBCPP_EXCEPTION_ABI range_error
...	@@ -155,7 +175,9 @@ public:	...	@@ -155,7 +175,9 @@ public:
155	_LIBCPP_INLINE_VISIBILITY explicit range_error(const string& __s) : runtime_error(__s) {}	175	_LIBCPP_INLINE_VISIBILITY explicit range_error(const string& __s) : runtime_error(__s) {}
156	_LIBCPP_INLINE_VISIBILITY explicit range_error(const char* __s) : runtime_error(__s) {}	176	_LIBCPP_INLINE_VISIBILITY explicit range_error(const char* __s) : runtime_error(__s) {}
157		177
		178	#ifndef _LIBCPP_ABI_VCRUNTIME
158	virtual ~range_error() _NOEXCEPT;	179	virtual ~range_error() _NOEXCEPT;
		180	#endif
159	};	181	};
160		182
161	class _LIBCPP_EXCEPTION_ABI overflow_error	183	class _LIBCPP_EXCEPTION_ABI overflow_error
...	@@ -165,7 +187,9 @@ public:	...	@@ -165,7 +187,9 @@ public:
165	_LIBCPP_INLINE_VISIBILITY explicit overflow_error(const string& __s) : runtime_error(__s) {}	187	_LIBCPP_INLINE_VISIBILITY explicit overflow_error(const string& __s) : runtime_error(__s) {}
166	_LIBCPP_INLINE_VISIBILITY explicit overflow_error(const char* __s) : runtime_error(__s) {}	188	_LIBCPP_INLINE_VISIBILITY explicit overflow_error(const char* __s) : runtime_error(__s) {}
167		189
		190	#ifndef _LIBCPP_ABI_VCRUNTIME
168	virtual ~overflow_error() _NOEXCEPT;	191	virtual ~overflow_error() _NOEXCEPT;
		192	#endif
169	};	193	};
170		194
171	class _LIBCPP_EXCEPTION_ABI underflow_error	195	class _LIBCPP_EXCEPTION_ABI underflow_error
...	@@ -175,7 +199,9 @@ public:	...	@@ -175,7 +199,9 @@ public:
175	_LIBCPP_INLINE_VISIBILITY explicit underflow_error(const string& __s) : runtime_error(__s) {}	199	_LIBCPP_INLINE_VISIBILITY explicit underflow_error(const string& __s) : runtime_error(__s) {}
176	_LIBCPP_INLINE_VISIBILITY explicit underflow_error(const char* __s) : runtime_error(__s) {}	200	_LIBCPP_INLINE_VISIBILITY explicit underflow_error(const char* __s) : runtime_error(__s) {}
177		201
		202	#ifndef _LIBCPP_ABI_VCRUNTIME
178	virtual ~underflow_error() _NOEXCEPT;	203	virtual ~underflow_error() _NOEXCEPT;
		204	#endif
179	};	205	};
180		206
181	} // std	207	} // std

lib/libcxx/include/stdint.h+8-4

 @@ -1,15 +1,19 @@
 // -*- C++ -*-
 //===---------------------------- stdint.h --------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is distributed under the University of Illinois Open Source
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 #ifndef _LIBCPP_STDINT_H
+// AIX system headers need stdint.h to be re-enterable while _STD_TYPES_T
+// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
+// case the header guard macro is defined.
+#if !defined(_AIX) || !defined(_STD_TYPES_T)
 #define _LIBCPP_STDINT_H
+#endif // _STD_TYPES_T
 /*
     stdint.h synopsis

lib/libcxx/include/stdio.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- stdio.h ---------------------------------===//	2	//===---------------------------- stdio.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/stdlib.h+9-32

...	@@ -1,19 +1,22 @@	...	@@ -1,19 +1,22 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- stdlib.h ---------------------------------===//	2	//===--------------------------- stdlib.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
11	#if defined(__need_malloc_and_calloc)	10	#if defined(__need_malloc_and_calloc) \|\| defined(_LIBCPP_STDLIB_INCLUDE_NEXT)
12		11
13	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	12	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
14	#pragma GCC system_header	13	#pragma GCC system_header
15	#endif	14	#endif
16		15
		16	#if defined(_LIBCPP_STDLIB_INCLUDE_NEXT)
		17	#undef _LIBCPP_STDLIB_INCLUDE_NEXT
		18	#endif
		19
17	#include_next <stdlib.h>	20	#include_next <stdlib.h>
18		21
19	#elif !defined(_LIBCPP_STDLIB_H)	22	#elif !defined(_LIBCPP_STDLIB_H)
...	@@ -94,33 +97,7 @@ void *aligned_alloc(size_t alignment, size_t size); // C11	...	@@ -94,33 +97,7 @@ void *aligned_alloc(size_t alignment, size_t size); // C11
94	#include_next <stdlib.h>	97	#include_next <stdlib.h>
95		98
96	#ifdef __cplusplus	99	#ifdef __cplusplus
97		100	#include <math.h>
98	extern "C++" {
99
100	#undef abs
101	#undef div
102	#undef labs
103	#undef ldiv
104	#ifndef _LIBCPP_HAS_NO_LONG_LONG
105	#undef llabs
106	#undef lldiv
107	#endif
108
109	// MSVCRT already has the correct prototype in <stdlib.h> if __cplusplus is defined
110	#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
111	inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);}
112	#ifndef _LIBCPP_HAS_NO_LONG_LONG
113	inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);}
114	#endif // _LIBCPP_HAS_NO_LONG_LONG
115
116	inline _LIBCPP_INLINE_VISIBILITY ldiv_t div( long __x, long __y) _NOEXCEPT {return ldiv(__x, __y);}
117	#ifndef _LIBCPP_HAS_NO_LONG_LONG
118	inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x, long long __y) _NOEXCEPT {return lldiv(__x, __y);}
119	#endif // _LIBCPP_HAS_NO_LONG_LONG
120	#endif // _LIBCPP_MSVCRT / __sun__ / _AIX
121
122	} // extern "C++"
123
124	#endif // __cplusplus	101	#endif // __cplusplus
125		102
126	#endif // _LIBCPP_STDLIB_H	103	#endif // _LIBCPP_STDLIB_H

lib/libcxx/include/streambuf+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------- streambuf ----------------------------------===//	2	//===------------------------- streambuf ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/string+36-41

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- string -----------------------------------===//	2	//===--------------------------- string -----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -628,13 +627,13 @@ struct __libcpp_string_gets_noexcept_iterator_impl : public false_type {};	...	@@ -628,13 +627,13 @@ struct __libcpp_string_gets_noexcept_iterator_impl : public false_type {};
628	#else	627	#else
629	template <class _Iter, bool = __is_forward_iterator<_Iter>::value>	628	template <class _Iter, bool = __is_forward_iterator<_Iter>::value>
630	struct __libcpp_string_gets_noexcept_iterator_impl : public _LIBCPP_BOOL_CONSTANT((	629	struct __libcpp_string_gets_noexcept_iterator_impl : public _LIBCPP_BOOL_CONSTANT((
631	noexcept(++(declval<_Iter&>())) &&	630	noexcept(++(declval<_Iter&>())) &&
632	is_nothrow_assignable<_Iter&, _Iter>::value &&	631	is_nothrow_assignable<_Iter&, _Iter>::value &&
633	noexcept(declval<_Iter>() == declval<_Iter>()) &&	632	noexcept(declval<_Iter>() == declval<_Iter>()) &&
634	noexcept(*declval<_Iter>())	633	noexcept(*declval<_Iter>())
635	)) {};	634	)) {};
636		635
637	template <class _Iter>	636	template <class _Iter>
638	struct __libcpp_string_gets_noexcept_iterator_impl<_Iter, false> : public false_type {};	637	struct __libcpp_string_gets_noexcept_iterator_impl<_Iter, false> : public false_type {};
639	#endif	638	#endif
640		639
...	@@ -863,10 +862,10 @@ public:	...	@@ -863,10 +862,10 @@ public:
863	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS	862	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
864	explicit basic_string(const _Tp& __t, const allocator_type& __a);	863	explicit basic_string(const _Tp& __t, const allocator_type& __a);
865		864
866	template<class _InputIterator>	865	template<class _InputIterator, class = typename enable_if<__is_input_iterator<_InputIterator>::value>::type>
867	_LIBCPP_INLINE_VISIBILITY	866	_LIBCPP_INLINE_VISIBILITY
868	basic_string(_InputIterator __first, _InputIterator __last);	867	basic_string(_InputIterator __first, _InputIterator __last);
869	template<class _InputIterator>	868	template<class _InputIterator, class = typename enable_if<__is_input_iterator<_InputIterator>::value>::type>
870	_LIBCPP_INLINE_VISIBILITY	869	_LIBCPP_INLINE_VISIBILITY
871	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a);	870	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a);
872	#ifndef _LIBCPP_CXX03_LANG	871	#ifndef _LIBCPP_CXX03_LANG
...	@@ -1061,10 +1060,10 @@ public:	...	@@ -1061,10 +1060,10 @@ public:
1061	void push_back(value_type __c);	1060	void push_back(value_type __c);
1062	_LIBCPP_INLINE_VISIBILITY	1061	_LIBCPP_INLINE_VISIBILITY
1063	void pop_back();	1062	void pop_back();
1064	_LIBCPP_INLINE_VISIBILITY reference front();	1063	_LIBCPP_INLINE_VISIBILITY reference front() _NOEXCEPT;
1065	_LIBCPP_INLINE_VISIBILITY const_reference front() const;	1064	_LIBCPP_INLINE_VISIBILITY const_reference front() const _NOEXCEPT;
1066	_LIBCPP_INLINE_VISIBILITY reference back();	1065	_LIBCPP_INLINE_VISIBILITY reference back() _NOEXCEPT;
1067	_LIBCPP_INLINE_VISIBILITY const_reference back() const;	1066	_LIBCPP_INLINE_VISIBILITY const_reference back() const _NOEXCEPT;
1068		1067
1069	template <class _Tp>	1068	template <class _Tp>
1070	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS	1069	_LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
...	@@ -1237,9 +1236,9 @@ public:	...	@@ -1237,9 +1236,9 @@ public:
1237	_LIBCPP_INLINE_VISIBILITY	1236	_LIBCPP_INLINE_VISIBILITY
1238	void swap(basic_string& __str)	1237	void swap(basic_string& __str)
1239	#if _LIBCPP_STD_VER >= 14	1238	#if _LIBCPP_STD_VER >= 14
1240	_NOEXCEPT_DEBUG;	1239	_NOEXCEPT;
1241	#else	1240	#else
1242	_NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value \|\|	1241	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
1243	__is_nothrow_swappable<allocator_type>::value);	1242	__is_nothrow_swappable<allocator_type>::value);
1244	#endif	1243	#endif
1245		1244
...	@@ -1421,7 +1420,7 @@ public:	...	@@ -1421,7 +1420,7 @@ public:
1421	_LIBCPP_INLINE_VISIBILITY bool __invariants() const;	1420	_LIBCPP_INLINE_VISIBILITY bool __invariants() const;
1422		1421
1423	_LIBCPP_INLINE_VISIBILITY void __clear_and_shrink() _NOEXCEPT;	1422	_LIBCPP_INLINE_VISIBILITY void __clear_and_shrink() _NOEXCEPT;
1424		1423
1425	_LIBCPP_INLINE_VISIBILITY	1424	_LIBCPP_INLINE_VISIBILITY
1426	bool __is_long() const _NOEXCEPT	1425	bool __is_long() const _NOEXCEPT
1427	{return bool(__r_.first().__s.__size_ & __short_mask);}	1426	{return bool(__r_.first().__s.__size_ & __short_mask);}
...	@@ -1683,7 +1682,7 @@ basic_string(basic_string_view<_CharT, _Traits>, _Sz, _Sz, const _Allocator& = _	...	@@ -1683,7 +1682,7 @@ basic_string(basic_string_view<_CharT, _Traits>, _Sz, _Sz, const _Allocator& = _
1683	-> basic_string<_CharT, _Traits, _Allocator>;	1682	-> basic_string<_CharT, _Traits, _Allocator>;
1684	#endif	1683	#endif
1685		1684
1686		1685
1687	template <class _CharT, class _Traits, class _Allocator>	1686	template <class _CharT, class _Traits, class _Allocator>
1688	inline	1687	inline
1689	void	1688	void
...	@@ -2078,7 +2077,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _For	...	@@ -2078,7 +2077,7 @@ basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _For
2078	}	2077	}
2079		2078
2080	template <class _CharT, class _Traits, class _Allocator>	2079	template <class _CharT, class _Traits, class _Allocator>
2081	template<class _InputIterator>	2080	template<class _InputIterator, class>
2082	inline	2081	inline
2083	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last)	2082	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last)
2084	{	2083	{
...	@@ -2089,7 +2088,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first,	...	@@ -2089,7 +2088,7 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first,
2089	}	2088	}
2090		2089
2091	template <class _CharT, class _Traits, class _Allocator>	2090	template <class _CharT, class _Traits, class _Allocator>
2092	template<class _InputIterator>	2091	template<class _InputIterator, class>
2093	inline	2092	inline
2094	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last,	2093	basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last,
2095	const allocator_type& __a)	2094	const allocator_type& __a)
...	@@ -2526,7 +2525,7 @@ basic_string<_CharT, _Traits, _Allocator>::__append_forward_unsafe(	...	@@ -2526,7 +2525,7 @@ basic_string<_CharT, _Traits, _Allocator>::__append_forward_unsafe(
2526	const basic_string __temp (__first, __last, __alloc());	2525	const basic_string __temp (__first, __last, __alloc());
2527	append(__temp.data(), __temp.size());	2526	append(__temp.data(), __temp.size());
2528	}	2527	}
2529	else	2528	else
2530	{	2529	{
2531	if (__cap - __sz < __n)	2530	if (__cap - __sz < __n)
2532	__grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);	2531	__grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);
...	@@ -3238,7 +3237,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)	...	@@ -3238,7 +3237,7 @@ basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)
3238	template <class _CharT, class _Traits, class _Allocator>	3237	template <class _CharT, class _Traits, class _Allocator>
3239	inline	3238	inline
3240	typename basic_string<_CharT, _Traits, _Allocator>::reference	3239	typename basic_string<_CharT, _Traits, _Allocator>::reference
3241	basic_string<_CharT, _Traits, _Allocator>::front()	3240	basic_string<_CharT, _Traits, _Allocator>::front() _NOEXCEPT
3242	{	3241	{
3243	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");	3242	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
3244	return *__get_pointer();	3243	return *__get_pointer();
...	@@ -3247,7 +3246,7 @@ basic_string<_CharT, _Traits, _Allocator>::front()	...	@@ -3247,7 +3246,7 @@ basic_string<_CharT, _Traits, _Allocator>::front()
3247	template <class _CharT, class _Traits, class _Allocator>	3246	template <class _CharT, class _Traits, class _Allocator>
3248	inline	3247	inline
3249	typename basic_string<_CharT, _Traits, _Allocator>::const_reference	3248	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3250	basic_string<_CharT, _Traits, _Allocator>::front() const	3249	basic_string<_CharT, _Traits, _Allocator>::front() const _NOEXCEPT
3251	{	3250	{
3252	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");	3251	_LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
3253	return *data();	3252	return *data();
...	@@ -3256,7 +3255,7 @@ basic_string<_CharT, _Traits, _Allocator>::front() const	...	@@ -3256,7 +3255,7 @@ basic_string<_CharT, _Traits, _Allocator>::front() const
3256	template <class _CharT, class _Traits, class _Allocator>	3255	template <class _CharT, class _Traits, class _Allocator>
3257	inline	3256	inline
3258	typename basic_string<_CharT, _Traits, _Allocator>::reference	3257	typename basic_string<_CharT, _Traits, _Allocator>::reference
3259	basic_string<_CharT, _Traits, _Allocator>::back()	3258	basic_string<_CharT, _Traits, _Allocator>::back() _NOEXCEPT
3260	{	3259	{
3261	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");	3260	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
3262	return *(__get_pointer() + size() - 1);	3261	return *(__get_pointer() + size() - 1);
...	@@ -3265,7 +3264,7 @@ basic_string<_CharT, _Traits, _Allocator>::back()	...	@@ -3265,7 +3264,7 @@ basic_string<_CharT, _Traits, _Allocator>::back()
3265	template <class _CharT, class _Traits, class _Allocator>	3264	template <class _CharT, class _Traits, class _Allocator>
3266	inline	3265	inline
3267	typename basic_string<_CharT, _Traits, _Allocator>::const_reference	3266	typename basic_string<_CharT, _Traits, _Allocator>::const_reference
3268	basic_string<_CharT, _Traits, _Allocator>::back() const	3267	basic_string<_CharT, _Traits, _Allocator>::back() const _NOEXCEPT
3269	{	3268	{
3270	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");	3269	_LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
3271	return *(data() + size() - 1);	3270	return *(data() + size() - 1);
...	@@ -3296,9 +3295,9 @@ inline	...	@@ -3296,9 +3295,9 @@ inline
3296	void	3295	void
3297	basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)	3296	basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)
3298	#if _LIBCPP_STD_VER >= 14	3297	#if _LIBCPP_STD_VER >= 14
3299	_NOEXCEPT_DEBUG	3298	_NOEXCEPT
3300	#else	3299	#else
3301	_NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value \|\|	3300	_NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value \|\|
3302	__is_nothrow_swappable<allocator_type>::value)	3301	__is_nothrow_swappable<allocator_type>::value)
3303	#endif	3302	#endif
3304	{	3303	{
...	@@ -3825,7 +3824,7 @@ basic_string<_CharT, _Traits, _Allocator>::__invariants() const	...	@@ -3825,7 +3824,7 @@ basic_string<_CharT, _Traits, _Allocator>::__invariants() const
3825		3824
3826	template<class _CharT, class _Traits, class _Allocator>	3825	template<class _CharT, class _Traits, class _Allocator>
3827	inline	3826	inline
3828	void	3827	void
3829	basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT	3828	basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT
3830	{	3829	{
3831	clear();	3830	clear();
...	@@ -3835,7 +3834,7 @@ basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT	...	@@ -3835,7 +3834,7 @@ basic_string<_CharT, _Traits, _Allocator>::__clear_and_shrink() _NOEXCEPT
3835	__set_long_cap(0);	3834	__set_long_cap(0);
3836	__set_short_size(0);	3835	__set_short_size(0);
3837	}	3836	}
3838	}	3837	}
3839		3838
3840	// operator==	3839	// operator==
3841		3840
...	@@ -4228,21 +4227,17 @@ template<class _CharT, class _Traits, class _Allocator>	...	@@ -4228,21 +4227,17 @@ template<class _CharT, class _Traits, class _Allocator>
4228	const typename basic_string<_CharT, _Traits, _Allocator>::size_type	4227	const typename basic_string<_CharT, _Traits, _Allocator>::size_type
4229	basic_string<_CharT, _Traits, _Allocator>::npos;	4228	basic_string<_CharT, _Traits, _Allocator>::npos;
4230		4229
4231	template<class _CharT, class _Traits, class _Allocator>	4230	template <class _CharT, class _Allocator>
4232	struct _LIBCPP_TEMPLATE_VIS hash<basic_string<_CharT, _Traits, _Allocator> >	4231	struct _LIBCPP_TEMPLATE_VIS
4233	: public unary_function<basic_string<_CharT, _Traits, _Allocator>, size_t>	4232	hash<basic_string<_CharT, char_traits<_CharT>, _Allocator> >
		4233	: public unary_function<
		4234	basic_string<_CharT, char_traits<_CharT>, _Allocator>, size_t>
4234	{	4235	{
4235	size_t	4236	size_t
4236	operator()(const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT;	4237	operator()(const basic_string<_CharT, char_traits<_CharT>, _Allocator>& __val) const _NOEXCEPT
		4238	{ return __do_string_hash(__val.data(), __val.data() + __val.size()); }
4237	};	4239	};
4238		4240
4239	template<class _CharT, class _Traits, class _Allocator>
4240	size_t
4241	hash<basic_string<_CharT, _Traits, _Allocator> >::operator()(
4242	const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT
4243	{
4244	return __do_string_hash(__val.data(), __val.data() + __val.size());
4245	}
4246		4241
4247	template<class _CharT, class _Traits, class _Allocator>	4242	template<class _CharT, class _Traits, class _Allocator>
4248	basic_ostream<_CharT, _Traits>&	4243	basic_ostream<_CharT, _Traits>&
...	@@ -4332,7 +4327,7 @@ basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator*	...	@@ -4332,7 +4327,7 @@ basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator*
4332	_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<char>)	4327	_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<char>)
4333	_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<wchar_t>)	4328	_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_string<wchar_t>)
4334		4329
4335	#if _LIBCPP_STD_VER > 11	4330	#if _LIBCPP_STD_VER > 11
4336	// Literal suffixes for basic_string [basic.string.literals]	4331	// Literal suffixes for basic_string [basic.string.literals]
4337	inline namespace literals	4332	inline namespace literals
4338	{	4333	{

lib/libcxx/include/string.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- string.h ---------------------------------===//	2	//===--------------------------- string.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is distributed under the University of Illinois Open Source	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// License. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/string_view+20-21

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===------------------------ string_view ---------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is distributed under the University of Illinois Open Source
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -229,9 +228,9 @@ public:
     basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT
         : __data(__s), __size(__len)
     {
-// #if _LIBCPP_STD_VER > 11
+#if _LIBCPP_STD_VER > 11
-//         _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr");
+    _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr");
-// #endif
+#endif
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
 @@ -289,13 +288,13 @@ public:
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const
+    const_reference front() const _NOEXCEPT
     {
         return _LIBCPP_ASSERT(!empty(), "string_view::front(): string is empty"), __data[0];
     }
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const
+    const_reference back() const _NOEXCEPT
     {
         return _LIBCPP_ASSERT(!empty(), "string_view::back(): string is empty"), __data[__size-1];
     }
 @@ -365,7 +364,7 @@ public:
     }
     _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
     int compare(                       size_type __pos1, size_type __n1,
                 basic_string_view __sv, size_type __pos2, size_type __n2) const
     {
         return substr(__pos1, __n1).compare(__sv.substr(__pos2, __n2));
 @@ -629,7 +628,7 @@ bool operator==(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator==(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     if ( __lhs.size() != __rhs.size()) return false;
 @@ -659,7 +658,7 @@ bool operator!=(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator!=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     if ( __lhs.size() != __rhs.size())
 @@ -686,7 +685,7 @@ bool operator<(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator<(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) < 0;
 @@ -711,7 +710,7 @@ bool operator>(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator>(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) > 0;
 @@ -736,7 +735,7 @@ bool operator<=(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator<=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) <= 0;
 @@ -762,7 +761,7 @@ bool operator>=(basic_string_view<_CharT, _Traits> __lhs,
 template<class _CharT, class _Traits>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator>=(typename common_type<basic_string_view<_CharT, _Traits> >::type __lhs,
                 basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
 {
     return __lhs.compare(__rhs) >= 0;
 @@ -777,18 +776,18 @@ typedef basic_string_view<char32_t> u32string_view;
 typedef basic_string_view<wchar_t>  wstring_view;
 // [string.view.hash]
-template<class _CharT, class _Traits>
+template<class _CharT>
-struct _LIBCPP_TEMPLATE_VIS hash<basic_string_view<_CharT, _Traits> >
+struct _LIBCPP_TEMPLATE_VIS hash<basic_string_view<_CharT, char_traits<_CharT> > >
-    : public unary_function<basic_string_view<_CharT, _Traits>, size_t>
+    : public unary_function<basic_string_view<_CharT, char_traits<_CharT> >, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const basic_string_view<_CharT, _Traits> __val) const _NOEXCEPT {
+    size_t operator()(const basic_string_view<_CharT, char_traits<_CharT> > __val) const _NOEXCEPT {
         return __do_string_hash(__val.data(), __val.data() + __val.size());
     }
 };
 #if _LIBCPP_STD_VER > 11
 inline namespace literals
 {
   inline namespace string_view_literals

lib/libcxx/include/strstream+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- strstream --------------------------------===//	2	//===--------------------------- strstream --------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/android/locale_bionic.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------- support/android/locale_bionic.h ------------------===//	2	//===------------------- support/android/locale_bionic.h ------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/fuchsia/xlocale.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------- support/fuchsia/xlocale.h ------------------------===//	2	//===------------------- support/fuchsia/xlocale.h ------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/ibm/limits.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------- support/ibm/limits.h ---------------------------===//	2	//===--------------------- support/ibm/limits.h ---------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/ibm/locale_mgmt_aix.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------- support/ibm/locale_mgmt_aix.h --------------------===//	2	//===------------------- support/ibm/locale_mgmt_aix.h --------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/ibm/support.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===----------------------- support/ibm/support.h ----------------------===//	2	//===----------------------- support/ibm/support.h ----------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/ibm/xlocale.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------- support/ibm/xlocale.h -------------------===//	2	//===--------------------- support/ibm/xlocale.h -------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/musl/xlocale.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------- support/musl/xlocale.h ------------------------===//	2	//===------------------- support/musl/xlocale.h ------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	// This adds support for the extended locale functions that are currently	9	// This adds support for the extended locale functions that are currently

lib/libcxx/include/support/newlib/xlocale.h+3-4

...	@@ -1,9 +1,8 @@	...	@@ -1,9 +1,8 @@
1	//===----------------------------------------------------------------------===//	1	//===----------------------------------------------------------------------===//
2	//	2	//
3	// The LLVM Compiler Infrastructure	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	//	4	// See https://llvm.org/LICENSE.txt for license information.
5	// This file is dual licensed under the MIT and the University of Illinois Open	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	// Source Licenses. See LICENSE.TXT for details.
7	//	6	//
8	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
9		8

lib/libcxx/include/support/solaris/floatingpoint.h+3-4

...	@@ -1,9 +1,8 @@	...	@@ -1,9 +1,8 @@
1	//===----------------------------------------------------------------------===//	1	//===----------------------------------------------------------------------===//
2	//	2	//
3	// The LLVM Compiler Infrastructure	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	//	4	// See https://llvm.org/LICENSE.txt for license information.
5	// This file is dual licensed under the MIT and the University of Illinois Open	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	// Source Licenses. See LICENSE.TXT for details.
7	//	6	//
8	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
9		8

lib/libcxx/include/support/solaris/wchar.h+3-4

...	@@ -1,9 +1,8 @@	...	@@ -1,9 +1,8 @@
1	//===----------------------------------------------------------------------===//	1	//===----------------------------------------------------------------------===//
2	//	2	//
3	// The LLVM Compiler Infrastructure	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	//	4	// See https://llvm.org/LICENSE.txt for license information.
5	// This file is dual licensed under the MIT and the University of Illinois Open	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	// Source Licenses. See LICENSE.TXT for details.
7	//	6	//
8	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
9		8

lib/libcxx/include/support/solaris/xlocale.h+3-4

...	@@ -1,9 +1,8 @@	...	@@ -1,9 +1,8 @@
1	//===----------------------------------------------------------------------===//	1	//===----------------------------------------------------------------------===//
2	//	2	//
3	// The LLVM Compiler Infrastructure	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	//	4	// See https://llvm.org/LICENSE.txt for license information.
5	// This file is dual licensed under the MIT and the University of Illinois Open	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	// Source Licenses. See LICENSE.TXT for details.
7	//	6	//
8	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
9		8

lib/libcxx/include/support/win32/limits_msvc_win32.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------ support/win32/limits_msvc_win32.h -----------------===//	2	//===------------------ support/win32/limits_msvc_win32.h -----------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/win32/locale_win32.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------- support/win32/locale_win32.h -------------------===//	2	//===--------------------- support/win32/locale_win32.h -------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/xlocale/__nop_locale_mgmt.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------ support/xlocale/__nop_locale_mgmt.h -----------------===//	2	//===------------ support/xlocale/__nop_locale_mgmt.h -----------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/support/xlocale/__posix_l_fallback.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------- support/xlocale/__posix_l_fallback.h -----------------===//	2	//===--------------- support/xlocale/__posix_l_fallback.h -----------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	// These are reimplementations of some extended locale functions ( *_l ) that	9	// These are reimplementations of some extended locale functions ( *_l ) that

lib/libcxx/include/support/xlocale/__strtonum_fallback.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------- support/xlocale/__strtonum_fallback.h -----------------===//	2	//===-------------- support/xlocale/__strtonum_fallback.h -----------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10	// These are reimplementations of some extended locale functions ( *_l ) that	9	// These are reimplementations of some extended locale functions ( *_l ) that

lib/libcxx/include/support/xlocale/xlocale.h deleted

lib/libcxx/include/system_error+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===---------------------------- system_error ----------------------------===//	2	//===---------------------------- system_error ----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/tgmath.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- tgmath.h ----------------------------------===//	2	//===-------------------------- tgmath.h ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/thread+8-4

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- thread -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -435,7 +434,12 @@ sleep_for(const chrono::duration<_Rep, _Period>& __d)
     using namespace chrono;
     if (__d > duration<_Rep, _Period>::zero())
     {
+#if defined(_LIBCPP_COMPILER_GCC) && (__powerpc__ || __POWERPC__)
+    //  GCC's long double const folding is incomplete for IBM128 long doubles.
         _LIBCPP_CONSTEXPR duration<long double> _Max = nanoseconds::max();
+#else
+        _LIBCPP_CONSTEXPR duration<long double> _Max = duration<long double>(ULLONG_MAX/1000000000ULL) ;
+#endif
         nanoseconds __ns;
         if (__d < _Max)
         {

lib/libcxx/include/tuple+87-68

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- tuple ------------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is distributed under the University of Illinois Open Source
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -88,8 +87,8 @@ template <class T> struct tuple_size; // undefined
 template <class... T> struct tuple_size<tuple<T...>>;
 template <class T>
  inline constexpr size_t tuple_size_v = tuple_size<T>::value; // C++17
-template <size_t I, class T> class tuple_element; // undefined
+template <size_t I, class T> struct tuple_element; // undefined
-template <size_t I, class... T> class tuple_element<I, tuple<T...>>;
+template <size_t I, class... T> struct tuple_element<I, tuple<T...>>;
 template <size_t I, class T>
   using tuple_element_t = typename tuple_element <I, T>::type; // C++14
 @@ -210,12 +209,12 @@ public:
               "Attempted to default construct a reference element in a tuple");}
     template <class _Tp,
-              class = typename enable_if<
+              class = _EnableIf<
-                  __lazy_and<
+                  _And<
-                      __lazy_not<is_same<typename __uncvref<_Tp>::type, __tuple_leaf>>
+                      _IsNotSame<__uncvref_t<_Tp>, __tuple_leaf>,
-                    , is_constructible<_Hp, _Tp>
+                      is_constructible<_Hp, _Tp>
                     >::value
-                >::type
+                >
             >
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
         explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
 @@ -292,12 +291,12 @@ public:
             : _Hp(__a) {}
     template <class _Tp,
-              class = typename enable_if<
+              class = _EnableIf<
-                  __lazy_and<
+                  _And<
-                        __lazy_not<is_same<typename __uncvref<_Tp>::type, __tuple_leaf>>
+                    _IsNotSame<__uncvref_t<_Tp>, __tuple_leaf>,
-                      , is_constructible<_Hp, _Tp>
+                    is_constructible<_Hp, _Tp>
-                    >::value
+                  >::value
-                >::type
+                >
             >
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
         explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
 @@ -346,9 +345,6 @@ template <class ..._Tp>
 _LIBCPP_INLINE_VISIBILITY
 void __swallow(_Tp&&...) _NOEXCEPT {}
-template <class ..._Tp>
-struct __lazy_all : __all<_Tp::value...> {};
 template <class _Tp>
 struct __all_default_constructible;
 @@ -525,6 +521,13 @@ class _LIBCPP_TEMPLATE_VIS tuple
         template <class ..._Args>
         static constexpr bool __enable_implicit() {
             return
+               __tuple_constructible<
+                    tuple<_Args...>,
+                    typename __make_tuple_types<tuple,
+                             sizeof...(_Args) < sizeof...(_Tp) ?
+                                 sizeof...(_Args) :
+                                 sizeof...(_Tp)>::type
+                >::value &&
                 __tuple_convertible<
                     tuple<_Args...>,
                     typename __make_tuple_types<tuple,
 @@ -551,7 +554,8 @@ class _LIBCPP_TEMPLATE_VIS tuple
     {
         template <class _Tuple>
         static constexpr bool __enable_implicit() {
-            return __tuple_convertible<_Tuple, tuple>::value;
+            return __tuple_constructible<_Tuple, tuple>::value
+                && __tuple_convertible<_Tuple, tuple>::value;
         }
         template <class _Tuple>
 @@ -568,19 +572,20 @@ class _LIBCPP_TEMPLATE_VIS tuple
         // the UTypes... constructor should be selected instead.
         // See LWG issue #2549.
         template <class _Tuple>
-        using _PreferTupleLikeConstructor = __lazy_or<
+        using _PreferTupleLikeConstructor = _Or<
             // Don't attempt the two checks below if the tuple we are given
             // has the same type as this tuple.
-            is_same<typename __uncvref<_Tuple>::type, tuple>,
+            _IsSame<__uncvref_t<_Tuple>, tuple>,
-            __lazy_and<
+            _Lazy<_And,
-                __lazy_not<is_constructible<_Tp..., _Tuple>>,
+                _Not<is_constructible<_Tp..., _Tuple>>,
-                __lazy_not<is_convertible<_Tuple, _Tp...>>
+                _Not<is_convertible<_Tuple, _Tp...>>
             >
         >;
         template <class _Tuple>
         static constexpr bool __enable_implicit() {
-            return __lazy_and<
+            return _And<
+                __tuple_constructible<_Tuple, tuple>,
                 __tuple_convertible<_Tuple, tuple>,
                 _PreferTupleLikeConstructor<_Tuple>
             >::value;
 @@ -588,14 +593,33 @@ class _LIBCPP_TEMPLATE_VIS tuple
         template <class _Tuple>
         static constexpr bool __enable_explicit() {
-            return __lazy_and<
+            return _And<
                 __tuple_constructible<_Tuple, tuple>,
                 _PreferTupleLikeConstructor<_Tuple>,
-                __lazy_not<__tuple_convertible<_Tuple, tuple>>
+                _Not<__tuple_convertible<_Tuple, tuple>>
             >::value;
         }
     };
+    template <class _Tuple, bool _DisableIfLValue>
+    using _EnableImplicitTupleLikeConstructor = _EnableIf<
+                         _CheckTupleLikeConstructor<
+                             __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+                             && !_PackExpandsToThisTuple<_Tuple>::value
+                             && (!is_lvalue_reference<_Tuple>::value || !_DisableIfLValue)
+                         >::template __enable_implicit<_Tuple>(),
+                         bool
+                      >;
+    template <class _Tuple, bool _DisableIfLValue>
+    using _EnableExplicitTupleLikeConstructor = _EnableIf<
+                         _CheckTupleLikeConstructor<
+                             __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+                             && !_PackExpandsToThisTuple<_Tuple>::value
+                             && (!is_lvalue_reference<_Tuple>::value || !_DisableIfLValue)
+                         >::template __enable_explicit<_Tuple>(),
+                         bool
+                      >;
     template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
         typename tuple_element<_Jp, tuple<_Up...> >::type& get(tuple<_Up...>&) _NOEXCEPT;
     template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
 @@ -616,12 +640,13 @@ public:
     tuple(tuple const&) = default;
     tuple(tuple&&) = default;
-    template <class _AllocArgT, class _Alloc, bool _Dummy = true, class = typename enable_if<
+    template <class _AllocArgT, class _Alloc, bool _Dummy = true, class = _EnableIf<
-        __lazy_and<
+        _And<
-            is_same<allocator_arg_t, _AllocArgT>,
+            _IsSame<allocator_arg_t, _AllocArgT>,
-            __lazy_all<__dependent_type<is_default_constructible<_Tp>, _Dummy>...>
+           __dependent_type<is_default_constructible<_Tp>, _Dummy>...
        >::value
-    >::type>
+      >
+    >
     _LIBCPP_INLINE_VISIBILITY
     tuple(_AllocArgT, _Alloc const& __a)
       : __base_(allocator_arg_t(), __a,
 @@ -809,35 +834,27 @@ public:
                     typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
                     _VSTD::forward<_Up>(__u)...) {}
-    template <class _Tuple,
+    template <class _Tuple, _EnableImplicitTupleLikeConstructor<_Tuple, true> = false>
-              typename enable_if
-                      <
-                         _CheckTupleLikeConstructor<
-                             __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
-                             && !_PackExpandsToThisTuple<_Tuple>::value
-                         >::template __enable_implicit<_Tuple>(),
-                         bool
-                      >::type = false
-             >
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
         tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<_BaseT, _Tuple>::value))
             : __base_(_VSTD::forward<_Tuple>(__t)) {}
-    template <class _Tuple,
+    template <class _Tuple, _EnableImplicitTupleLikeConstructor<const _Tuple&, false> = false>
-              typename enable_if
+        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-                      <
+        tuple(const _Tuple& __t) _NOEXCEPT_((is_nothrow_constructible<_BaseT, const _Tuple&>::value))
-                         _CheckTupleLikeConstructor<
+            : __base_(__t) {}
-                             __tuple_like_with_size<_Tuple, sizeof...(_Tp)>::value
+    template <class _Tuple, _EnableExplicitTupleLikeConstructor<_Tuple, true> = false>
-                             && !_PackExpandsToThisTuple<_Tuple>::value
-                         >::template __enable_explicit<_Tuple>(),
-                         bool
-                      >::type = false
-             >
         _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
         explicit
         tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<_BaseT, _Tuple>::value))
             : __base_(_VSTD::forward<_Tuple>(__t)) {}
+    template <class _Tuple, _EnableExplicitTupleLikeConstructor<const _Tuple&, false> = false>
+        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
+        explicit
+        tuple(const _Tuple& __t) _NOEXCEPT_((is_nothrow_constructible<_BaseT, const _Tuple&>::value))
+            : __base_(__t) {}
     template <class _Alloc, class _Tuple,
               typename enable_if
                       <
 @@ -908,7 +925,7 @@ class _LIBCPP_TEMPLATE_VIS tuple<>
 {
 public:
     _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR tuple() _NOEXCEPT {}
+    _LIBCPP_CONSTEXPR tuple() _NOEXCEPT = default;
     template <class _Alloc>
     _LIBCPP_INLINE_VISIBILITY
         tuple(allocator_arg_t, const _Alloc&) _NOEXCEPT {}
 @@ -953,7 +970,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 typename tuple_element<_Ip, tuple<_Tp...> >::type&
 get(tuple<_Tp...>& __t) _NOEXCEPT
 {
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
+    typedef _LIBCPP_NODEBUG_TYPE typename tuple_element<_Ip, tuple<_Tp...> >::type type;
     return static_cast<__tuple_leaf<_Ip, type>&>(__t.__base_).get();
 }
 @@ -962,7 +979,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 const typename tuple_element<_Ip, tuple<_Tp...> >::type&
 get(const tuple<_Tp...>& __t) _NOEXCEPT
 {
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
+    typedef _LIBCPP_NODEBUG_TYPE typename tuple_element<_Ip, tuple<_Tp...> >::type type;
     return static_cast<const __tuple_leaf<_Ip, type>&>(__t.__base_).get();
 }
 @@ -971,7 +988,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 typename tuple_element<_Ip, tuple<_Tp...> >::type&&
 get(tuple<_Tp...>&& __t) _NOEXCEPT
 {
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
+    typedef _LIBCPP_NODEBUG_TYPE typename tuple_element<_Ip, tuple<_Tp...> >::type type;
     return static_cast<type&&>(
              static_cast<__tuple_leaf<_Ip, type>&&>(__t.__base_).get());
 }
 @@ -981,7 +998,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 const typename tuple_element<_Ip, tuple<_Tp...> >::type&&
 get(const tuple<_Tp...>&& __t) _NOEXCEPT
 {
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
+    typedef _LIBCPP_NODEBUG_TYPE typename tuple_element<_Ip, tuple<_Tp...> >::type type;
     return static_cast<const type&&>(
              static_cast<const __tuple_leaf<_Ip, type>&&>(__t.__base_).get());
 }
 @@ -1121,6 +1138,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 bool
 operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
 {
+    static_assert (sizeof...(_Tp) == sizeof...(_Up), "Can't compare tuples of different sizes");
     return __tuple_equal<sizeof...(_Tp)>()(__x, __y);
 }
 @@ -1164,6 +1182,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 bool
 operator<(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
 {
+    static_assert (sizeof...(_Tp) == sizeof...(_Up), "Can't compare tuples of different sizes");
     return __tuple_less<sizeof...(_Tp)>()(__x, __y);
 }
 @@ -1198,7 +1217,7 @@ template <class _Tp, class _Up> struct __tuple_cat_type;
 template <class ..._Ttypes, class ..._Utypes>
 struct __tuple_cat_type<tuple<_Ttypes...>, __tuple_types<_Utypes...> >
 {
-    typedef tuple<_Ttypes..., _Utypes...> type;
+    typedef _LIBCPP_NODEBUG_TYPE tuple<_Ttypes..., _Utypes...> type;
 };
 template <class _ResultTuple, bool _Is_Tuple0TupleLike, class ..._Tuples>
 @@ -1209,8 +1228,8 @@ struct __tuple_cat_return_1
 template <class ..._Types, class _Tuple0>
 struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0>
 {
-    typedef typename __tuple_cat_type<tuple<_Types...>,
+    typedef _LIBCPP_NODEBUG_TYPE typename __tuple_cat_type<tuple<_Types...>,
-            typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type>::type
+            typename __make_tuple_types<typename __uncvref<_Tuple0>::type>::type>::type
                                                                            type;
 };
 @@ -1219,7 +1238,7 @@ struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0, _Tuple1, _Tuples...
     : public __tuple_cat_return_1<
                  typename __tuple_cat_type<
                      tuple<_Types...>,
-                     typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type
+                     typename __make_tuple_types<typename __uncvref<_Tuple0>::type>::type
                  >::type,
                  __tuple_like<typename remove_reference<_Tuple1>::type>::value,
                  _Tuple1, _Tuples...>
 @@ -1239,7 +1258,7 @@ struct __tuple_cat_return<_Tuple0, _Tuples...>
 template <>
 struct __tuple_cat_return<>
 {
-    typedef tuple<> type;
+    typedef _LIBCPP_NODEBUG_TYPE tuple<> type;
 };
 inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 @@ -1255,7 +1274,7 @@ struct __tuple_cat_return_ref_imp;
 template <class ..._Types, size_t ..._I0, class _Tuple0>
 struct __tuple_cat_return_ref_imp<tuple<_Types...>, __tuple_indices<_I0...>, _Tuple0>
 {
-    typedef typename remove_reference<_Tuple0>::type _T0;
+    typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tuple0>::type _T0;
     typedef tuple<_Types..., typename __apply_cv<_Tuple0,
                           typename tuple_element<_I0, _T0>::type>::type&&...> type;
 };
 @@ -1302,8 +1321,8 @@ struct __tuple_cat<tuple<_Types...>, __tuple_indices<_I0...>, __tuple_indices<_J
     typename __tuple_cat_return_ref<tuple<_Types...>&&, _Tuple0&&, _Tuple1&&, _Tuples&&...>::type
     operator()(tuple<_Types...> __t, _Tuple0&& __t0, _Tuple1&& __t1, _Tuples&& ...__tpls)
     {
-        typedef typename remove_reference<_Tuple0>::type _T0;
+        typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tuple0>::type _T0;
-        typedef typename remove_reference<_Tuple1>::type _T1;
+        typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tuple1>::type _T1;
         return __tuple_cat<
            tuple<_Types..., typename __apply_cv<_Tuple0, typename tuple_element<_J0, _T0>::type>::type&&...>,
            typename __make_tuple_indices<sizeof ...(_Types) + tuple_size<_T0>::value>::type,
 @@ -1322,7 +1341,7 @@ inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 typename __tuple_cat_return<_Tuple0, _Tuples...>::type
 tuple_cat(_Tuple0&& __t0, _Tuples&&... __tpls)
 {
-    typedef typename remove_reference<_Tuple0>::type _T0;
+    typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tuple0>::type _T0;
     return __tuple_cat<tuple<>, __tuple_indices<>,
                   typename __make_tuple_indices<tuple_size<_T0>::value>::type>()
                   (tuple<>(), _VSTD::forward<_Tuple0>(__t0),

lib/libcxx/include/type_traits+431-1240

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------ type_traits ---------------------------------===//	2	//===------------------------ type_traits ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -91,6 +90,9 @@ namespace std	...	@@ -91,6 +90,9 @@ namespace std
91	template <class T> struct remove_extent;	90	template <class T> struct remove_extent;
92	template <class T> struct remove_all_extents;	91	template <class T> struct remove_all_extents;
93		92
		93	template <class T> struct is_bounded_array; // C++20
		94	template <class T> struct is_unbounded_array; // C++20
		95
94	// Member introspection:	96	// Member introspection:
95	template <class T> struct is_pod;	97	template <class T> struct is_pod;
96	template <class T> struct is_trivial;	98	template <class T> struct is_trivial;
...	@@ -141,7 +143,10 @@ namespace std	...	@@ -141,7 +143,10 @@ namespace std
141	// Relationships between types:	143	// Relationships between types:
142	template <class T, class U> struct is_same;	144	template <class T, class U> struct is_same;
143	template <class Base, class Derived> struct is_base_of;	145	template <class Base, class Derived> struct is_base_of;
		146
144	template <class From, class To> struct is_convertible;	147	template <class From, class To> struct is_convertible;
		148	template <typename From, typename To> struct is_nothrow_convertible; // C++20
		149	template <typename From, typename To> inline constexpr bool is_nothrow_convertible_v; // C++20
145		150
146	template <class Fn, class... ArgTypes> struct is_invocable;	151	template <class Fn, class... ArgTypes> struct is_invocable;
147	template <class R, class Fn, class... ArgTypes> struct is_invocable_r;	152	template <class R, class Fn, class... ArgTypes> struct is_invocable_r;
...	@@ -197,6 +202,12 @@ namespace std	...	@@ -197,6 +202,12 @@ namespace std
197	template <class T>	202	template <class T>
198	using remove_all_extents_t = typename remove_all_extents<T>::type; // C++14	203	using remove_all_extents_t = typename remove_all_extents<T>::type; // C++14
199		204
		205	template <class T>
		206	inline constexpr bool is_bounded_array_v
		207	= is_bounded_array<T>::value; // C++20
		208	inline constexpr bool is_unbounded_array_v
		209	= is_unbounded_array<T>::value; // C++20
		210
200	// pointer modifications:	211	// pointer modifications:
201	template <class T>	212	template <class T>
202	using remove_pointer_t = typename remove_pointer<T>::type; // C++14	213	using remove_pointer_t = typename remove_pointer<T>::type; // C++14
...	@@ -416,6 +427,96 @@ template <class _T1, class _T2> struct _LIBCPP_TEMPLATE_VIS pair;	...	@@ -416,6 +427,96 @@ template <class _T1, class _T2> struct _LIBCPP_TEMPLATE_VIS pair;
416	template <class _Tp> class _LIBCPP_TEMPLATE_VIS reference_wrapper;	427	template <class _Tp> class _LIBCPP_TEMPLATE_VIS reference_wrapper;
417	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS hash;	428	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS hash;
418		429
		430
		431	template <class _Tp, _Tp __v>
		432	struct _LIBCPP_TEMPLATE_VIS integral_constant
		433	{
		434	static _LIBCPP_CONSTEXPR const _Tp value = __v;
		435	typedef _Tp value_type;
		436	typedef integral_constant type;
		437	_LIBCPP_INLINE_VISIBILITY
		438	_LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT {return value;}
		439	#if _LIBCPP_STD_VER > 11
		440	_LIBCPP_INLINE_VISIBILITY
		441	constexpr value_type operator ()() const _NOEXCEPT {return value;}
		442	#endif
		443	};
		444
		445	template <class _Tp, _Tp __v>
		446	_LIBCPP_CONSTEXPR const _Tp integral_constant<_Tp, __v>::value;
		447
		448	#if _LIBCPP_STD_VER > 14
		449	template <bool __b>
		450	using bool_constant = integral_constant<bool, __b>;
		451	#define _LIBCPP_BOOL_CONSTANT(__b) bool_constant<(__b)>
		452	#else
		453	#define _LIBCPP_BOOL_CONSTANT(__b) integral_constant<bool,(__b)>
		454	#endif
		455
		456	typedef _LIBCPP_BOOL_CONSTANT(true) true_type;
		457	typedef _LIBCPP_BOOL_CONSTANT(false) false_type;
		458
		459	template <bool _Val>
		460	using _BoolConstant _LIBCPP_NODEBUG_TYPE = integral_constant<bool, _Val>;
		461
		462	template <bool> struct _MetaBase;
		463	template <>
		464	struct _MetaBase<true> {
		465	template <class _Tp, class _Up>
		466	using _SelectImpl _LIBCPP_NODEBUG_TYPE = _Tp;
		467	template <template <class...> class _FirstFn, template <class...> class, class ..._Args>
		468	using _SelectApplyImpl _LIBCPP_NODEBUG_TYPE = _FirstFn<_Args...>;
		469	template <class _First, class...>
		470	using _FirstImpl _LIBCPP_NODEBUG_TYPE = _First;
		471	template <class, class _Second, class...>
		472	using _SecondImpl _LIBCPP_NODEBUG_TYPE = _Second;
		473	template <class _Tp = void>
		474	using _EnableIfImpl _LIBCPP_NODEBUG_TYPE = _Tp;
		475	template <class _Result, class _First, class ..._Rest>
		476	using _OrImpl _LIBCPP_NODEBUG_TYPE = typename _MetaBase<_First::value != true && sizeof...(_Rest) != 0>::template _OrImpl<_First, _Rest...>;
		477	template <class _Result, class _First, class ..._Rest>
		478	using _AndImpl _LIBCPP_NODEBUG_TYPE = typename _MetaBase<_First::value == true && sizeof...(_Rest) != 0>::template _AndImpl<_First, _Rest...>;
		479	};
		480
		481	template <>
		482	struct _MetaBase<false> {
		483	template <class _Tp, class _Up>
		484	using _SelectImpl _LIBCPP_NODEBUG_TYPE = _Up;
		485	template <template <class...> class, template <class...> class _SecondFn, class ..._Args>
		486	using _SelectApplyImpl _LIBCPP_NODEBUG_TYPE = _SecondFn<_Args...>;
		487	template <class _Result, class ...>
		488	using _OrImpl _LIBCPP_NODEBUG_TYPE = _Result;
		489	template <class _Result, class ...>
		490	using _AndImpl _LIBCPP_NODEBUG_TYPE = _Result;
		491	};
		492	template <bool _Cond, class _Ret = void>
		493	using _EnableIf _LIBCPP_NODEBUG_TYPE = typename _MetaBase<_Cond>::template _EnableIfImpl<_Ret>;
		494	template <bool _Cond, class _IfRes, class _ElseRes>
		495	using _If _LIBCPP_NODEBUG_TYPE = typename _MetaBase<_Cond>::template _SelectImpl<_IfRes, _ElseRes>;
		496	template <class ..._Rest>
		497	using _Or _LIBCPP_NODEBUG_TYPE = typename _MetaBase< sizeof...(_Rest) != 0 >::template _OrImpl<false_type, _Rest...>;
		498	template <class ..._Rest>
		499	using _And _LIBCPP_NODEBUG_TYPE = typename _MetaBase< sizeof...(_Rest) != 0 >::template _AndImpl<true_type, _Rest...>;
		500	template <class _Pred>
		501	struct _Not : _BoolConstant<!_Pred::value> {};
		502	template <class ..._Args>
		503	using _FirstType _LIBCPP_NODEBUG_TYPE = typename _MetaBase<(sizeof...(_Args) >= 1)>::template _FirstImpl<_Args...>;
		504	template <class ..._Args>
		505	using _SecondType _LIBCPP_NODEBUG_TYPE = typename _MetaBase<(sizeof...(_Args) >= 2)>::template _SecondImpl<_Args...>;
		506
		507	template <template <class...> class _Func, class ..._Args>
		508	struct _Lazy : _Func<_Args...> {};
		509
		510	// Member detector base
		511
		512	template <template <class...> class _Templ, class ..._Args>
		513	true_type __sfinae_test_impl(_FirstType<int, _Templ<_Args...> >);
		514	template <template <class...> class, class ...>
		515	false_type __sfinae_test_impl(...);
		516
		517	template <template <class ...> class _Templ, class ..._Args>
		518	using _IsValidExpansion _LIBCPP_NODEBUG_TYPE = decltype(std::__sfinae_test_impl<_Templ, _Args...>(0));
		519
419	template <class>	520	template <class>
420	struct __void_t { typedef void type; };	521	struct __void_t { typedef void type; };
421		522
...	@@ -434,9 +535,6 @@ template <class _If, class _Then>	...	@@ -434,9 +535,6 @@ template <class _If, class _Then>
434	template <bool _Bp, class _If, class _Then> using conditional_t = typename conditional<_Bp, _If, _Then>::type;	535	template <bool _Bp, class _If, class _Then> using conditional_t = typename conditional<_Bp, _If, _Then>::type;
435	#endif	536	#endif
436		537
437	template <bool, class _Tp> struct _LIBCPP_TEMPLATE_VIS __lazy_enable_if {};
438	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS __lazy_enable_if<true, _Tp> {typedef typename _Tp::type type;};
439
440	template <bool, class _Tp = void> struct _LIBCPP_TEMPLATE_VIS enable_if {};	538	template <bool, class _Tp = void> struct _LIBCPP_TEMPLATE_VIS enable_if {};
441	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS enable_if<true, _Tp> {typedef _Tp type;};	539	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS enable_if<true, _Tp> {typedef _Tp type;};
442		540
...	@@ -444,6 +542,34 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS enable_if<true, _Tp> {typedef _	...	@@ -444,6 +542,34 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS enable_if<true, _Tp> {typedef _
444	template <bool _Bp, class _Tp = void> using enable_if_t = typename enable_if<_Bp, _Tp>::type;	542	template <bool _Bp, class _Tp = void> using enable_if_t = typename enable_if<_Bp, _Tp>::type;
445	#endif	543	#endif
446		544
		545	// is_same
		546
		547	template <class _Tp, class _Up> struct _LIBCPP_TEMPLATE_VIS is_same : public false_type {};
		548	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_same<_Tp, _Tp> : public true_type {};
		549
		550	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
		551	template <class _Tp, class _Up>
		552	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_same_v
		553	= is_same<_Tp, _Up>::value;
		554	#endif
		555
		556	template <class _Tp, class _Up>
		557	using _IsSame = _BoolConstant<
		558	#ifdef __clang__
		559	__is_same(_Tp, _Up)
		560	#else
		561	_VSTD::is_same<_Tp, _Up>::value
		562	#endif
		563	>;
		564
		565	template <class _Tp, class _Up>
		566	using _IsNotSame = _BoolConstant<
		567	#ifdef __clang__
		568	!__is_same(_Tp, _Up)
		569	#else
		570	!_VSTD::is_same<_Tp, _Up>::value
		571	#endif
		572	>;
447	// addressof	573	// addressof
448	#ifndef _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF	574	#ifndef _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF
449		575
...	@@ -517,111 +643,6 @@ struct __two {char __lx[2];};	...	@@ -517,111 +643,6 @@ struct __two {char __lx[2];};
517		643
518	// helper class:	644	// helper class:
519		645
520	template <class _Tp, _Tp __v>
521	struct _LIBCPP_TEMPLATE_VIS integral_constant
522	{
523	static _LIBCPP_CONSTEXPR const _Tp value = __v;
524	typedef _Tp value_type;
525	typedef integral_constant type;
526	_LIBCPP_INLINE_VISIBILITY
527	_LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT {return value;}
528	#if _LIBCPP_STD_VER > 11
529	_LIBCPP_INLINE_VISIBILITY
530	constexpr value_type operator ()() const _NOEXCEPT {return value;}
531	#endif
532	};
533
534	template <class _Tp, _Tp __v>
535	_LIBCPP_CONSTEXPR const _Tp integral_constant<_Tp, __v>::value;
536
537	#if _LIBCPP_STD_VER > 14
538	template <bool __b>
539	using bool_constant = integral_constant<bool, __b>;
540	#define _LIBCPP_BOOL_CONSTANT(__b) bool_constant<(__b)>
541	#else
542	#define _LIBCPP_BOOL_CONSTANT(__b) integral_constant<bool,(__b)>
543	#endif
544
545	typedef _LIBCPP_BOOL_CONSTANT(true) true_type;
546	typedef _LIBCPP_BOOL_CONSTANT(false) false_type;
547
548	#if !defined(_LIBCPP_CXX03_LANG)
549
550	// __lazy_and
551
552	template <bool _Last, class ..._Preds>
553	struct __lazy_and_impl;
554
555	template <class ..._Preds>
556	struct __lazy_and_impl<false, _Preds...> : false_type {};
557
558	template <>
559	struct __lazy_and_impl<true> : true_type {};
560
561	template <class _Pred>
562	struct __lazy_and_impl<true, _Pred> : integral_constant<bool, _Pred::type::value> {};
563
564	template <class _Hp, class ..._Tp>
565	struct __lazy_and_impl<true, _Hp, _Tp...> : __lazy_and_impl<_Hp::type::value, _Tp...> {};
566
567	template <class _P1, class ..._Pr>
568	struct __lazy_and : __lazy_and_impl<_P1::type::value, _Pr...> {};
569
570	// __lazy_or
571
572	template <bool _List, class ..._Preds>
573	struct __lazy_or_impl;
574
575	template <class ..._Preds>
576	struct __lazy_or_impl<true, _Preds...> : true_type {};
577
578	template <>
579	struct __lazy_or_impl<false> : false_type {};
580
581	template <class _Hp, class ..._Tp>
582	struct __lazy_or_impl<false, _Hp, _Tp...>
583	: __lazy_or_impl<_Hp::type::value, _Tp...> {};
584
585	template <class _P1, class ..._Pr>
586	struct __lazy_or : __lazy_or_impl<_P1::type::value, _Pr...> {};
587
588	// __lazy_not
589
590	template <class _Pred>
591	struct __lazy_not : integral_constant<bool, !_Pred::type::value> {};
592
593	// __and_
594	template<class...> struct __and_;
595	template<> struct __and_<> : true_type {};
596
597	template<class _B0> struct __and_<_B0> : _B0 {};
598
599	template<class _B0, class _B1>
600	struct __and_<_B0, _B1> : conditional<_B0::value, _B1, _B0>::type {};
601
602	template<class _B0, class _B1, class _B2, class... _Bn>
603	struct __and_<_B0, _B1, _B2, _Bn...>
604	: conditional<_B0::value, __and_<_B1, _B2, _Bn...>, _B0>::type {};
605
606	// __or_
607	template<class...> struct __or_;
608	template<> struct __or_<> : false_type {};
609
610	template<class _B0> struct __or_<_B0> : _B0 {};
611
612	template<class _B0, class _B1>
613	struct __or_<_B0, _B1> : conditional<_B0::value, _B0, _B1>::type {};
614
615	template<class _B0, class _B1, class _B2, class... _Bn>
616	struct __or_<_B0, _B1, _B2, _Bn...>
617	: conditional<_B0::value, _B0, __or_<_B1, _B2, _Bn...> >::type {};
618
619	// __not_
620	template<class _Tp>
621	struct __not_ : conditional<_Tp::value, false_type, true_type>::type {};
622
623	#endif // !defined(_LIBCPP_CXX03_LANG)
624
625	// is_const	646	// is_const
626		647
627	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_const : public false_type {};	648	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_const : public false_type {};
...	@@ -774,8 +795,16 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_array_v	...	@@ -774,8 +795,16 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_array_v
774	template <class _Tp> struct __libcpp_is_pointer : public false_type {};	795	template <class _Tp> struct __libcpp_is_pointer : public false_type {};
775	template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};	796	template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};
776		797
		798	template <class _Tp> struct __libcpp_remove_objc_qualifiers { typedef _Tp type; };
		799	#if defined(_LIBCPP_HAS_OBJC_ARC)
		800	template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __strong> { typedef _Tp type; };
		801	template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __weak> { typedef _Tp type; };
		802	template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __autoreleasing> { typedef _Tp type; };
		803	template <class _Tp> struct __libcpp_remove_objc_qualifiers<_Tp __unsafe_unretained> { typedef _Tp type; };
		804	#endif
		805
777	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pointer	806	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pointer
778	: public __libcpp_is_pointer<typename remove_cv<_Tp>::type> {};	807	: public __libcpp_is_pointer<typename __libcpp_remove_objc_qualifiers<typename remove_cv<_Tp>::type>::type> {};
779		808
780	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	809	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
781	template <class _Tp>	810	template <class _Tp>
...	@@ -789,15 +818,11 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference : pub	...	@@ -789,15 +818,11 @@ template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference : pub
789	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference<_Tp&> : public true_type {};	818	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_lvalue_reference<_Tp&> : public true_type {};
790		819
791	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference : public false_type {};	820	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference : public false_type {};
792	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
793	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference<_Tp&&> : public true_type {};	821	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference<_Tp&&> : public true_type {};
794	#endif
795		822
796	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference : public false_type {};	823	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference : public false_type {};
797	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&> : public true_type {};	824	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&> : public true_type {};
798	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
799	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&&> : public true_type {};	825	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_reference<_Tp&&> : public true_type {};
800	#endif
801		826
802	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	827	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
803	template <class _Tp>	828	template <class _Tp>
...	@@ -814,7 +839,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_rvalue_reference_v	...	@@ -814,7 +839,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_rvalue_reference_v
814	#endif	839	#endif
815	// is_union	840	// is_union
816		841
817	#if __has_feature(is_union) \|\| (_GNUC_VER >= 403)	842	#if __has_feature(is_union) \|\| defined(_LIBCPP_COMPILER_GCC)
818		843
819	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_union	844	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_union
820	: public integral_constant<bool, __is_union(_Tp)> {};	845	: public integral_constant<bool, __is_union(_Tp)> {};
...	@@ -835,7 +860,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_union_v	...	@@ -835,7 +860,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_union_v
835		860
836	// is_class	861	// is_class
837		862
838	#if __has_feature(is_class) \|\| (_GNUC_VER >= 403)	863	#if __has_feature(is_class) \|\| defined(_LIBCPP_COMPILER_GCC)
839		864
840	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_class	865	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_class
841	: public integral_constant<bool, __is_class(_Tp)> {};	866	: public integral_constant<bool, __is_class(_Tp)> {};
...	@@ -859,17 +884,6 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_class_v	...	@@ -859,17 +884,6 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_class_v
859	= is_class<_Tp>::value;	884	= is_class<_Tp>::value;
860	#endif	885	#endif
861		886
862	// is_same
863
864	template <class _Tp, class _Up> struct _LIBCPP_TEMPLATE_VIS is_same : public false_type {};
865	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_same<_Tp, _Tp> : public true_type {};
866
867	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
868	template <class _Tp, class _Up>
869	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_same_v
870	= is_same<_Tp, _Up>::value;
871	#endif
872
873	// is_function	887	// is_function
874		888
875	namespace __libcpp_is_function_imp	889	namespace __libcpp_is_function_imp
...	@@ -957,7 +971,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_member_object_pointer_v	...	@@ -957,7 +971,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_member_object_pointer_v
957		971
958	// is_enum	972	// is_enum
959		973
960	#if __has_feature(is_enum) \|\| (_GNUC_VER >= 403)	974	#if __has_feature(is_enum) \|\| defined(_LIBCPP_COMPILER_GCC)
961		975
962	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_enum	976	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_enum
963	: public integral_constant<bool, __is_enum(_Tp)> {};	977	: public integral_constant<bool, __is_enum(_Tp)> {};
...	@@ -1061,7 +1075,7 @@ struct __is_referenceable_impl {	...	@@ -1061,7 +1075,7 @@ struct __is_referenceable_impl {
1061		1075
1062	template <class _Tp>	1076	template <class _Tp>
1063	struct __is_referenceable : integral_constant<bool,	1077	struct __is_referenceable : integral_constant<bool,
1064	!is_same<decltype(__is_referenceable_impl::__test<_Tp>(0)), __two>::value> {};	1078	_IsNotSame<decltype(__is_referenceable_impl::__test<_Tp>(0)), __two>::value> {};
1065		1079
1066		1080
1067	// add_const	1081	// add_const
...	@@ -1069,13 +1083,13 @@ struct __is_referenceable : integral_constant<bool,	...	@@ -1069,13 +1083,13 @@ struct __is_referenceable : integral_constant<bool,
1069	template <class _Tp, bool = is_reference<_Tp>::value \|\|	1083	template <class _Tp, bool = is_reference<_Tp>::value \|\|
1070	is_function<_Tp>::value \|\|	1084	is_function<_Tp>::value \|\|
1071	is_const<_Tp>::value >	1085	is_const<_Tp>::value >
1072	struct __add_const {typedef _Tp type;};	1086	struct __add_const {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1073		1087
1074	template <class _Tp>	1088	template <class _Tp>
1075	struct __add_const<_Tp, false> {typedef const _Tp type;};	1089	struct __add_const<_Tp, false> {typedef _LIBCPP_NODEBUG_TYPE const _Tp type;};
1076		1090
1077	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_const	1091	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_const
1078	{typedef typename __add_const<_Tp>::type type;};	1092	{typedef _LIBCPP_NODEBUG_TYPE typename __add_const<_Tp>::type type;};
1079		1093
1080	#if _LIBCPP_STD_VER > 11	1094	#if _LIBCPP_STD_VER > 11
1081	template <class _Tp> using add_const_t = typename add_const<_Tp>::type;	1095	template <class _Tp> using add_const_t = typename add_const<_Tp>::type;
...	@@ -1092,7 +1106,7 @@ template <class _Tp>	...	@@ -1092,7 +1106,7 @@ template <class _Tp>
1092	struct __add_volatile<_Tp, false> {typedef volatile _Tp type;};	1106	struct __add_volatile<_Tp, false> {typedef volatile _Tp type;};
1093		1107
1094	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_volatile	1108	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_volatile
1095	{typedef typename __add_volatile<_Tp>::type type;};	1109	{typedef _LIBCPP_NODEBUG_TYPE typename __add_volatile<_Tp>::type type;};
1096		1110
1097	#if _LIBCPP_STD_VER > 11	1111	#if _LIBCPP_STD_VER > 11
1098	template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;	1112	template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;
...	@@ -1101,7 +1115,7 @@ template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;	...	@@ -1101,7 +1115,7 @@ template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;
1101	// add_cv	1115	// add_cv
1102		1116
1103	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_cv	1117	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_cv
1104	{typedef typename add_const<typename add_volatile<_Tp>::type>::type type;};	1118	{typedef _LIBCPP_NODEBUG_TYPE typename add_const<typename add_volatile<_Tp>::type>::type type;};
1105		1119
1106	#if _LIBCPP_STD_VER > 11	1120	#if _LIBCPP_STD_VER > 11
1107	template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;	1121	template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;
...	@@ -1109,11 +1123,9 @@ template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;	...	@@ -1109,11 +1123,9 @@ template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;
1109		1123
1110	// remove_reference	1124	// remove_reference
1111		1125
1112	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _Tp type;};	1126	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1113	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _Tp type;};	1127	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1114	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES	1128	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1115	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _Tp type;};
1116	#endif
1117		1129
1118	#if _LIBCPP_STD_VER > 11	1130	#if _LIBCPP_STD_VER > 11
1119	template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::type;	1131	template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::type;
...	@@ -1121,32 +1133,26 @@ template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::	...	@@ -1121,32 +1133,26 @@ template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::
1121		1133
1122	// add_lvalue_reference	1134	// add_lvalue_reference
1123		1135
1124	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_lvalue_reference_impl { typedef _Tp type; };	1136	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_lvalue_reference_impl { typedef _LIBCPP_NODEBUG_TYPE _Tp type; };
1125	template <class _Tp > struct __add_lvalue_reference_impl<_Tp, true> { typedef _Tp& type; };	1137	template <class _Tp > struct __add_lvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG_TYPE _Tp& type; };
1126		1138
1127	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_lvalue_reference	1139	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_lvalue_reference
1128	{typedef typename __add_lvalue_reference_impl<_Tp>::type type;};	1140	{typedef _LIBCPP_NODEBUG_TYPE typename __add_lvalue_reference_impl<_Tp>::type type;};
1129		1141
1130	#if _LIBCPP_STD_VER > 11	1142	#if _LIBCPP_STD_VER > 11
1131	template <class _Tp> using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;	1143	template <class _Tp> using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;
1132	#endif	1144	#endif
1133		1145
1134	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES	1146	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_rvalue_reference_impl { typedef _LIBCPP_NODEBUG_TYPE _Tp type; };
1135		1147	template <class _Tp > struct __add_rvalue_reference_impl<_Tp, true> { typedef _LIBCPP_NODEBUG_TYPE _Tp&& type; };
1136	template <class _Tp, bool = __is_referenceable<_Tp>::value> struct __add_rvalue_reference_impl { typedef _Tp type; };
1137	template <class _Tp > struct __add_rvalue_reference_impl<_Tp, true> { typedef _Tp&& type; };
1138		1148
1139	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_rvalue_reference	1149	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_rvalue_reference
1140	{typedef typename __add_rvalue_reference_impl<_Tp>::type type;};	1150	{typedef _LIBCPP_NODEBUG_TYPE typename __add_rvalue_reference_impl<_Tp>::type type;};
1141		1151
1142	#if _LIBCPP_STD_VER > 11	1152	#if _LIBCPP_STD_VER > 11
1143	template <class _Tp> using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;	1153	template <class _Tp> using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;
1144	#endif	1154	#endif
1145		1155
1146	#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
1147
1148	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
1149
1150	template <class _Tp> _Tp&& __declval(int);	1156	template <class _Tp> _Tp&& __declval(int);
1151	template <class _Tp> _Tp __declval(long);	1157	template <class _Tp> _Tp __declval(long);
1152		1158
...	@@ -1154,35 +1160,27 @@ template <class _Tp>	...	@@ -1154,35 +1160,27 @@ template <class _Tp>
1154	decltype(_VSTD::__declval<_Tp>(0))	1160	decltype(_VSTD::__declval<_Tp>(0))
1155	declval() _NOEXCEPT;	1161	declval() _NOEXCEPT;
1156		1162
1157	#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
1158
1159	template <class _Tp>
1160	typename add_lvalue_reference<_Tp>::type
1161	declval();
1162
1163	#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
1164
1165	// __uncvref	1163	// __uncvref
1166		1164
1167	template <class _Tp>	1165	template <class _Tp>
1168	struct __uncvref {	1166	struct __uncvref {
1169	typedef typename remove_cv<typename remove_reference<_Tp>::type>::type type;	1167	typedef _LIBCPP_NODEBUG_TYPE typename remove_cv<typename remove_reference<_Tp>::type>::type type;
1170	};	1168	};
1171		1169
1172	template <class _Tp>	1170	template <class _Tp>
1173	struct __unconstref {	1171	struct __unconstref {
1174	typedef typename remove_const<typename remove_reference<_Tp>::type>::type type;	1172	typedef _LIBCPP_NODEBUG_TYPE typename remove_const<typename remove_reference<_Tp>::type>::type type;
1175	};	1173	};
1176		1174
1177	#ifndef _LIBCPP_CXX03_LANG	1175	#ifndef _LIBCPP_CXX03_LANG
1178	template <class _Tp>	1176	template <class _Tp>
1179	using __uncvref_t = typename __uncvref<_Tp>::type;	1177	using __uncvref_t _LIBCPP_NODEBUG_TYPE = typename __uncvref<_Tp>::type;
1180	#endif	1178	#endif
1181		1179
1182	// __is_same_uncvref	1180	// __is_same_uncvref
1183		1181
1184	template <class _Tp, class _Up>	1182	template <class _Tp, class _Up>
1185	struct __is_same_uncvref : is_same<typename __uncvref<_Tp>::type,	1183	struct __is_same_uncvref : _IsSame<typename __uncvref<_Tp>::type,
1186	typename __uncvref<_Up>::type> {};	1184	typename __uncvref<_Up>::type> {};
1187		1185
1188	#if _LIBCPP_STD_VER > 17	1186	#if _LIBCPP_STD_VER > 17
...	@@ -1201,11 +1199,11 @@ struct __any	...	@@ -1201,11 +1199,11 @@ struct __any
1201		1199
1202	// remove_pointer	1200	// remove_pointer
1203		1201
1204	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer {typedef _Tp type;};	1202	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1205	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp*> {typedef _Tp type;};	1203	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp*> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1206	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const> {typedef _Tp type;};	1204	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1207	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* volatile> {typedef _Tp type;};	1205	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* volatile> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1208	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const volatile> {typedef _Tp type;};	1206	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS remove_pointer<_Tp* const volatile> {typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1209		1207
1210	#if _LIBCPP_STD_VER > 11	1208	#if _LIBCPP_STD_VER > 11
1211	template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type;	1209	template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type;
...	@@ -1215,14 +1213,14 @@ template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type	...	@@ -1215,14 +1213,14 @@ template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type
1215		1213
1216	template <class _Tp,	1214	template <class _Tp,
1217	bool = __is_referenceable<_Tp>::value \|\|	1215	bool = __is_referenceable<_Tp>::value \|\|
1218	is_same<typename remove_cv<_Tp>::type, void>::value>	1216	_IsSame<typename remove_cv<_Tp>::type, void>::value>
1219	struct __add_pointer_impl	1217	struct __add_pointer_impl
1220	{typedef typename remove_reference<_Tp>::type* type;};	1218	{typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tp>::type* type;};
1221	template <class _Tp> struct __add_pointer_impl<_Tp, false>	1219	template <class _Tp> struct __add_pointer_impl<_Tp, false>
1222	{typedef _Tp type;};	1220	{typedef _LIBCPP_NODEBUG_TYPE _Tp type;};
1223		1221
1224	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_pointer	1222	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS add_pointer
1225	{typedef typename __add_pointer_impl<_Tp>::type type;};	1223	{typedef _LIBCPP_NODEBUG_TYPE typename __add_pointer_impl<_Tp>::type type;};
1226		1224
1227	#if _LIBCPP_STD_VER > 11	1225	#if _LIBCPP_STD_VER > 11
1228	template <class _Tp> using add_pointer_t = typename add_pointer<_Tp>::type;	1226	template <class _Tp> using add_pointer_t = typename add_pointer<_Tp>::type;
...	@@ -1336,17 +1334,37 @@ template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<	...	@@ -1336,17 +1334,37 @@ template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS remove_all_extents<
1336	template <class _Tp> using remove_all_extents_t = typename remove_all_extents<_Tp>::type;	1334	template <class _Tp> using remove_all_extents_t = typename remove_all_extents<_Tp>::type;
1337	#endif	1335	#endif
1338		1336
		1337	#if _LIBCPP_STD_VER > 17
		1338	// is_bounded_array
		1339
		1340	template <class> struct _LIBCPP_TEMPLATE_VIS is_bounded_array : false_type {};
		1341	template <class _Tp, size_t _Np> struct _LIBCPP_TEMPLATE_VIS is_bounded_array<_Tp[_Np]> : true_type {};
		1342
		1343	template <class _Tp>
		1344	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR
		1345	bool is_bounded_array_v = is_bounded_array<_Tp>::value;
		1346
		1347	// is_unbounded_array
		1348
		1349	template <class> struct _LIBCPP_TEMPLATE_VIS is_unbounded_array : false_type {};
		1350	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_unbounded_array<_Tp[]> : true_type {};
		1351
		1352	template <class _Tp>
		1353	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR
		1354	bool is_unbounded_array_v = is_unbounded_array<_Tp>::value;
		1355	#endif
		1356
1339	// decay	1357	// decay
1340		1358
1341	template <class _Up, bool>	1359	template <class _Up, bool>
1342	struct __decay {	1360	struct __decay {
1343	typedef typename remove_cv<_Up>::type type;	1361	typedef _LIBCPP_NODEBUG_TYPE typename remove_cv<_Up>::type type;
1344	};	1362	};
1345		1363
1346	template <class _Up>	1364	template <class _Up>
1347	struct __decay<_Up, true> {	1365	struct __decay<_Up, true> {
1348	public:	1366	public:
1349	typedef typename conditional	1367	typedef _LIBCPP_NODEBUG_TYPE typename conditional
1350	<	1368	<
1351	is_array<_Up>::value,	1369	is_array<_Up>::value,
1352	typename remove_extent<_Up>::type*,	1370	typename remove_extent<_Up>::type*,
...	@@ -1363,9 +1381,9 @@ template <class _Tp>	...	@@ -1363,9 +1381,9 @@ template <class _Tp>
1363	struct _LIBCPP_TEMPLATE_VIS decay	1381	struct _LIBCPP_TEMPLATE_VIS decay
1364	{	1382	{
1365	private:	1383	private:
1366	typedef typename remove_reference<_Tp>::type _Up;	1384	typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tp>::type _Up;
1367	public:	1385	public:
1368	typedef typename __decay<_Up, __is_referenceable<_Up>::value>::type type;	1386	typedef _LIBCPP_NODEBUG_TYPE typename __decay<_Up, __is_referenceable<_Up>::value>::type type;
1369	};	1387	};
1370		1388
1371	#if _LIBCPP_STD_VER > 11	1389	#if _LIBCPP_STD_VER > 11
...	@@ -1385,15 +1403,10 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_abstract_v	...	@@ -1385,15 +1403,10 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_abstract_v
1385		1403
1386	// is_final	1404	// is_final
1387		1405
1388	#if defined(_LIBCPP_HAS_IS_FINAL)
1389	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS	1406	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS
1390	__libcpp_is_final : public integral_constant<bool, __is_final(_Tp)> {};	1407	__libcpp_is_final : public integral_constant<bool, __is_final(_Tp)> {};
1391	#else
1392	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS
1393	__libcpp_is_final : public false_type {};
1394	#endif
1395		1408
1396	#if defined(_LIBCPP_HAS_IS_FINAL) && _LIBCPP_STD_VER > 11	1409	#if _LIBCPP_STD_VER > 11
1397	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS	1410	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS
1398	is_final : public integral_constant<bool, __is_final(_Tp)> {};	1411	is_final : public integral_constant<bool, __is_final(_Tp)> {};
1399	#endif	1412	#endif
...	@@ -1420,39 +1433,10 @@ _LIBCPP_INLINE_VAR constexpr bool is_aggregate_v	...	@@ -1420,39 +1433,10 @@ _LIBCPP_INLINE_VAR constexpr bool is_aggregate_v
1420		1433
1421	// is_base_of	1434	// is_base_of
1422		1435
1423	#ifdef _LIBCPP_HAS_IS_BASE_OF
1424
1425	template <class _Bp, class _Dp>	1436	template <class _Bp, class _Dp>
1426	struct _LIBCPP_TEMPLATE_VIS is_base_of	1437	struct _LIBCPP_TEMPLATE_VIS is_base_of
1427	: public integral_constant<bool, __is_base_of(_Bp, _Dp)> {};	1438	: public integral_constant<bool, __is_base_of(_Bp, _Dp)> {};
1428		1439
1429	#else // _LIBCPP_HAS_IS_BASE_OF
1430
1431	namespace __is_base_of_imp
1432	{
1433	template <class _Tp>
1434	struct _Dst
1435	{
1436	_Dst(const volatile _Tp &);
1437	};
1438	template <class _Tp>
1439	struct _Src
1440	{
1441	operator const volatile _Tp &();
1442	template <class _Up> operator const _Dst<_Up> &();
1443	};
1444	template <size_t> struct __one { typedef char type; };
1445	template <class _Bp, class _Dp> typename __one<sizeof(_Dst<_Bp>(declval<_Src<_Dp> >()))>::type __test(int);
1446	template <class _Bp, class _Dp> __two __test(...);
1447	}
1448
1449	template <class _Bp, class _Dp>
1450	struct _LIBCPP_TEMPLATE_VIS is_base_of
1451	: public integral_constant<bool, is_class<_Bp>::value &&
1452	sizeof(__is_base_of_imp::__test<_Bp, _Dp>(0)) == 2> {};
1453
1454	#endif // _LIBCPP_HAS_IS_BASE_OF
1455
1456	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	1440	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
1457	template <class _Bp, class _Dp>	1441	template <class _Bp, class _Dp>
1458	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_base_of_v	1442	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_base_of_v
...	@@ -1509,14 +1493,6 @@ template <class _T1, class _T2,	...	@@ -1509,14 +1493,6 @@ template <class _T1, class _T2,
1509	struct __is_convertible	1493	struct __is_convertible
1510	: public integral_constant<bool,	1494	: public integral_constant<bool,
1511	__is_convertible_imp::__is_convertible_test<_T1, _T2>::value	1495	__is_convertible_imp::__is_convertible_test<_T1, _T2>::value
1512	#if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
1513	&& !(!is_function<_T1>::value && !is_reference<_T1>::value && is_reference<_T2>::value
1514	&& (!is_const<typename remove_reference<_T2>::type>::value
1515	\|\| is_volatile<typename remove_reference<_T2>::type>::value)
1516	&& (is_same<typename remove_cv<_T1>::type,
1517	typename remove_cv<typename remove_reference<_T2>::type>::type>::value
1518	\|\| is_base_of<typename remove_reference<_T2>::type, _T1>::value))
1519	#endif
1520	>	1496	>
1521	{};	1497	{};
1522		1498
...	@@ -1550,9 +1526,35 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_convertible_v	...	@@ -1550,9 +1526,35 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_convertible_v
1550	= is_convertible<_From, _To>::value;	1526	= is_convertible<_From, _To>::value;
1551	#endif	1527	#endif
1552		1528
		1529	// is_nothrow_convertible
		1530
		1531	#if _LIBCPP_STD_VER > 17
		1532
		1533	template <typename _Tp>
		1534	static void __test_noexcept(_Tp) noexcept;
		1535
		1536	template<typename _Fm, typename _To>
		1537	static bool_constant<noexcept(__test_noexcept<_To>(declval<_Fm>()))>
		1538	__is_nothrow_convertible_test();
		1539
		1540	template <typename _Fm, typename _To>
		1541	struct __is_nothrow_convertible_helper: decltype(__is_nothrow_convertible_test<_Fm, _To>())
		1542	{ };
		1543
		1544	template <typename _Fm, typename _To>
		1545	struct is_nothrow_convertible : _Or<
		1546	_And<is_void<_To>, is_void<_Fm>>,
		1547	_Lazy<_And, is_convertible<_Fm, _To>, __is_nothrow_convertible_helper<_Fm, _To>>
		1548	>::type { };
		1549
		1550	template <typename _Fm, typename _To>
		1551	inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<_Fm, _To>::value;
		1552
		1553	#endif // _LIBCPP_STD_VER > 17
		1554
1553	// is_empty	1555	// is_empty
1554		1556
1555	#if __has_feature(is_empty) \|\| (_GNUC_VER >= 407)	1557	#if __has_feature(is_empty) \|\| defined(_LIBCPP_COMPILER_GCC)
1556		1558
1557	template <class _Tp>	1559	template <class _Tp>
1558	struct _LIBCPP_TEMPLATE_VIS is_empty	1560	struct _LIBCPP_TEMPLATE_VIS is_empty
...	@@ -1615,7 +1617,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_polymorphic_v	...	@@ -1615,7 +1617,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_polymorphic_v
1615		1617
1616	// has_virtual_destructor	1618	// has_virtual_destructor
1617		1619
1618	#if __has_feature(has_virtual_destructor) \|\| (_GNUC_VER >= 403)	1620	#if __has_feature(has_virtual_destructor) \|\| defined(_LIBCPP_COMPILER_GCC)
1619		1621
1620	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS has_virtual_destructor	1622	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS has_virtual_destructor
1621	: public integral_constant<bool, __has_virtual_destructor(_Tp)> {};	1623	: public integral_constant<bool, __has_virtual_destructor(_Tp)> {};
...	@@ -1703,6 +1705,9 @@ typedef	...	@@ -1703,6 +1705,9 @@ typedef
1703	__nat	1705	__nat
1704	> > > > > > > > > > __all_types;	1706	> > > > > > > > > > __all_types;
1705		1707
		1708	template <size_t _Align>
		1709	struct _ALIGNAS(_Align) __fallback_overaligned {};
		1710
1706	template <class _TL, size_t _Align> struct __find_pod;	1711	template <class _TL, size_t _Align> struct __find_pod;
1707		1712
1708	template <class _Hp, size_t _Align>	1713	template <class _Hp, size_t _Align>
...	@@ -1711,7 +1716,7 @@ struct __find_pod<__type_list<_Hp, __nat>, _Align>	...	@@ -1711,7 +1716,7 @@ struct __find_pod<__type_list<_Hp, __nat>, _Align>
1711	typedef typename conditional<	1716	typedef typename conditional<
1712	_Align == _Hp::value,	1717	_Align == _Hp::value,
1713	typename _Hp::type,	1718	typename _Hp::type,
1714	void	1719	__fallback_overaligned<_Align>
1715	>::type type;	1720	>::type type;
1716	};	1721	};
1717		1722
...	@@ -1748,7 +1753,6 @@ template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::valu	...	@@ -1748,7 +1753,6 @@ template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::valu
1748	struct _LIBCPP_TEMPLATE_VIS aligned_storage	1753	struct _LIBCPP_TEMPLATE_VIS aligned_storage
1749	{	1754	{
1750	typedef typename __find_pod<__all_types, _Align>::type _Aligner;	1755	typedef typename __find_pod<__all_types, _Align>::type _Aligner;
1751	static_assert(!is_void<_Aligner>::value, "");
1752	union type	1756	union type
1753	{	1757	{
1754	_Aligner __align;	1758	_Aligner __align;
...	@@ -1792,7 +1796,6 @@ _CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);	...	@@ -1792,7 +1796,6 @@ _CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);
1792		1796
1793	#undef _CREATE_ALIGNED_STORAGE_SPECIALIZATION	1797	#undef _CREATE_ALIGNED_STORAGE_SPECIALIZATION
1794		1798
1795	#ifndef _LIBCPP_HAS_NO_VARIADICS
1796		1799
1797	// aligned_union	1800	// aligned_union
1798		1801
...	@@ -1826,8 +1829,6 @@ struct aligned_union	...	@@ -1826,8 +1829,6 @@ struct aligned_union
1826	template <size_t _Len, class ..._Types> using aligned_union_t = typename aligned_union<_Len, _Types...>::type;	1829	template <size_t _Len, class ..._Types> using aligned_union_t = typename aligned_union<_Len, _Types...>::type;
1827	#endif	1830	#endif
1828		1831
1829	#endif // _LIBCPP_HAS_NO_VARIADICS
1830
1831	template <class _Tp>	1832	template <class _Tp>
1832	struct __numeric_type	1833	struct __numeric_type
1833	{	1834	{
...	@@ -1844,7 +1845,7 @@ struct __numeric_type	...	@@ -1844,7 +1845,7 @@ struct __numeric_type
1844	static long double __test(long double);	1845	static long double __test(long double);
1845		1846
1846	typedef decltype(__test(declval<_Tp>())) type;	1847	typedef decltype(__test(declval<_Tp>())) type;
1847	static const bool value = !is_same<type, void>::value;	1848	static const bool value = _IsNotSame<type, void>::value;
1848	};	1849	};
1849		1850
1850	template <>	1851	template <>
...	@@ -1936,26 +1937,26 @@ template <class _TypeList, size_t _Size, bool = _Size <= sizeof(typename _TypeLi	...	@@ -1936,26 +1937,26 @@ template <class _TypeList, size_t _Size, bool = _Size <= sizeof(typename _TypeLi
1936	template <class _Hp, class _Tp, size_t _Size>	1937	template <class _Hp, class _Tp, size_t _Size>
1937	struct __find_first<__type_list<_Hp, _Tp>, _Size, true>	1938	struct __find_first<__type_list<_Hp, _Tp>, _Size, true>
1938	{	1939	{
1939	typedef _Hp type;	1940	typedef _LIBCPP_NODEBUG_TYPE _Hp type;
1940	};	1941	};
1941		1942
1942	template <class _Hp, class _Tp, size_t _Size>	1943	template <class _Hp, class _Tp, size_t _Size>
1943	struct __find_first<__type_list<_Hp, _Tp>, _Size, false>	1944	struct __find_first<__type_list<_Hp, _Tp>, _Size, false>
1944	{	1945	{
1945	typedef typename __find_first<_Tp, _Size>::type type;	1946	typedef _LIBCPP_NODEBUG_TYPE typename __find_first<_Tp, _Size>::type type;
1946	};	1947	};
1947		1948
1948	template <class _Tp, class _Up, bool = is_const<typename remove_reference<_Tp>::type>::value,	1949	template <class _Tp, class _Up, bool = is_const<typename remove_reference<_Tp>::type>::value,
1949	bool = is_volatile<typename remove_reference<_Tp>::type>::value>	1950	bool = is_volatile<typename remove_reference<_Tp>::type>::value>
1950	struct __apply_cv	1951	struct __apply_cv
1951	{	1952	{
1952	typedef _Up type;	1953	typedef _LIBCPP_NODEBUG_TYPE _Up type;
1953	};	1954	};
1954		1955
1955	template <class _Tp, class _Up>	1956	template <class _Tp, class _Up>
1956	struct __apply_cv<_Tp, _Up, true, false>	1957	struct __apply_cv<_Tp, _Up, true, false>
1957	{	1958	{
1958	typedef const _Up type;	1959	typedef _LIBCPP_NODEBUG_TYPE const _Up type;
1959	};	1960	};
1960		1961
1961	template <class _Tp, class _Up>	1962	template <class _Tp, class _Up>
...	@@ -2060,43 +2061,63 @@ struct _LIBCPP_TEMPLATE_VIS make_unsigned	...	@@ -2060,43 +2061,63 @@ struct _LIBCPP_TEMPLATE_VIS make_unsigned
2060	template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;	2061	template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
2061	#endif	2062	#endif
2062		2063
2063	#ifdef _LIBCPP_HAS_NO_VARIADICS	2064	template <class _Tp, class _Up, class = void>
		2065	struct __common_type2_imp {};
2064		2066
2065	template <class _Tp, class _Up = void, class _Vp = void>	2067	template <class _Tp, class _Up>
2066	struct _LIBCPP_TEMPLATE_VIS common_type	2068	struct __common_type2_imp<_Tp, _Up,
		2069	typename __void_t<decltype(
		2070	true ? _VSTD::declval<_Tp>() : _VSTD::declval<_Up>()
		2071	)>::type>
2067	{	2072	{
2068	public:	2073	typedef _LIBCPP_NODEBUG_TYPE typename decay<decltype(
2069	typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp>::type type;	2074	true ? _VSTD::declval<_Tp>() : _VSTD::declval<_Up>()
		2075	)>::type type;
2070	};	2076	};
2071		2077
2072	template <>	2078	template <class, class = void>
2073	struct _LIBCPP_TEMPLATE_VIS common_type<void, void, void>	2079	struct __common_type_impl {};
2074	{
2075	public:
2076	typedef void type;
2077	};
2078		2080
2079	template <class _Tp>	2081	// Clang provides variadic templates in C++03 as an extension.
2080	struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, void, void>	2082	#if !defined(_LIBCPP_CXX03_LANG) \|\| defined(__clang__)
2081	{	2083	# define _LIBCPP_OPTIONAL_PACK(...) , __VA_ARGS__
2082	public:	2084	template <class... Tp>
2083	typedef typename common_type<_Tp, _Tp>::type type;	2085	struct __common_types;
2084	};	2086	template <class... _Tp>
		2087	struct _LIBCPP_TEMPLATE_VIS common_type;
		2088	#else
		2089	# define _LIBCPP_OPTIONAL_PACK(...)
		2090	struct __no_arg;
		2091	template <class _Tp, class _Up, class = __no_arg>
		2092	struct __common_types;
		2093	template <class _Tp = __no_arg, class _Up = __no_arg, class _Vp = __no_arg,
		2094	class _Unused = __no_arg>
		2095	struct common_type {
		2096	static_assert(sizeof(_Unused) == 0,
		2097	"common_type accepts at most 3 arguments in C++03");
		2098	};
		2099	#endif // _LIBCPP_CXX03_LANG
2085		2100
2086	template <class _Tp, class _Up>	2101	template <class _Tp, class _Up>
2087	struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, _Up, void>	2102	struct __common_type_impl<
		2103	__common_types<_Tp, _Up>,
		2104	typename __void_t<typename common_type<_Tp, _Up>::type>::type>
2088	{	2105	{
2089	typedef typename decay<decltype(	2106	typedef typename common_type<_Tp, _Up>::type type;
2090	true ? _VSTD::declval<_Tp>() : _VSTD::declval<_Up>()
2091	)>::type type;
2092	};	2107	};
2093		2108
2094	#else // _LIBCPP_HAS_NO_VARIADICS	2109	template <class _Tp, class _Up, class _Vp _LIBCPP_OPTIONAL_PACK(class... _Rest)>
		2110	struct __common_type_impl<
		2111	__common_types<_Tp, _Up, _Vp _LIBCPP_OPTIONAL_PACK(_Rest...)>,
		2112	typename __void_t<typename common_type<_Tp, _Up>::type>::type>
		2113	: __common_type_impl<__common_types<typename common_type<_Tp, _Up>::type,
		2114	_Vp _LIBCPP_OPTIONAL_PACK(_Rest...)> > {
		2115	};
2095		2116
2096	// bullet 1 - sizeof...(Tp) == 0	2117	// bullet 1 - sizeof...(Tp) == 0
2097		2118
2098	template <class ..._Tp>	2119	template <>
2099	struct _LIBCPP_TEMPLATE_VIS common_type {};	2120	struct _LIBCPP_TEMPLATE_VIS common_type<> {};
2100		2121
2101	// bullet 2 - sizeof...(Tp) == 1	2122	// bullet 2 - sizeof...(Tp) == 1
2102		2123
...	@@ -2106,71 +2127,32 @@ struct _LIBCPP_TEMPLATE_VIS common_type<_Tp>	...	@@ -2106,71 +2127,32 @@ struct _LIBCPP_TEMPLATE_VIS common_type<_Tp>
2106		2127
2107	// bullet 3 - sizeof...(Tp) == 2	2128	// bullet 3 - sizeof...(Tp) == 2
2108		2129
2109	template <class _Tp, class _Up, class = void>
2110	struct __common_type2_imp {};
2111
2112	template <class _Tp, class _Up>
2113	struct __common_type2_imp<_Tp, _Up,
2114	typename __void_t<decltype(
2115	true ? _VSTD::declval<_Tp>() : _VSTD::declval<_Up>()
2116	)>::type>
2117	{
2118	typedef typename decay<decltype(
2119	true ? _VSTD::declval<_Tp>() : _VSTD::declval<_Up>()
2120	)>::type type;
2121	};
2122
2123	template <class _Tp, class _Up,
2124	class _DTp = typename decay<_Tp>::type,
2125	class _DUp = typename decay<_Up>::type>
2126	using __common_type2 =
2127	typename conditional<
2128	is_same<_Tp, _DTp>::value && is_same<_Up, _DUp>::value,
2129	__common_type2_imp<_Tp, _Up>,
2130	common_type<_DTp, _DUp>
2131	>::type;
2132
2133	template <class _Tp, class _Up>	2130	template <class _Tp, class _Up>
2134	struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, _Up>	2131	struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, _Up>
2135	: __common_type2<_Tp, _Up> {};	2132	: conditional<
		2133	_IsSame<_Tp, typename decay<_Tp>::type>::value && _IsSame<_Up, typename decay<_Up>::type>::value,
		2134	__common_type2_imp<_Tp, _Up>,
		2135	common_type<typename decay<_Tp>::type, typename decay<_Up>::type>
		2136	>::type
		2137	{};
2136		2138
2137	// bullet 4 - sizeof...(Tp) > 2	2139	// bullet 4 - sizeof...(Tp) > 2
2138		2140
2139	template <class ...Tp> struct __common_types;	2141	template <class _Tp, class _Up, class _Vp _LIBCPP_OPTIONAL_PACK(class... _Rest)>
2140		2142	struct _LIBCPP_TEMPLATE_VIS
2141	template <class, class = void>	2143	common_type<_Tp, _Up, _Vp _LIBCPP_OPTIONAL_PACK(_Rest...)>
2142	struct __common_type_impl {};	2144	: __common_type_impl<
2143		2145	__common_types<_Tp, _Up, _Vp _LIBCPP_OPTIONAL_PACK(_Rest...)> > {};
2144	template <class _Tp, class _Up>
2145	struct __common_type_impl<
2146	__common_types<_Tp, _Up>,
2147	typename __void_t<typename common_type<_Tp, _Up>::type>::type>
2148	{
2149	typedef typename common_type<_Tp, _Up>::type type;
2150	};
2151
2152	template <class _Tp, class _Up, class ..._Vp>
2153	struct __common_type_impl<__common_types<_Tp, _Up, _Vp...>,
2154	typename __void_t<typename common_type<_Tp, _Up>::type>::type>
2155	: __common_type_impl<
2156	__common_types<typename common_type<_Tp, _Up>::type, _Vp...> >
2157	{
2158
2159	};
2160		2146
2161	template <class _Tp, class _Up, class ..._Vp>	2147	#undef _LIBCPP_OPTIONAL_PACK
2162	struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, _Up, _Vp...>
2163	: __common_type_impl<__common_types<_Tp, _Up, _Vp...> > {};
2164		2148
2165	#if _LIBCPP_STD_VER > 11	2149	#if _LIBCPP_STD_VER > 11
2166	template <class ..._Tp> using common_type_t = typename common_type<_Tp...>::type;	2150	template <class ..._Tp> using common_type_t = typename common_type<_Tp...>::type;
2167	#endif	2151	#endif
2168		2152
2169	#endif // _LIBCPP_HAS_NO_VARIADICS
2170
2171	// is_assignable	2153	// is_assignable
2172		2154
2173	template<typename, typename _Tp> struct __select_2nd { typedef _Tp type; };	2155	template<typename, typename _Tp> struct __select_2nd { typedef _LIBCPP_NODEBUG_TYPE _Tp type; };
2174		2156
2175	template <class _Tp, class _Arg>	2157	template <class _Tp, class _Arg>
2176	typename __select_2nd<decltype((_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>())), true_type>::type	2158	typename __select_2nd<decltype((_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>())), true_type>::type
...	@@ -2215,12 +2197,8 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_copy_assignable_v	...	@@ -2215,12 +2197,8 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_copy_assignable_v
2215	// is_move_assignable	2197	// is_move_assignable
2216		2198
2217	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_move_assignable	2199	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_move_assignable
2218	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
2219	: public is_assignable<typename add_lvalue_reference<_Tp>::type,	2200	: public is_assignable<typename add_lvalue_reference<_Tp>::type,
2220	typename add_rvalue_reference<_Tp>::type> {};	2201	typename add_rvalue_reference<_Tp>::type> {};
2221	#else
2222	: public is_copy_assignable<_Tp> {};
2223	#endif
2224		2202
2225	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	2203	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
2226	template <class _Tp>	2204	template <class _Tp>
...	@@ -2294,14 +2272,12 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_destructible_v	...	@@ -2294,14 +2272,12 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_destructible_v
2294		2272
2295	// move	2273	// move
2296		2274
2297	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
2298
2299	template <class _Tp>	2275	template <class _Tp>
2300	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR	2276	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
2301	typename remove_reference<_Tp>::type&&	2277	typename remove_reference<_Tp>::type&&
2302	move(_Tp&& __t) _NOEXCEPT	2278	move(_Tp&& __t) _NOEXCEPT
2303	{	2279	{
2304	typedef typename remove_reference<_Tp>::type _Up;	2280	typedef _LIBCPP_NODEBUG_TYPE typename remove_reference<_Tp>::type _Up;
2305	return static_cast<_Up&&>(__t);	2281	return static_cast<_Up&&>(__t);
2306	}	2282	}
2307		2283
...	@@ -2323,81 +2299,24 @@ forward(typename remove_reference<_Tp>::type&& __t) _NOEXCEPT	...	@@ -2323,81 +2299,24 @@ forward(typename remove_reference<_Tp>::type&& __t) _NOEXCEPT
2323	return static_cast<_Tp&&>(__t);	2299	return static_cast<_Tp&&>(__t);
2324	}	2300	}
2325		2301
2326	#else // _LIBCPP_HAS_NO_RVALUE_REFERENCES
2327
2328	template <class _Tp>	2302	template <class _Tp>
2329	inline _LIBCPP_INLINE_VISIBILITY	2303	inline _LIBCPP_INLINE_VISIBILITY
2330	_Tp&	2304	typename decay<_Tp>::type
2331	move(_Tp& __t)	2305	__decay_copy(_Tp&& __t)
2332	{	2306	{
2333	return __t;	2307	return _VSTD::forward<_Tp>(__t);
2334	}	2308	}
2335		2309
2336	template <class _Tp>	2310	template <class _Rp, class _Class, class ..._Param>
2337	inline _LIBCPP_INLINE_VISIBILITY	2311	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...), true, false>
2338	const _Tp&
2339	move(const _Tp& __t)
2340	{	2312	{
2341	return __t;	2313	typedef _Class _ClassType;
2342	}	2314	typedef _Rp _ReturnType;
		2315	typedef _Rp (_FnType) (_Param...);
		2316	};
2343		2317
2344	template <class _Tp>	2318	template <class _Rp, class _Class, class ..._Param>
2345	inline _LIBCPP_INLINE_VISIBILITY	2319	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...), true, false>
2346	_Tp&
2347	forward(typename remove_reference<_Tp>::type& __t) _NOEXCEPT
2348	{
2349	return __t;
2350	}
2351
2352
2353	template <class _Tp>
2354	class __rv
2355	{
2356	typedef typename remove_reference<_Tp>::type _Trr;
2357	_Trr& t_;
2358	public:
2359	_LIBCPP_INLINE_VISIBILITY
2360	_Trr* operator->() {return &t_;}
2361	_LIBCPP_INLINE_VISIBILITY
2362	explicit __rv(_Trr& __t) : t_(__t) {}
2363	};
2364
2365	#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
2366
2367	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
2368
2369	template <class _Tp>
2370	inline _LIBCPP_INLINE_VISIBILITY
2371	typename decay<_Tp>::type
2372	__decay_copy(_Tp&& __t)
2373	{
2374	return _VSTD::forward<_Tp>(__t);
2375	}
2376
2377	#else
2378
2379	template <class _Tp>
2380	inline _LIBCPP_INLINE_VISIBILITY
2381	typename decay<_Tp>::type
2382	__decay_copy(const _Tp& __t)
2383	{
2384	return _VSTD::forward<_Tp>(__t);
2385	}
2386
2387	#endif
2388
2389	#ifndef _LIBCPP_HAS_NO_VARIADICS
2390
2391	template <class _Rp, class _Class, class ..._Param>
2392	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...), true, false>
2393	{
2394	typedef _Class _ClassType;
2395	typedef _Rp _ReturnType;
2396	typedef _Rp (_FnType) (_Param...);
2397	};
2398
2399	template <class _Rp, class _Class, class ..._Param>
2400	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...), true, false>
2401	{	2320	{
2402	typedef _Class _ClassType;	2321	typedef _Class _ClassType;
2403	typedef _Rp _ReturnType;	2322	typedef _Rp _ReturnType;
...	@@ -2452,8 +2371,7 @@ struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatil	...	@@ -2452,8 +2371,7 @@ struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatil
2452	typedef _Rp (_FnType) (_Param..., ...);	2371	typedef _Rp (_FnType) (_Param..., ...);
2453	};	2372	};
2454		2373
2455	#if __has_feature(cxx_reference_qualified_functions) \|\| \	2374	#if __has_feature(cxx_reference_qualified_functions) \|\| defined(_LIBCPP_COMPILER_GCC)
2456	(defined(_GNUC_VER) && _GNUC_VER >= 409)
2457		2375
2458	template <class _Rp, class _Class, class ..._Param>	2376	template <class _Rp, class _Class, class ..._Param>
2459	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &, true, false>	2377	struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &, true, false>
...	@@ -2583,267 +2501,8 @@ struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatil	...	@@ -2583,267 +2501,8 @@ struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatil
2583	typedef _Rp (_FnType) (_Param..., ...);	2501	typedef _Rp (_FnType) (_Param..., ...);
2584	};	2502	};
2585		2503
2586	#endif // __has_feature(cxx_reference_qualified_functions) \|\| _GNUC_VER >= 409	2504	#endif // __has_feature(cxx_reference_qualified_functions) \|\| defined(_LIBCPP_COMPILER_GCC)
2587
2588	#else // _LIBCPP_HAS_NO_VARIADICS
2589
2590	template <class _Rp, class _Class>
2591	struct __member_pointer_traits_imp<_Rp (_Class::*)(), true, false>
2592	{
2593	typedef _Class _ClassType;
2594	typedef _Rp _ReturnType;
2595	typedef _Rp (_FnType) ();
2596	};
2597
2598	template <class _Rp, class _Class>
2599	struct __member_pointer_traits_imp<_Rp (_Class::*)(...), true, false>
2600	{
2601	typedef _Class _ClassType;
2602	typedef _Rp _ReturnType;
2603	typedef _Rp (_FnType) (...);
2604	};
2605
2606	template <class _Rp, class _Class, class _P0>
2607	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0), true, false>
2608	{
2609	typedef _Class _ClassType;
2610	typedef _Rp _ReturnType;
2611	typedef _Rp (_FnType) (_P0);
2612	};
2613
2614	template <class _Rp, class _Class, class _P0>
2615	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...), true, false>
2616	{
2617	typedef _Class _ClassType;
2618	typedef _Rp _ReturnType;
2619	typedef _Rp (_FnType) (_P0, ...);
2620	};
2621
2622	template <class _Rp, class _Class, class _P0, class _P1>
2623	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1), true, false>
2624	{
2625	typedef _Class _ClassType;
2626	typedef _Rp _ReturnType;
2627	typedef _Rp (_FnType) (_P0, _P1);
2628	};
2629
2630	template <class _Rp, class _Class, class _P0, class _P1>
2631	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...), true, false>
2632	{
2633	typedef _Class _ClassType;
2634	typedef _Rp _ReturnType;
2635	typedef _Rp (_FnType) (_P0, _P1, ...);
2636	};
2637
2638	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2639	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2), true, false>
2640	{
2641	typedef _Class _ClassType;
2642	typedef _Rp _ReturnType;
2643	typedef _Rp (_FnType) (_P0, _P1, _P2);
2644	};
2645
2646	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2647	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...), true, false>
2648	{
2649	typedef _Class _ClassType;
2650	typedef _Rp _ReturnType;
2651	typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
2652	};
2653
2654	template <class _Rp, class _Class>
2655	struct __member_pointer_traits_imp<_Rp (_Class::*)() const, true, false>
2656	{
2657	typedef _Class const _ClassType;
2658	typedef _Rp _ReturnType;
2659	typedef _Rp (_FnType) ();
2660	};
2661
2662	template <class _Rp, class _Class>
2663	struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const, true, false>
2664	{
2665	typedef _Class const _ClassType;
2666	typedef _Rp _ReturnType;
2667	typedef _Rp (_FnType) (...);
2668	};
2669
2670	template <class _Rp, class _Class, class _P0>
2671	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const, true, false>
2672	{
2673	typedef _Class const _ClassType;
2674	typedef _Rp _ReturnType;
2675	typedef _Rp (_FnType) (_P0);
2676	};
2677
2678	template <class _Rp, class _Class, class _P0>
2679	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const, true, false>
2680	{
2681	typedef _Class const _ClassType;
2682	typedef _Rp _ReturnType;
2683	typedef _Rp (_FnType) (_P0, ...);
2684	};
2685
2686	template <class _Rp, class _Class, class _P0, class _P1>
2687	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const, true, false>
2688	{
2689	typedef _Class const _ClassType;
2690	typedef _Rp _ReturnType;
2691	typedef _Rp (_FnType) (_P0, _P1);
2692	};
2693
2694	template <class _Rp, class _Class, class _P0, class _P1>
2695	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const, true, false>
2696	{
2697	typedef _Class const _ClassType;
2698	typedef _Rp _ReturnType;
2699	typedef _Rp (_FnType) (_P0, _P1, ...);
2700	};
2701
2702	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2703	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const, true, false>
2704	{
2705	typedef _Class const _ClassType;
2706	typedef _Rp _ReturnType;
2707	typedef _Rp (_FnType) (_P0, _P1, _P2);
2708	};
2709
2710	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2711	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const, true, false>
2712	{
2713	typedef _Class const _ClassType;
2714	typedef _Rp _ReturnType;
2715	typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
2716	};
2717
2718	template <class _Rp, class _Class>
2719	struct __member_pointer_traits_imp<_Rp (_Class::*)() volatile, true, false>
2720	{
2721	typedef _Class volatile _ClassType;
2722	typedef _Rp _ReturnType;
2723	typedef _Rp (_FnType) ();
2724	};
2725
2726	template <class _Rp, class _Class>
2727	struct __member_pointer_traits_imp<_Rp (_Class::*)(...) volatile, true, false>
2728	{
2729	typedef _Class volatile _ClassType;
2730	typedef _Rp _ReturnType;
2731	typedef _Rp (_FnType) (...);
2732	};
2733
2734	template <class _Rp, class _Class, class _P0>
2735	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) volatile, true, false>
2736	{
2737	typedef _Class volatile _ClassType;
2738	typedef _Rp _ReturnType;
2739	typedef _Rp (_FnType) (_P0);
2740	};
2741
2742	template <class _Rp, class _Class, class _P0>
2743	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) volatile, true, false>
2744	{
2745	typedef _Class volatile _ClassType;
2746	typedef _Rp _ReturnType;
2747	typedef _Rp (_FnType) (_P0, ...);
2748	};
2749
2750	template <class _Rp, class _Class, class _P0, class _P1>
2751	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) volatile, true, false>
2752	{
2753	typedef _Class volatile _ClassType;
2754	typedef _Rp _ReturnType;
2755	typedef _Rp (_FnType) (_P0, _P1);
2756	};
2757
2758	template <class _Rp, class _Class, class _P0, class _P1>
2759	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) volatile, true, false>
2760	{
2761	typedef _Class volatile _ClassType;
2762	typedef _Rp _ReturnType;
2763	typedef _Rp (_FnType) (_P0, _P1, ...);
2764	};
2765
2766	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2767	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) volatile, true, false>
2768	{
2769	typedef _Class volatile _ClassType;
2770	typedef _Rp _ReturnType;
2771	typedef _Rp (_FnType) (_P0, _P1, _P2);
2772	};
2773
2774	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2775	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) volatile, true, false>
2776	{
2777	typedef _Class volatile _ClassType;
2778	typedef _Rp _ReturnType;
2779	typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
2780	};
2781
2782	template <class _Rp, class _Class>
2783	struct __member_pointer_traits_imp<_Rp (_Class::*)() const volatile, true, false>
2784	{
2785	typedef _Class const volatile _ClassType;
2786	typedef _Rp _ReturnType;
2787	typedef _Rp (_FnType) ();
2788	};
2789
2790	template <class _Rp, class _Class>
2791	struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const volatile, true, false>
2792	{
2793	typedef _Class const volatile _ClassType;
2794	typedef _Rp _ReturnType;
2795	typedef _Rp (_FnType) (...);
2796	};
2797
2798	template <class _Rp, class _Class, class _P0>
2799	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const volatile, true, false>
2800	{
2801	typedef _Class const volatile _ClassType;
2802	typedef _Rp _ReturnType;
2803	typedef _Rp (_FnType) (_P0);
2804	};
2805
2806	template <class _Rp, class _Class, class _P0>
2807	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const volatile, true, false>
2808	{
2809	typedef _Class const volatile _ClassType;
2810	typedef _Rp _ReturnType;
2811	typedef _Rp (_FnType) (_P0, ...);
2812	};
2813
2814	template <class _Rp, class _Class, class _P0, class _P1>
2815	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const volatile, true, false>
2816	{
2817	typedef _Class const volatile _ClassType;
2818	typedef _Rp _ReturnType;
2819	typedef _Rp (_FnType) (_P0, _P1);
2820	};
2821
2822	template <class _Rp, class _Class, class _P0, class _P1>
2823	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const volatile, true, false>
2824	{
2825	typedef _Class const volatile _ClassType;
2826	typedef _Rp _ReturnType;
2827	typedef _Rp (_FnType) (_P0, _P1, ...);
2828	};
2829
2830	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2831	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const volatile, true, false>
2832	{
2833	typedef _Class const volatile _ClassType;
2834	typedef _Rp _ReturnType;
2835	typedef _Rp (_FnType) (_P0, _P1, _P2);
2836	};
2837
2838	template <class _Rp, class _Class, class _P0, class _P1, class _P2>
2839	struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const volatile, true, false>
2840	{
2841	typedef _Class const volatile _ClassType;
2842	typedef _Rp _ReturnType;
2843	typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
2844	};
2845		2505
2846	#endif // _LIBCPP_HAS_NO_VARIADICS
2847		2506
2848	template <class _Rp, class _Class>	2507	template <class _Rp, class _Class>
2849	struct __member_pointer_traits_imp<_Rp _Class::*, false, true>	2508	struct __member_pointer_traits_imp<_Rp _Class::*, false, true>
...	@@ -3042,10 +2701,10 @@ struct __is_invalid_base_to_derived_cast {	...	@@ -3042,10 +2701,10 @@ struct __is_invalid_base_to_derived_cast {
3042	static_assert(is_reference<_To>::value, "Wrong specialization");	2701	static_assert(is_reference<_To>::value, "Wrong specialization");
3043	using _RawFrom = __uncvref_t<_From>;	2702	using _RawFrom = __uncvref_t<_From>;
3044	using _RawTo = __uncvref_t<_To>;	2703	using _RawTo = __uncvref_t<_To>;
3045	static const bool value = __lazy_and<	2704	static const bool value = _And<
3046	__lazy_not<is_same<_RawFrom, _RawTo>>,	2705	_IsNotSame<_RawFrom, _RawTo>,
3047	is_base_of<_RawFrom, _RawTo>,	2706	is_base_of<_RawFrom, _RawTo>,
3048	__lazy_not<__libcpp_is_constructible<_RawTo, _From>>	2707	_Not<__libcpp_is_constructible<_RawTo, _From>>
3049	>::value;	2708	>::value;
3050	};	2709	};
3051		2710
...	@@ -3058,10 +2717,10 @@ template <class _ToRef, class _FromRef>	...	@@ -3058,10 +2717,10 @@ template <class _ToRef, class _FromRef>
3058	struct __is_invalid_lvalue_to_rvalue_cast<_ToRef&&, _FromRef&> {	2717	struct __is_invalid_lvalue_to_rvalue_cast<_ToRef&&, _FromRef&> {
3059	using _RawFrom = __uncvref_t<_FromRef>;	2718	using _RawFrom = __uncvref_t<_FromRef>;
3060	using _RawTo = __uncvref_t<_ToRef>;	2719	using _RawTo = __uncvref_t<_ToRef>;
3061	static const bool value = __lazy_and<	2720	static const bool value = _And<
3062	__lazy_not<is_function<_RawTo>>,	2721	_Not<is_function<_RawTo>>,
3063	__lazy_or<	2722	_Or<
3064	is_same<_RawFrom, _RawTo>,	2723	_IsSame<_RawFrom, _RawTo>,
3065	is_base_of<_RawTo, _RawFrom>>	2724	is_base_of<_RawTo, _RawFrom>>
3066	>::value;	2725	>::value;
3067	};	2726	};
...	@@ -3117,276 +2776,48 @@ template <class _Tp, size_t _Nx>	...	@@ -3117,276 +2776,48 @@ template <class _Tp, size_t _Nx>
3117	struct __is_default_constructible<_Tp[_Nx], false>	2776	struct __is_default_constructible<_Tp[_Nx], false>
3118	: __is_default_constructible<typename remove_all_extents<_Tp>::type> {};	2777	: __is_default_constructible<typename remove_all_extents<_Tp>::type> {};
3119		2778
3120	template <class _Tp, class... _Args>	2779	template <class _Tp, class... _Args>
3121	struct __libcpp_is_constructible	2780	struct __libcpp_is_constructible
3122	{	2781	{
3123	static_assert(sizeof...(_Args) > 1, "Wrong specialization");	2782	static_assert(sizeof...(_Args) > 1, "Wrong specialization");
3124	typedef decltype(__is_constructible_helper::__test_nary<_Tp, _Args...>(0))	2783	typedef decltype(__is_constructible_helper::__test_nary<_Tp, _Args...>(0))
3125	type;	2784	type;
3126	};	2785	};
3127
3128	template <class _Tp>
3129	struct __libcpp_is_constructible<_Tp> : __is_default_constructible<_Tp> {};
3130
3131	template <class _Tp, class _A0>
3132	struct __libcpp_is_constructible<_Tp, _A0>
3133	: public decltype(__is_constructible_helper::__test_unary<_Tp, _A0>(0))
3134	{};
3135
3136	template <class _Tp, class _A0>
3137	struct __libcpp_is_constructible<_Tp&, _A0>
3138	: public decltype(__is_constructible_helper::
3139	__test_cast<_Tp&, _A0>(0))
3140	{};
3141
3142	template <class _Tp, class _A0>
3143	struct __libcpp_is_constructible<_Tp&&, _A0>
3144	: public decltype(__is_constructible_helper::
3145	__test_cast<_Tp&&, _A0>(0))
3146	{};
3147
3148	#endif
3149
3150	#if __has_feature(is_constructible)
3151	template <class _Tp, class ..._Args>
3152	struct _LIBCPP_TEMPLATE_VIS is_constructible
3153	: public integral_constant<bool, __is_constructible(_Tp, _Args...)>
3154	{};
3155	#elif !defined(_LIBCPP_CXX03_LANG)
3156	template <class _Tp, class... _Args>
3157	struct _LIBCPP_TEMPLATE_VIS is_constructible
3158	: public __libcpp_is_constructible<_Tp, _Args...>::type {};
3159	#else
3160	// template <class T> struct is_constructible0;
3161
3162	// main is_constructible0 test
3163
3164	template <class _Tp>
3165	decltype((_Tp(), true_type()))
3166	__is_constructible0_test(_Tp&);
3167
3168	false_type
3169	__is_constructible0_test(__any);
3170
3171	template <class _Tp, class _A0>
3172	decltype((_Tp(_VSTD::declval<_A0>()), true_type()))
3173	__is_constructible1_test(_Tp&, _A0&);
3174
3175	template <class _A0>
3176	false_type
3177	__is_constructible1_test(__any, _A0&);
3178
3179	template <class _Tp, class _A0, class _A1>
3180	decltype((_Tp(_VSTD::declval<_A0>(), _VSTD::declval<_A1>()), true_type()))
3181	__is_constructible2_test(_Tp&, _A0&, _A1&);
3182
3183	template <class _A0, class _A1>
3184	false_type
3185	__is_constructible2_test(__any, _A0&, _A1&);
3186
3187	template <class _Tp, class _A0, class _A1, class _A2>
3188	decltype((_Tp(_VSTD::declval<_A0>(), _VSTD::declval<_A1>(), _VSTD::declval<_A2>()), true_type()))
3189	__is_constructible3_test(_Tp&, _A0&, _A1&, _A2&);
3190
3191	template <class _A0, class _A1, class _A2>
3192	false_type
3193	__is_constructible3_test(__any, _A0&, _A1&, _A2&);
3194
3195	template <bool, class _Tp>
3196	struct __is_constructible0_imp // false, _Tp is not a scalar
3197	: public common_type
3198	<
3199	decltype(__is_constructible0_test(declval<_Tp&>()))
3200	>::type
3201	{};
3202
3203	template <bool, class _Tp, class _A0>
3204	struct __is_constructible1_imp // false, _Tp is not a scalar
3205	: public common_type
3206	<
3207	decltype(__is_constructible1_test(declval<_Tp&>(), declval<_A0&>()))
3208	>::type
3209	{};
3210
3211	template <bool, class _Tp, class _A0, class _A1>
3212	struct __is_constructible2_imp // false, _Tp is not a scalar
3213	: public common_type
3214	<
3215	decltype(__is_constructible2_test(declval<_Tp&>(), declval<_A0>(), declval<_A1>()))
3216	>::type
3217	{};
3218
3219	template <bool, class _Tp, class _A0, class _A1, class _A2>
3220	struct __is_constructible3_imp // false, _Tp is not a scalar
3221	: public common_type
3222	<
3223	decltype(__is_constructible3_test(declval<_Tp&>(), declval<_A0>(), declval<_A1>(), declval<_A2>()))
3224	>::type
3225	{};
3226
3227	// handle scalars and reference types
3228
3229	// Scalars are default constructible, references are not
3230
3231	template <class _Tp>
3232	struct __is_constructible0_imp<true, _Tp>
3233	: public is_scalar<_Tp>
3234	{};
3235
3236	template <class _Tp, class _A0>
3237	struct __is_constructible1_imp<true, _Tp, _A0>
3238	: public is_convertible<_A0, _Tp>
3239	{};
3240
3241	template <class _Tp, class _A0, class _A1>
3242	struct __is_constructible2_imp<true, _Tp, _A0, _A1>
3243	: public false_type
3244	{};
3245
3246	template <class _Tp, class _A0, class _A1, class _A2>
3247	struct __is_constructible3_imp<true, _Tp, _A0, _A1, _A2>
3248	: public false_type
3249	{};
3250
3251	// Treat scalars and reference types separately
3252
3253	template <bool, class _Tp>
3254	struct __is_constructible0_void_check
3255	: public __is_constructible0_imp<is_scalar<_Tp>::value \|\| is_reference<_Tp>::value,
3256	_Tp>
3257	{};
3258
3259	template <bool, class _Tp, class _A0>
3260	struct __is_constructible1_void_check
3261	: public __is_constructible1_imp<is_scalar<_Tp>::value \|\| is_reference<_Tp>::value,
3262	_Tp, _A0>
3263	{};
3264
3265	template <bool, class _Tp, class _A0, class _A1>
3266	struct __is_constructible2_void_check
3267	: public __is_constructible2_imp<is_scalar<_Tp>::value \|\| is_reference<_Tp>::value,
3268	_Tp, _A0, _A1>
3269	{};
3270
3271	template <bool, class _Tp, class _A0, class _A1, class _A2>
3272	struct __is_constructible3_void_check
3273	: public __is_constructible3_imp<is_scalar<_Tp>::value \|\| is_reference<_Tp>::value,
3274	_Tp, _A0, _A1, _A2>
3275	{};
3276
3277	// If any of T or Args is void, is_constructible should be false
3278
3279	template <class _Tp>
3280	struct __is_constructible0_void_check<true, _Tp>
3281	: public false_type
3282	{};
3283
3284	template <class _Tp, class _A0>
3285	struct __is_constructible1_void_check<true, _Tp, _A0>
3286	: public false_type
3287	{};
3288
3289	template <class _Tp, class _A0, class _A1>
3290	struct __is_constructible2_void_check<true, _Tp, _A0, _A1>
3291	: public false_type
3292	{};
3293
3294	template <class _Tp, class _A0, class _A1, class _A2>
3295	struct __is_constructible3_void_check<true, _Tp, _A0, _A1, _A2>
3296	: public false_type
3297	{};
3298
3299	// is_constructible entry point
3300
3301	template <class _Tp, class _A0 = __is_construct::__nat,
3302	class _A1 = __is_construct::__nat,
3303	class _A2 = __is_construct::__nat>
3304	struct _LIBCPP_TEMPLATE_VIS is_constructible
3305	: public __is_constructible3_void_check<is_void<_Tp>::value
3306	\|\| is_abstract<_Tp>::value
3307	\|\| is_function<_Tp>::value
3308	\|\| is_void<_A0>::value
3309	\|\| is_void<_A1>::value
3310	\|\| is_void<_A2>::value,
3311	_Tp, _A0, _A1, _A2>
3312	{};
3313
3314	template <class _Tp>
3315	struct _LIBCPP_TEMPLATE_VIS is_constructible<_Tp, __is_construct::__nat, __is_construct::__nat>
3316	: public __is_constructible0_void_check<is_void<_Tp>::value
3317	\|\| is_abstract<_Tp>::value
3318	\|\| is_function<_Tp>::value,
3319	_Tp>
3320	{};
3321
3322	template <class _Tp, class _A0>
3323	struct _LIBCPP_TEMPLATE_VIS is_constructible<_Tp, _A0, __is_construct::__nat>
3324	: public __is_constructible1_void_check<is_void<_Tp>::value
3325	\|\| is_abstract<_Tp>::value
3326	\|\| is_function<_Tp>::value
3327	\|\| is_void<_A0>::value,
3328	_Tp, _A0>
3329	{};
3330
3331	template <class _Tp, class _A0, class _A1>
3332	struct _LIBCPP_TEMPLATE_VIS is_constructible<_Tp, _A0, _A1, __is_construct::__nat>
3333	: public __is_constructible2_void_check<is_void<_Tp>::value
3334	\|\| is_abstract<_Tp>::value
3335	\|\| is_function<_Tp>::value
3336	\|\| is_void<_A0>::value
3337	\|\| is_void<_A1>::value,
3338	_Tp, _A0, _A1>
3339	{};
3340
3341	// Array types are default constructible if their element type
3342	// is default constructible
3343
3344	template <class _Ap, size_t _Np>
3345	struct __is_constructible0_imp<false, _Ap[_Np]>
3346	: public is_constructible<typename remove_all_extents<_Ap>::type>
3347	{};
3348
3349	template <class _Ap, size_t _Np, class _A0>
3350	struct __is_constructible1_imp<false, _Ap[_Np], _A0>
3351	: public false_type
3352	{};
3353
3354	template <class _Ap, size_t _Np, class _A0, class _A1>
3355	struct __is_constructible2_imp<false, _Ap[_Np], _A0, _A1>
3356	: public false_type
3357	{};
3358		2786
3359	template <class _Ap, size_t _Np, class _A0, class _A1, class _A2>	2787	template <class _Tp>
3360	struct __is_constructible3_imp<false, _Ap[_Np], _A0, _A1, _A2>	2788	struct __libcpp_is_constructible<_Tp> : __is_default_constructible<_Tp> {};
3361	: public false_type
3362	{};
3363		2789
3364	// Incomplete array types are not constructible	2790	template <class _Tp, class _A0>
		2791	struct __libcpp_is_constructible<_Tp, _A0>
		2792	: public decltype(__is_constructible_helper::__test_unary<_Tp, _A0>(0))
		2793	{};
3365		2794
3366	template <class _Ap>	2795	template <class _Tp, class _A0>
3367	struct __is_constructible0_imp<false, _Ap[]>	2796	struct __libcpp_is_constructible<_Tp&, _A0>
3368	: public false_type	2797	: public decltype(__is_constructible_helper::
3369	{};	2798	__test_cast<_Tp&, _A0>(0))
		2799	{};
3370		2800
3371	template <class _Ap, class _A0>	2801	template <class _Tp, class _A0>
3372	struct __is_constructible1_imp<false, _Ap[], _A0>	2802	struct __libcpp_is_constructible<_Tp&&, _A0>
3373	: public false_type	2803	: public decltype(__is_constructible_helper::
3374	{};	2804	__test_cast<_Tp&&, _A0>(0))
		2805	{};
3375		2806
3376	template <class _Ap, class _A0, class _A1>	2807	#endif
3377	struct __is_constructible2_imp<false, _Ap[], _A0, _A1>
3378	: public false_type
3379	{};
3380		2808
3381	template <class _Ap, class _A0, class _A1, class _A2>	2809	#if __has_feature(is_constructible)
3382	struct __is_constructible3_imp<false, _Ap[], _A0, _A1, _A2>	2810	template <class _Tp, class ..._Args>
3383	: public false_type	2811	struct _LIBCPP_TEMPLATE_VIS is_constructible
		2812	: public integral_constant<bool, __is_constructible(_Tp, _Args...)>
3384	{};	2813	{};
		2814	#else
		2815	template <class _Tp, class... _Args>
		2816	struct _LIBCPP_TEMPLATE_VIS is_constructible
		2817	: public __libcpp_is_constructible<_Tp, _Args...>::type {};
		2818	#endif
3385		2819
3386	#endif // __has_feature(is_constructible)	2820	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
3387
3388
3389	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
3390	template <class _Tp, class ..._Args>	2821	template <class _Tp, class ..._Args>
3391	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_constructible_v	2822	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_constructible_v
3392	= is_constructible<_Tp, _Args...>::value;	2823	= is_constructible<_Tp, _Args...>::value;
...	@@ -3422,11 +2853,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_copy_constructible_v	...	@@ -3422,11 +2853,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_copy_constructible_v
3422		2853
3423	template <class _Tp>	2854	template <class _Tp>
3424	struct _LIBCPP_TEMPLATE_VIS is_move_constructible	2855	struct _LIBCPP_TEMPLATE_VIS is_move_constructible
3425	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3426	: public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	2856	: public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
3427	#else
3428	: public is_copy_constructible<_Tp>
3429	#endif
3430	{};	2857	{};
3431		2858
3432	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	2859	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -3437,8 +2864,6 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_move_constructible_v	...	@@ -3437,8 +2864,6 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_move_constructible_v
3437		2864
3438	// is_trivially_constructible	2865	// is_trivially_constructible
3439		2866
3440	#ifndef _LIBCPP_HAS_NO_VARIADICS
3441
3442	#if __has_feature(is_trivially_constructible) \|\| _GNUC_VER >= 501	2867	#if __has_feature(is_trivially_constructible) \|\| _GNUC_VER >= 501
3443		2868
3444	template <class _Tp, class... _Args>	2869	template <class _Tp, class... _Args>
...	@@ -3457,7 +2882,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible	...	@@ -3457,7 +2882,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible
3457		2882
3458	template <class _Tp>	2883	template <class _Tp>
3459	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp>	2884	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp>
3460	#if __has_feature(has_trivial_constructor) \|\| (_GNUC_VER >= 403)	2885	#if __has_feature(has_trivial_constructor) \|\| defined(_LIBCPP_COMPILER_GCC)
3461	: integral_constant<bool, __has_trivial_constructor(_Tp)>	2886	: integral_constant<bool, __has_trivial_constructor(_Tp)>
3462	#else	2887	#else
3463	: integral_constant<bool, is_scalar<_Tp>::value>	2888	: integral_constant<bool, is_scalar<_Tp>::value>
...	@@ -3466,11 +2891,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp>	...	@@ -3466,11 +2891,7 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp>
3466	};	2891	};
3467		2892
3468	template <class _Tp>	2893	template <class _Tp>
3469	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3470	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&&>	2894	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&&>
3471	#else
3472	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp>
3473	#endif
3474	: integral_constant<bool, is_scalar<_Tp>::value>	2895	: integral_constant<bool, is_scalar<_Tp>::value>
3475	{	2896	{
3476	};	2897	};
...	@@ -3489,80 +2910,8 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&>	...	@@ -3489,80 +2910,8 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&>
3489		2910
3490	#endif // !__has_feature(is_trivially_constructible)	2911	#endif // !__has_feature(is_trivially_constructible)
3491		2912
3492	#else // _LIBCPP_HAS_NO_VARIADICS
3493
3494	template <class _Tp, class _A0 = __is_construct::__nat,
3495	class _A1 = __is_construct::__nat>
3496	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible
3497	: false_type
3498	{
3499	};
3500
3501	#if __has_feature(is_trivially_constructible) \|\| _GNUC_VER >= 501
3502
3503	template <class _Tp>
3504	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, __is_construct::__nat,
3505	__is_construct::__nat>
3506	: integral_constant<bool, __is_trivially_constructible(_Tp)>
3507	{
3508	};
3509
3510	template <class _Tp>
3511	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp,
3512	__is_construct::__nat>
3513	: integral_constant<bool, __is_trivially_constructible(_Tp, _Tp)>
3514	{
3515	};
3516
3517	template <class _Tp>
3518	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, const _Tp&,
3519	__is_construct::__nat>
3520	: integral_constant<bool, __is_trivially_constructible(_Tp, const _Tp&)>
3521	{
3522	};
3523
3524	template <class _Tp>
3525	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&,
3526	__is_construct::__nat>
3527	: integral_constant<bool, __is_trivially_constructible(_Tp, _Tp&)>
3528	{
3529	};
3530
3531	#else // !__has_feature(is_trivially_constructible)
3532
3533	template <class _Tp>
3534	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, __is_construct::__nat,
3535	__is_construct::__nat>
3536	: integral_constant<bool, is_scalar<_Tp>::value>
3537	{
3538	};
3539
3540	template <class _Tp>
3541	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp,
3542	__is_construct::__nat>
3543	: integral_constant<bool, is_scalar<_Tp>::value>
3544	{
3545	};
3546
3547	template <class _Tp>
3548	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, const _Tp&,
3549	__is_construct::__nat>
3550	: integral_constant<bool, is_scalar<_Tp>::value>
3551	{
3552	};
3553
3554	template <class _Tp>
3555	struct _LIBCPP_TEMPLATE_VIS is_trivially_constructible<_Tp, _Tp&,
3556	__is_construct::__nat>
3557	: integral_constant<bool, is_scalar<_Tp>::value>
3558	{
3559	};
3560
3561	#endif // !__has_feature(is_trivially_constructible)
3562
3563	#endif // _LIBCPP_HAS_NO_VARIADICS
3564		2913
3565	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && !defined(_LIBCPP_HAS_NO_VARIADICS)	2914	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
3566	template <class _Tp, class... _Args>	2915	template <class _Tp, class... _Args>
3567	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_constructible_v	2916	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_constructible_v
3568	= is_trivially_constructible<_Tp, _Args...>::value;	2917	= is_trivially_constructible<_Tp, _Args...>::value;
...	@@ -3595,11 +2944,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copy_constructible_v	...	@@ -3595,11 +2944,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copy_constructible_v
3595	// is_trivially_move_constructible	2944	// is_trivially_move_constructible
3596		2945
3597	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_constructible	2946	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_constructible
3598	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3599	: public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	2947	: public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
3600	#else
3601	: public is_trivially_copy_constructible<_Tp>
3602	#endif
3603	{};	2948	{};
3604		2949
3605	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	2950	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -3636,14 +2981,10 @@ template <class _Tp>	...	@@ -3636,14 +2981,10 @@ template <class _Tp>
3636	struct is_trivially_assignable<_Tp&, const _Tp&>	2981	struct is_trivially_assignable<_Tp&, const _Tp&>
3637	: integral_constant<bool, is_scalar<_Tp>::value> {};	2982	: integral_constant<bool, is_scalar<_Tp>::value> {};
3638		2983
3639	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3640
3641	template <class _Tp>	2984	template <class _Tp>
3642	struct is_trivially_assignable<_Tp&, _Tp&&>	2985	struct is_trivially_assignable<_Tp&, _Tp&&>
3643	: integral_constant<bool, is_scalar<_Tp>::value> {};	2986	: integral_constant<bool, is_scalar<_Tp>::value> {};
3644		2987
3645	#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
3646
3647	#endif // !__has_feature(is_trivially_assignable)	2988	#endif // !__has_feature(is_trivially_assignable)
3648		2989
3649	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	2990	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -3668,11 +3009,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copy_assignable_v	...	@@ -3668,11 +3009,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copy_assignable_v
3668		3009
3669	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_assignable	3010	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_move_assignable
3670	: public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,	3011	: public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
3671	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3672	typename add_rvalue_reference<_Tp>::type>	3012	typename add_rvalue_reference<_Tp>::type>
3673	#else
3674	typename add_lvalue_reference<_Tp>::type>
3675	#endif
3676	{};	3013	{};
3677		3014
3678	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	3015	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -3683,7 +3020,12 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_move_assignable_v	...	@@ -3683,7 +3020,12 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_move_assignable_v
3683		3020
3684	// is_trivially_destructible	3021	// is_trivially_destructible
3685		3022
3686	#if __has_feature(has_trivial_destructor) \|\| (_GNUC_VER >= 403)	3023	#if __has_keyword(__is_trivially_destructible)
		3024
		3025	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible
		3026	: public integral_constant<bool, __is_trivially_destructible(_Tp)> {};
		3027
		3028	#elif __has_feature(has_trivial_destructor) \|\| defined(_LIBCPP_COMPILER_GCC)
3687		3029
3688	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible	3030	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible
3689	: public integral_constant<bool, is_destructible<_Tp>::value && __has_trivial_destructor(_Tp)> {};	3031	: public integral_constant<bool, is_destructible<_Tp>::value && __has_trivial_destructor(_Tp)> {};
...	@@ -3710,19 +3052,14 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_destructible_v	...	@@ -3710,19 +3052,14 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_destructible_v
3710		3052
3711	// is_nothrow_constructible	3053	// is_nothrow_constructible
3712		3054
3713	#if 0	3055	#if __has_keyword(__is_nothrow_constructible)
		3056
3714	template <class _Tp, class... _Args>	3057	template <class _Tp, class... _Args>
3715	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible	3058	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible
3716	: public integral_constant<bool, __is_nothrow_constructible(_Tp(_Args...))>	3059	: public integral_constant<bool, __is_nothrow_constructible(_Tp, _Args...)> {};
3717	{
3718	};
3719		3060
3720	#else	3061	#else
3721		3062
3722	#ifndef _LIBCPP_HAS_NO_VARIADICS
3723
3724	#if __has_feature(cxx_noexcept) \|\| (_GNUC_VER >= 407 && __cplusplus >= 201103L)
3725
3726	template <bool, bool, class _Tp, class... _Args> struct __libcpp_is_nothrow_constructible;	3063	template <bool, bool, class _Tp, class... _Args> struct __libcpp_is_nothrow_constructible;
3727		3064
3728	template <class _Tp, class... _Args>	3065	template <class _Tp, class... _Args>
...	@@ -3758,117 +3095,10 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp[_Ns]>	...	@@ -3758,117 +3095,10 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp[_Ns]>
3758	{	3095	{
3759	};	3096	};
3760		3097
3761	#else // __has_feature(cxx_noexcept)	3098	#endif // _LIBCPP_HAS_NO_NOEXCEPT
3762
3763	template <class _Tp, class... _Args>
3764	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible
3765	: false_type
3766	{
3767	};
3768
3769	template <class _Tp>
3770	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp>
3771	#if __has_feature(has_nothrow_constructor) \|\| (_GNUC_VER >= 403)
3772	: integral_constant<bool, __has_nothrow_constructor(_Tp)>
3773	#else
3774	: integral_constant<bool, is_scalar<_Tp>::value>
3775	#endif
3776	{
3777	};
3778
3779	template <class _Tp>
3780	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3781	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, _Tp&&>
3782	#else
3783	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, _Tp>
3784	#endif
3785	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3786	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3787	#else
3788	: integral_constant<bool, is_scalar<_Tp>::value>
3789	#endif
3790	{
3791	};
3792
3793	template <class _Tp>
3794	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, const _Tp&>
3795	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3796	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3797	#else
3798	: integral_constant<bool, is_scalar<_Tp>::value>
3799	#endif
3800	{
3801	};
3802
3803	template <class _Tp>
3804	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, _Tp&>
3805	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3806	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3807	#else
3808	: integral_constant<bool, is_scalar<_Tp>::value>
3809	#endif
3810	{
3811	};
3812
3813	#endif // __has_feature(cxx_noexcept)
3814
3815	#else // _LIBCPP_HAS_NO_VARIADICS
3816
3817	template <class _Tp, class _A0 = __is_construct::__nat,
3818	class _A1 = __is_construct::__nat>
3819	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible
3820	: false_type
3821	{
3822	};
3823
3824	template <class _Tp>
3825	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, __is_construct::__nat,
3826	__is_construct::__nat>
3827	#if __has_feature(has_nothrow_constructor) \|\| (_GNUC_VER >= 403)
3828	: integral_constant<bool, __has_nothrow_constructor(_Tp)>
3829	#else
3830	: integral_constant<bool, is_scalar<_Tp>::value>
3831	#endif
3832	{
3833	};
3834
3835	template <class _Tp>
3836	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, _Tp,
3837	__is_construct::__nat>
3838	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3839	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3840	#else
3841	: integral_constant<bool, is_scalar<_Tp>::value>
3842	#endif
3843	{
3844	};
3845
3846	template <class _Tp>
3847	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, const _Tp&,
3848	__is_construct::__nat>
3849	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3850	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3851	#else
3852	: integral_constant<bool, is_scalar<_Tp>::value>
3853	#endif
3854	{
3855	};
3856
3857	template <class _Tp>
3858	struct _LIBCPP_TEMPLATE_VIS is_nothrow_constructible<_Tp, _Tp&,
3859	__is_construct::__nat>
3860	#if __has_feature(has_nothrow_copy) \|\| (_GNUC_VER >= 403)
3861	: integral_constant<bool, __has_nothrow_copy(_Tp)>
3862	#else
3863	: integral_constant<bool, is_scalar<_Tp>::value>
3864	#endif
3865	{
3866	};
3867		3099
3868	#endif // _LIBCPP_HAS_NO_VARIADICS
3869	#endif // __has_feature(is_nothrow_constructible)
3870		3100
3871	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && !defined(_LIBCPP_HAS_NO_VARIADICS)	3101	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
3872	template <class _Tp, class ..._Args>	3102	template <class _Tp, class ..._Args>
3873	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_constructible_v	3103	_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_constructible_v
3874	= is_nothrow_constructible<_Tp, _Args...>::value;	3104	= is_nothrow_constructible<_Tp, _Args...>::value;
...	@@ -3901,11 +3131,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_copy_constructible_v	...	@@ -3901,11 +3131,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_copy_constructible_v
3901	// is_nothrow_move_constructible	3131	// is_nothrow_move_constructible
3902		3132
3903	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible	3133	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_constructible
3904	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3905	: public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>	3134	: public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
3906	#else
3907	: public is_nothrow_copy_constructible<_Tp>
3908	#endif
3909	{};	3135	{};
3910		3136
3911	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	3137	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -3916,7 +3142,13 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_move_constructible_v	...	@@ -3916,7 +3142,13 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_move_constructible_v
3916		3142
3917	// is_nothrow_assignable	3143	// is_nothrow_assignable
3918		3144
3919	#if __has_feature(cxx_noexcept) \|\| (_GNUC_VER >= 407 && __cplusplus >= 201103L)	3145	#if __has_keyword(__is_nothrow_assignable)
		3146
		3147	template <class _Tp, class _Arg>
		3148	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable
		3149	: public integral_constant<bool, __is_nothrow_assignable(_Tp, _Arg)> {};
		3150
		3151	#else
3920		3152
3921	template <bool, class _Tp, class _Arg> struct __libcpp_is_nothrow_assignable;	3153	template <bool, class _Tp, class _Arg> struct __libcpp_is_nothrow_assignable;
3922		3154
...	@@ -3938,49 +3170,7 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable	...	@@ -3938,49 +3170,7 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable
3938	{	3170	{
3939	};	3171	};
3940		3172
3941	#else // __has_feature(cxx_noexcept)	3173	#endif // _LIBCPP_HAS_NO_NOEXCEPT
3942
3943	template <class _Tp, class _Arg>
3944	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable
3945	: public false_type {};
3946
3947	template <class _Tp>
3948	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable<_Tp&, _Tp>
3949	#if __has_feature(has_nothrow_assign) \|\| (_GNUC_VER >= 403)
3950	: integral_constant<bool, __has_nothrow_assign(_Tp)> {};
3951	#else
3952	: integral_constant<bool, is_scalar<_Tp>::value> {};
3953	#endif
3954
3955	template <class _Tp>
3956	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable<_Tp&, _Tp&>
3957	#if __has_feature(has_nothrow_assign) \|\| (_GNUC_VER >= 403)
3958	: integral_constant<bool, __has_nothrow_assign(_Tp)> {};
3959	#else
3960	: integral_constant<bool, is_scalar<_Tp>::value> {};
3961	#endif
3962
3963	template <class _Tp>
3964	struct _LIBCPP_TEMPLATE_VIS is_nothrow_assignable<_Tp&, const _Tp&>
3965	#if __has_feature(has_nothrow_assign) \|\| (_GNUC_VER >= 403)
3966	: integral_constant<bool, __has_nothrow_assign(_Tp)> {};
3967	#else
3968	: integral_constant<bool, is_scalar<_Tp>::value> {};
3969	#endif
3970
3971	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
3972
3973	template <class _Tp>
3974	struct is_nothrow_assignable<_Tp&, _Tp&&>
3975	#if __has_feature(has_nothrow_assign) \|\| (_GNUC_VER >= 403)
3976	: integral_constant<bool, __has_nothrow_assign(_Tp)> {};
3977	#else
3978	: integral_constant<bool, is_scalar<_Tp>::value> {};
3979	#endif
3980
3981	#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
3982
3983	#endif // __has_feature(cxx_noexcept)
3984		3174
3985	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	3175	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
3986	template <class _Tp, class _Arg>	3176	template <class _Tp, class _Arg>
...	@@ -4004,11 +3194,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_copy_assignable_v	...	@@ -4004,11 +3194,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_copy_assignable_v
4004		3194
4005	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_assignable	3195	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_assignable
4006	: public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,	3196	: public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
4007	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
4008	typename add_rvalue_reference<_Tp>::type>	3197	typename add_rvalue_reference<_Tp>::type>
4009	#else
4010	typename add_lvalue_reference<_Tp>::type>
4011	#endif
4012	{};	3198	{};
4013		3199
4014	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	3200	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -4019,7 +3205,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_move_assignable_v	...	@@ -4019,7 +3205,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_move_assignable_v
4019		3205
4020	// is_nothrow_destructible	3206	// is_nothrow_destructible
4021		3207
4022	#if __has_feature(cxx_noexcept) \|\| (_GNUC_VER >= 407 && __cplusplus >= 201103L)	3208	#if !defined(_LIBCPP_CXX03_LANG)
4023		3209
4024	template <bool, class _Tp> struct __libcpp_is_nothrow_destructible;	3210	template <bool, class _Tp> struct __libcpp_is_nothrow_destructible;
4025		3211
...	@@ -4053,16 +3239,12 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp&>	...	@@ -4053,16 +3239,12 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp&>
4053	{	3239	{
4054	};	3240	};
4055		3241
4056	#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
4057
4058	template <class _Tp>	3242	template <class _Tp>
4059	struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp&&>	3243	struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp&&>
4060	: public true_type	3244	: public true_type
4061	{	3245	{
4062	};	3246	};
4063		3247
4064	#endif
4065
4066	#else	3248	#else
4067		3249
4068	template <class _Tp> struct __libcpp_nothrow_destructor	3250	template <class _Tp> struct __libcpp_nothrow_destructor
...	@@ -4086,7 +3268,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_destructible_v	...	@@ -4086,7 +3268,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_nothrow_destructible_v
4086		3268
4087	// is_pod	3269	// is_pod
4088		3270
4089	#if __has_feature(is_pod) \|\| (_GNUC_VER >= 403)	3271	#if __has_feature(is_pod) \|\| defined(_LIBCPP_COMPILER_GCC)
4090		3272
4091	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pod	3273	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_pod
4092	: public integral_constant<bool, __is_pod(_Tp)> {};	3274	: public integral_constant<bool, __is_pod(_Tp)> {};
...	@@ -4110,12 +3292,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_pod_v	...	@@ -4110,12 +3292,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_pod_v
4110	// is_literal_type;	3292	// is_literal_type;
4111		3293
4112	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_literal_type	3294	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_literal_type
4113	#ifdef _LIBCPP_IS_LITERAL	3295	: public integral_constant<bool, __is_literal_type(_Tp)>
4114	: public integral_constant<bool, _LIBCPP_IS_LITERAL(_Tp)>
4115	#else
4116	: integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value \|\|
4117	is_reference<typename remove_all_extents<_Tp>::type>::value>
4118	#endif
4119	{};	3296	{};
4120		3297
4121	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)	3298	#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
...	@@ -4127,7 +3304,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_literal_type_v	...	@@ -4127,7 +3304,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_literal_type_v
4127	// is_standard_layout;	3304	// is_standard_layout;
4128		3305
4129	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_standard_layout	3306	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_standard_layout
4130	#if __has_feature(is_standard_layout) \|\| (_GNUC_VER >= 407)	3307	#if __has_feature(is_standard_layout) \|\| defined(_LIBCPP_COMPILER_GCC)
4131	: public integral_constant<bool, __is_standard_layout(_Tp)>	3308	: public integral_constant<bool, __is_standard_layout(_Tp)>
4132	#else	3309	#else
4133	: integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>	3310	: integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
...	@@ -4161,7 +3338,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copyable_v	...	@@ -4161,7 +3338,7 @@ _LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_trivially_copyable_v
4161	// is_trivial;	3338	// is_trivial;
4162		3339
4163	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivial	3340	template <class _Tp> struct _LIBCPP_TEMPLATE_VIS is_trivial
4164	#if __has_feature(is_trivial) \|\| _GNUC_VER >= 407	3341	#if __has_feature(is_trivial) \|\| defined(_LIBCPP_COMPILER_GCC)
4165	: public integral_constant<bool, __is_trivial(_Tp)>	3342	: public integral_constant<bool, __is_trivial(_Tp)>
4166	#else	3343	#else
4167	: integral_constant<bool, is_trivially_copyable<_Tp>::value &&	3344	: integral_constant<bool, is_trivially_copyable<_Tp>::value &&
...	@@ -4361,28 +3538,31 @@ _LIBCPP_INVOKE_RETURN(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...)	...	@@ -4361,28 +3538,31 @@ _LIBCPP_INVOKE_RETURN(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...)
4361	#undef _LIBCPP_INVOKE_RETURN	3538	#undef _LIBCPP_INVOKE_RETURN
4362		3539
4363	// __invokable	3540	// __invokable
4364
4365	template <class _Ret, class _Fp, class ..._Args>	3541	template <class _Ret, class _Fp, class ..._Args>
4366	struct __invokable_r	3542	struct __invokable_r
4367	{	3543	{
4368	// FIXME: Check that _Ret, _Fp, and _Args... are all complete types, cv void,	3544	template <class _XFp, class ..._XArgs>
4369	// or incomplete array types as required by the standard.	3545	static auto __try_call(int) -> decltype(
4370	using _Result = decltype(	3546	_VSTD::__invoke(_VSTD::declval<_XFp>(), _VSTD::declval<_XArgs>()...));
4371	_VSTD::__invoke(_VSTD::declval<_Fp>(), _VSTD::declval<_Args>()...));	3547	template <class _XFp, class ..._XArgs>
		3548	static __nat __try_call(...);
4372		3549
4373	using type =	3550	// FIXME: Check that _Ret, _Fp, and _Args... are all complete types, cv void,
4374	typename conditional<	3551	// or incomplete array types as required by the standard.
4375	!is_same<_Result, __nat>::value,	3552	using _Result = decltype(__try_call<_Fp, _Args...>(0));
4376	typename conditional<
4377	is_void<_Ret>::value,
4378	true_type,
4379	is_convertible<_Result, _Ret>
4380	>::type,
4381	false_type
4382	>::type;
4383	static const bool value = type::value;
4384	};
4385		3553
		3554	using type =
		3555	typename conditional<
		3556	_IsNotSame<_Result, __nat>::value,
		3557	typename conditional<
		3558	is_void<_Ret>::value,
		3559	true_type,
		3560	is_convertible<_Result, _Ret>
		3561	>::type,
		3562	false_type
		3563	>::type;
		3564	static const bool value = type::value;
		3565	};
4386	template <class _Fp, class ..._Args>	3566	template <class _Fp, class ..._Args>
4387	using __invokable = __invokable_r<void, _Fp, _Args...>;	3567	using __invokable = __invokable_r<void, _Fp, _Args...>;
4388		3568
...	@@ -4512,6 +3692,7 @@ typename enable_if	...	@@ -4512,6 +3692,7 @@ typename enable_if
4512	#else	3692	#else
4513	void	3693	void
4514	#endif	3694	#endif
		3695	_LIBCPP_CONSTEXPR_AFTER_CXX17
4515	swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&	3696	swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
4516	is_nothrow_move_assignable<_Tp>::value)	3697	is_nothrow_move_assignable<_Tp>::value)
4517	{	3698	{
...	@@ -4521,14 +3702,14 @@ swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&	...	@@ -4521,14 +3702,14 @@ swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
4521	}	3702	}
4522		3703
4523	template<class _Tp, size_t _Np>	3704	template<class _Tp, size_t _Np>
4524	inline _LIBCPP_INLINE_VISIBILITY	3705	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4525	typename enable_if<	3706	typename enable_if<
4526	__is_swappable<_Tp>::value	3707	__is_swappable<_Tp>::value
4527	>::type	3708	>::type
4528	swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value);	3709	swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value);
4529		3710
4530	template <class _ForwardIterator1, class _ForwardIterator2>	3711	template <class _ForwardIterator1, class _ForwardIterator2>
4531	inline _LIBCPP_INLINE_VISIBILITY	3712	inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
4532	void	3713	void
4533	iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)	3714	iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
4534	// _NOEXCEPT_(_NOEXCEPT_(swap(__a, __b)))	3715	// _NOEXCEPT_(_NOEXCEPT_(swap(__a, __b)))
...	@@ -4558,8 +3739,8 @@ struct __swappable_with	...	@@ -4558,8 +3739,8 @@ struct __swappable_with
4558	typedef decltype((__test_swap<_Tp, _Up>(0))) __swap1;	3739	typedef decltype((__test_swap<_Tp, _Up>(0))) __swap1;
4559	typedef decltype((__test_swap<_Up, _Tp>(0))) __swap2;	3740	typedef decltype((__test_swap<_Up, _Tp>(0))) __swap2;
4560		3741
4561	static const bool value = !is_same<__swap1, __nat>::value	3742	static const bool value = _IsNotSame<__swap1, __nat>::value
4562	&& !is_same<__swap2, __nat>::value;	3743	&& _IsNotSame<__swap2, __nat>::value;
4563	};	3744	};
4564		3745
4565	template <class _Tp, class _Up>	3746	template <class _Tp, class _Up>
...	@@ -4649,30 +3830,24 @@ _LIBCPP_INLINE_VAR constexpr bool is_nothrow_swappable_v	...	@@ -4649,30 +3830,24 @@ _LIBCPP_INLINE_VAR constexpr bool is_nothrow_swappable_v
4649		3830
4650	#endif // _LIBCPP_STD_VER > 14	3831	#endif // _LIBCPP_STD_VER > 14
4651		3832
4652	#ifdef _LIBCPP_UNDERLYING_TYPE	3833	template <class _Tp, bool = is_enum<_Tp>::value> struct __underlying_type_impl;
		3834
		3835	template <class _Tp>
		3836	struct __underlying_type_impl<_Tp, false> {};
4653		3837
4654	template <class _Tp>	3838	template <class _Tp>
4655	struct underlying_type	3839	struct __underlying_type_impl<_Tp, true>
4656	{	3840	{
4657	typedef _LIBCPP_UNDERLYING_TYPE(_Tp) type;	3841	typedef __underlying_type(_Tp) type;
4658	};	3842	};
4659		3843
		3844	template <class _Tp>
		3845	struct underlying_type : __underlying_type_impl<_Tp, is_enum<_Tp>::value> {};
		3846
4660	#if _LIBCPP_STD_VER > 11	3847	#if _LIBCPP_STD_VER > 11
4661	template <class _Tp> using underlying_type_t = typename underlying_type<_Tp>::type;	3848	template <class _Tp> using underlying_type_t = typename underlying_type<_Tp>::type;
4662	#endif	3849	#endif
4663		3850
4664	#else // _LIBCPP_UNDERLYING_TYPE
4665
4666	template <class _Tp, bool _Support = false>
4667	struct underlying_type
4668	{
4669	static_assert(_Support, "The underyling_type trait requires compiler "
4670	"support. Either no such support exists or "
4671	"libc++ does not know how to use it.");
4672	};
4673
4674	#endif // _LIBCPP_UNDERLYING_TYPE
4675
4676		3851
4677	template <class _Tp, bool = is_enum<_Tp>::value>	3852	template <class _Tp, bool = is_enum<_Tp>::value>
4678	struct __sfinae_underlying_type	3853	struct __sfinae_underlying_type
...	@@ -4758,25 +3933,23 @@ struct __has_operator_addressof	...	@@ -4758,25 +3933,23 @@ struct __has_operator_addressof
4758		3933
4759	template <class...> using void_t = void;	3934	template <class...> using void_t = void;
4760		3935
4761	# ifndef _LIBCPP_HAS_NO_VARIADICS
4762	template <class... _Args>	3936	template <class... _Args>
4763	struct conjunction : __and_<_Args...> {};	3937	struct conjunction : _And<_Args...> {};
4764	template<class... _Args>	3938	template<class... _Args>
4765	_LIBCPP_INLINE_VAR constexpr bool conjunction_v	3939	_LIBCPP_INLINE_VAR constexpr bool conjunction_v
4766	= conjunction<_Args...>::value;	3940	= conjunction<_Args...>::value;
4767		3941
4768	template <class... _Args>	3942	template <class... _Args>
4769	struct disjunction : __or_<_Args...> {};	3943	struct disjunction : _Or<_Args...> {};
4770	template<class... _Args>	3944	template<class... _Args>
4771	_LIBCPP_INLINE_VAR constexpr bool disjunction_v	3945	_LIBCPP_INLINE_VAR constexpr bool disjunction_v
4772	= disjunction<_Args...>::value;	3946	= disjunction<_Args...>::value;
4773		3947
4774	template <class _Tp>	3948	template <class _Tp>
4775	struct negation : __not_<_Tp> {};	3949	struct negation : _Not<_Tp> {};
4776	template<class _Tp>	3950	template<class _Tp>
4777	_LIBCPP_INLINE_VAR constexpr bool negation_v	3951	_LIBCPP_INLINE_VAR constexpr bool negation_v
4778	= negation<_Tp>::value;	3952	= negation<_Tp>::value;
4779	# endif // _LIBCPP_HAS_NO_VARIADICS
4780	#endif // _LIBCPP_STD_VER > 14	3953	#endif // _LIBCPP_STD_VER > 14
4781		3954
4782	// These traits are used in __tree and __hash_table	3955	// These traits are used in __tree and __hash_table
...	@@ -4788,12 +3961,12 @@ struct __extract_key_first_tag {};	...	@@ -4788,12 +3961,12 @@ struct __extract_key_first_tag {};
4788	template <class _ValTy, class _Key,	3961	template <class _ValTy, class _Key,
4789	class _RawValTy = typename __unconstref<_ValTy>::type>	3962	class _RawValTy = typename __unconstref<_ValTy>::type>
4790	struct __can_extract_key	3963	struct __can_extract_key
4791	: conditional<is_same<_RawValTy, _Key>::value, __extract_key_self_tag,	3964	: conditional<_IsSame<_RawValTy, _Key>::value, __extract_key_self_tag,
4792	__extract_key_fail_tag>::type {};	3965	__extract_key_fail_tag>::type {};
4793		3966
4794	template <class _Pair, class _Key, class _First, class _Second>	3967	template <class _Pair, class _Key, class _First, class _Second>
4795	struct __can_extract_key<_Pair, _Key, pair<_First, _Second>>	3968	struct __can_extract_key<_Pair, _Key, pair<_First, _Second>>
4796	: conditional<is_same<typename remove_const<_First>::type, _Key>::value,	3969	: conditional<_IsSame<typename remove_const<_First>::type, _Key>::value,
4797	__extract_key_first_tag, __extract_key_fail_tag>::type {};	3970	__extract_key_first_tag, __extract_key_fail_tag>::type {};
4798		3971
4799	// __can_extract_map_key uses true_type/false_type instead of the tags.	3972	// __can_extract_map_key uses true_type/false_type instead of the tags.
...	@@ -4802,7 +3975,7 @@ struct __can_extract_key<_Pair, _Key, pair<_First, _Second>>	...	@@ -4802,7 +3975,7 @@ struct __can_extract_key<_Pair, _Key, pair<_First, _Second>>
4802	template <class _ValTy, class _Key, class _ContainerValueTy,	3975	template <class _ValTy, class _Key, class _ContainerValueTy,
4803	class _RawValTy = typename __unconstref<_ValTy>::type>	3976	class _RawValTy = typename __unconstref<_ValTy>::type>
4804	struct __can_extract_map_key	3977	struct __can_extract_map_key
4805	: integral_constant<bool, is_same<_RawValTy, _Key>::value> {};	3978	: integral_constant<bool, _IsSame<_RawValTy, _Key>::value> {};
4806		3979
4807	// This specialization returns __extract_key_fail_tag for non-map containers	3980	// This specialization returns __extract_key_fail_tag for non-map containers
4808	// because _Key == _ContainerValueTy	3981	// because _Key == _ContainerValueTy
...	@@ -4827,6 +4000,24 @@ enum class endian	...	@@ -4827,6 +4000,24 @@ enum class endian
4827	};	4000	};
4828	#endif	4001	#endif
4829		4002
		4003	#ifndef _LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED
		4004	#if _LIBCPP_STD_VER > 17
		4005	_LIBCPP_INLINE_VISIBILITY
		4006	inline constexpr bool is_constant_evaluated() noexcept {
		4007	return __builtin_is_constant_evaluated();
		4008	}
		4009	#endif
		4010
		4011	inline _LIBCPP_CONSTEXPR
		4012	bool __libcpp_is_constant_evaluated() _NOEXCEPT { return __builtin_is_constant_evaluated(); }
		4013	#else
		4014	inline _LIBCPP_CONSTEXPR
		4015	bool __libcpp_is_constant_evaluated() _NOEXCEPT { return false; }
		4016	#endif
		4017
		4018	template <class _CharT>
		4019	using _IsCharLikeType = _And<is_standard_layout<_CharT>, is_trivial<_CharT> >;
		4020
4830	_LIBCPP_END_NAMESPACE_STD	4021	_LIBCPP_END_NAMESPACE_STD
4831		4022
4832	#if _LIBCPP_STD_VER > 14	4023	#if _LIBCPP_STD_VER > 14

lib/libcxx/include/typeindex+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- typeindex ---------------------------------===//	2	//===-------------------------- typeindex ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/typeinfo+190-76

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- typeinfo ----------------------------------===//	2	//===-------------------------- typeinfo ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -69,59 +68,32 @@ public:	...	@@ -69,59 +68,32 @@ public:
69	#pragma GCC system_header	68	#pragma GCC system_header
70	#endif	69	#endif
71		70
72	#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)	71	#if defined(_LIBCPP_ABI_VCRUNTIME)
73	#include <vcruntime_typeinfo.h>	72	#include <vcruntime_typeinfo.h>
74	#else	73	#else
75		74
76	#if defined(_LIBCPP_NONUNIQUE_RTTI_BIT) && !defined(_LIBCPP_ABI_MICROSOFT)
77	# define _LIBCPP_HAS_NONUNIQUE_TYPEINFO
78	#endif
79
80	namespace std // purposefully not using versioning namespace	75	namespace std // purposefully not using versioning namespace
81	{	76	{
82		77
		78
		79	#if defined(_LIBCPP_ABI_MICROSOFT)
		80
83	class _LIBCPP_EXCEPTION_ABI type_info	81	class _LIBCPP_EXCEPTION_ABI type_info
84	{	82	{
85	type_info& operator=(const type_info&);	83	type_info& operator=(const type_info&);
86	type_info(const type_info&);	84	type_info(const type_info&);
87		85
88	#if defined(_LIBCPP_HAS_NONUNIQUE_TYPEINFO)
89	_LIBCPP_INLINE_VISIBILITY
90	int __compare_nonunique_names(const type_info &__arg) const _NOEXCEPT
91	{ return __builtin_strcmp(name(), __arg.name()); }
92	#endif
93
94	#if defined(_LIBCPP_ABI_MICROSOFT)
95	mutable struct {	86	mutable struct {
96	const char *__undecorated_name;	87	const char *__undecorated_name;
97	const char __decorated_name[1];	88	const char __decorated_name[1];
98	} __data;	89	} __data;
99		90
100	int __compare(const type_info &__rhs) const _NOEXCEPT;	91	int __compare(const type_info &__rhs) const _NOEXCEPT;
101	#endif // _LIBCPP_ABI_MICROSOFT
102
103	protected:
104	#if !defined(_LIBCPP_ABI_MICROSOFT)
105	#if defined(_LIBCPP_HAS_NONUNIQUE_TYPEINFO)
106	// A const char* with the non-unique RTTI bit possibly set.
107	uintptr_t __type_name;
108
109	_LIBCPP_INLINE_VISIBILITY
110	explicit type_info(const char* __n)
111	: __type_name(reinterpret_cast<uintptr_t>(__n)) {}
112	#else
113	const char *__type_name;
114
115	_LIBCPP_INLINE_VISIBILITY
116	explicit type_info(const char* __n) : __type_name(__n) {}
117	#endif
118	#endif // ! _LIBCPP_ABI_MICROSOFT
119		92
120	public:	93	public:
121	_LIBCPP_AVAILABILITY_TYPEINFO_VTABLE	94	_LIBCPP_AVAILABILITY_TYPEINFO_VTABLE
122	virtual ~type_info();	95	virtual ~type_info();
123		96
124	#if defined(_LIBCPP_ABI_MICROSOFT)
125	const char *name() const _NOEXCEPT;	97	const char *name() const _NOEXCEPT;
126		98
127	_LIBCPP_INLINE_VISIBILITY	99	_LIBCPP_INLINE_VISIBILITY
...	@@ -135,91 +107,233 @@ public:	...	@@ -135,91 +107,233 @@ public:
135	bool operator==(const type_info& __arg) const _NOEXCEPT {	107	bool operator==(const type_info& __arg) const _NOEXCEPT {
136	return __compare(__arg) == 0;	108	return __compare(__arg) == 0;
137	}	109	}
138	#else
139	#if defined(_LIBCPP_HAS_NONUNIQUE_TYPEINFO)
140	_LIBCPP_INLINE_VISIBILITY
141	const char* name() const _NOEXCEPT
142	{
143	return reinterpret_cast<const char*>(__type_name &
144	~_LIBCPP_NONUNIQUE_RTTI_BIT);
145	}
146		110
147	_LIBCPP_INLINE_VISIBILITY	111	_LIBCPP_INLINE_VISIBILITY
148	bool before(const type_info& __arg) const _NOEXCEPT	112	bool operator!=(const type_info& __arg) const _NOEXCEPT
149	{	113	{ return !operator==(__arg); }
150	if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))	114	};
151	return __type_name < __arg.__type_name;	115
152	return __compare_nonunique_names(__arg) < 0;	116	#else // !defined(_LIBCPP_ABI_MICROSOFT)
		117
		118	// ========================================================================== //
		119	// Implementations
		120	// ========================================================================== //
		121	// ------------------------------------------------------------------------- //
		122	// Unique
		123	// ------------------------------------------------------------------------- //
		124	// This implementation of type_info assumes a unique copy of the RTTI for a
		125	// given type inside a program. This is a valid assumption when abiding to
		126	// Itanium ABI (http://itanium-cxx-abi.github.io/cxx-abi/abi.html#vtable-components).
		127	// Under this assumption, we can always compare the addresses of the type names
		128	// to implement equality-comparison of type_infos instead of having to perform
		129	// a deep string comparison.
		130	// -------------------------------------------------------------------------- //
		131	// NonUnique
		132	// -------------------------------------------------------------------------- //
		133	// This implementation of type_info does not assume there is always a unique
		134	// copy of the RTTI for a given type inside a program. For various reasons
		135	// the linker may have failed to merge every copy of a types RTTI
		136	// (For example: -Bsymbolic or llvm.org/PR37398). Under this assumption, two
		137	// type_infos are equal if their addresses are equal or if a deep string
		138	// comparison is equal.
		139	// -------------------------------------------------------------------------- //
		140	// NonUniqueARMRTTIBit
		141	// -------------------------------------------------------------------------- //
		142	// This implementation of type_info does not assume always a unique copy of
		143	// the RTTI for a given type inside a program. It packs the pointer to the
		144	// type name into a uintptr_t and reserves the high bit of that pointer (which
		145	// is assumed to be free for use under the ABI in use) to represent whether
		146	// that specific copy of the RTTI can be assumed unique inside the program.
		147	// To implement equality-comparison of type_infos, we check whether BOTH
		148	// type_infos are guaranteed unique, and if so, we simply compare the addresses
		149	// of their type names instead of doing a deep string comparison, which is
		150	// faster. If at least one of the type_infos can't guarantee uniqueness, we
		151	// have no choice but to fall back to a deep string comparison.
		152	//
		153	// This implementation is specific to ARM64 on Apple platforms.
		154	//
		155	// Note that the compiler is the one setting (or unsetting) the high bit of
		156	// the pointer when it constructs the type_info, depending on whether it can
		157	// guarantee uniqueness for that specific type_info.
		158
		159	struct __type_info_implementations {
		160	struct __string_impl_base {
		161	typedef const char* __type_name_t;
		162	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		163	_LIBCPP_CONSTEXPR static const char* __type_name_to_string(__type_name_t __v) _NOEXCEPT {
		164	return __v;
153	}	165	}
		166	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		167	_LIBCPP_CONSTEXPR static __type_name_t __string_to_type_name(const char* __v) _NOEXCEPT {
		168	return __v;
		169	}
		170	};
154		171
155	_LIBCPP_INLINE_VISIBILITY	172	struct __unique_impl : __string_impl_base {
156	size_t hash_code() const _NOEXCEPT	173	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
157	{	174	static size_t __hash(__type_name_t __v) _NOEXCEPT {
158	if (!(__type_name & _LIBCPP_NONUNIQUE_RTTI_BIT))	175	return reinterpret_cast<size_t>(__v);
159	return __type_name;	176	}
		177	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		178	static bool __eq(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		179	return __lhs == __rhs;
		180	}
		181	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		182	static bool __lt(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		183	return __lhs < __rhs;
		184	}
		185	};
160		186
161	const char* __ptr = name();	187	struct __non_unique_impl : __string_impl_base {
		188	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		189	static size_t __hash(__type_name_t __ptr) _NOEXCEPT {
162	size_t __hash = 5381;	190	size_t __hash = 5381;
163	while (unsigned char __c = static_cast<unsigned char>(*__ptr++))	191	while (unsigned char __c = static_cast<unsigned char>(*__ptr++))
164	__hash = (__hash * 33) ^ __c;	192	__hash = (__hash * 33) ^ __c;
165	return __hash;	193	return __hash;
166	}	194	}
		195	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		196	static bool __eq(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		197	return __lhs == __rhs \|\| __builtin_strcmp(__lhs, __rhs) == 0;
		198	}
		199	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		200	static bool __lt(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		201	return __builtin_strcmp(__lhs, __rhs) < 0;
		202	}
		203	};
167		204
168	_LIBCPP_INLINE_VISIBILITY	205	struct __non_unique_arm_rtti_bit_impl {
169	bool operator==(const type_info& __arg) const _NOEXCEPT	206	typedef uintptr_t __type_name_t;
170	{	207
171	if (__type_name == __arg.__type_name)	208	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
172	return true;	209	static const char* __type_name_to_string(__type_name_t __v) _NOEXCEPT {
		210	return reinterpret_cast<const char*>(__v &
		211	~__non_unique_rtti_bit::value);
		212	}
		213	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		214	static __type_name_t __string_to_type_name(const char* __v) _NOEXCEPT {
		215	return reinterpret_cast<__type_name_t>(__v);
		216	}
173		217
174	if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))	218	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		219	static size_t __hash(__type_name_t __v) _NOEXCEPT {
		220	if (__is_type_name_unique(__v))
		221	return reinterpret_cast<size_t>(__v);
		222	return __non_unique_impl::__hash(__type_name_to_string(__v));
		223	}
		224	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		225	static bool __eq(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		226	if (__lhs == __rhs)
		227	return true;
		228	if (__is_type_name_unique(__lhs, __rhs))
175	return false;	229	return false;
176	return __compare_nonunique_names(__arg) == 0;	230	return __builtin_strcmp(__type_name_to_string(__lhs), __type_name_to_string(__rhs)) == 0;
		231	}
		232	_LIBCPP_INLINE_VISIBILITY _LIBCPP_ALWAYS_INLINE
		233	static bool __lt(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		234	if (__is_type_name_unique(__lhs, __rhs))
		235	return __lhs < __rhs;
		236	return __builtin_strcmp(__type_name_to_string(__lhs), __type_name_to_string(__rhs)) < 0;
177	}	237	}
		238
		239	private:
		240	// The unique bit is the top bit. It is expected that __type_name_t is 64 bits when
		241	// this implementation is actually used.
		242	typedef std::integral_constant<__type_name_t,
		243	(1ULL << ((__CHAR_BIT__ * sizeof(__type_name_t)) - 1))> __non_unique_rtti_bit;
		244
		245	_LIBCPP_INLINE_VISIBILITY
		246	static bool __is_type_name_unique(__type_name_t __lhs) _NOEXCEPT {
		247	return !(__lhs & __non_unique_rtti_bit::value);
		248	}
		249	_LIBCPP_INLINE_VISIBILITY
		250	static bool __is_type_name_unique(__type_name_t __lhs, __type_name_t __rhs) _NOEXCEPT {
		251	return !((__lhs & __rhs) & __non_unique_rtti_bit::value);
		252	}
		253	};
		254
		255	typedef
		256	#if defined(__APPLE__) && defined(__LP64__) && !defined(__x86_64__)
		257	__non_unique_arm_rtti_bit_impl
		258	#elif _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT == 0
		259	__non_unique_impl
		260	#elif _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT == 1
		261	__unique_impl
178	#else	262	#else
		263	# error invalid configuration for _LIBCPP_HAS_MERGED_TYPEINFO_NAMES_DEFAULT
		264	#endif
		265	__impl;
		266	};
		267
		268	class _LIBCPP_EXCEPTION_ABI type_info
		269	{
		270	type_info& operator=(const type_info&);
		271	type_info(const type_info&);
		272
		273	protected:
		274	typedef __type_info_implementations::__impl __impl;
		275
		276	__impl::__type_name_t __type_name;
		277
		278	_LIBCPP_INLINE_VISIBILITY
		279	explicit type_info(const char* __n)
		280	: __type_name(__impl::__string_to_type_name(__n)) {}
		281
		282	public:
		283	_LIBCPP_AVAILABILITY_TYPEINFO_VTABLE
		284	virtual ~type_info();
		285
179	_LIBCPP_INLINE_VISIBILITY	286	_LIBCPP_INLINE_VISIBILITY
180	const char* name() const _NOEXCEPT	287	const char* name() const _NOEXCEPT
181	{ return __type_name; }	288	{
		289	return __impl::__type_name_to_string(__type_name);
		290	}
182		291
183	_LIBCPP_INLINE_VISIBILITY	292	_LIBCPP_INLINE_VISIBILITY
184	bool before(const type_info& __arg) const _NOEXCEPT	293	bool before(const type_info& __arg) const _NOEXCEPT
185	{ return __type_name < __arg.__type_name; }	294	{
		295	return __impl::__lt(__type_name, __arg.__type_name);
		296	}
186		297
187	_LIBCPP_INLINE_VISIBILITY	298	_LIBCPP_INLINE_VISIBILITY
188	size_t hash_code() const _NOEXCEPT	299	size_t hash_code() const _NOEXCEPT
189	{ return reinterpret_cast<size_t>(__type_name); }	300	{
		301	return __impl::__hash(__type_name);
		302	}
190		303
191	_LIBCPP_INLINE_VISIBILITY	304	_LIBCPP_INLINE_VISIBILITY
192	bool operator==(const type_info& __arg) const _NOEXCEPT	305	bool operator==(const type_info& __arg) const _NOEXCEPT
193	{ return __type_name == __arg.__type_name; }	306	{
194	#endif	307	return __impl::__eq(__type_name, __arg.__type_name);
195	#endif // _LIBCPP_ABI_MICROSOFT	308	}
196		309
197	_LIBCPP_INLINE_VISIBILITY	310	_LIBCPP_INLINE_VISIBILITY
198	bool operator!=(const type_info& __arg) const _NOEXCEPT	311	bool operator!=(const type_info& __arg) const _NOEXCEPT
199	{ return !operator==(__arg); }	312	{ return !operator==(__arg); }
200	};	313	};
		314	#endif // defined(_LIBCPP_ABI_MICROSOFT)
201		315
202	class _LIBCPP_EXCEPTION_ABI bad_cast	316	class _LIBCPP_EXCEPTION_ABI bad_cast
203	: public exception	317	: public exception
204	{	318	{
205	public:	319	public:
206	bad_cast() _NOEXCEPT;	320	bad_cast() _NOEXCEPT;
207	virtual ~bad_cast() _NOEXCEPT;	321	virtual ~bad_cast() _NOEXCEPT;
208	virtual const char* what() const _NOEXCEPT;	322	virtual const char* what() const _NOEXCEPT;
209	};	323	};
210		324
211	class _LIBCPP_EXCEPTION_ABI bad_typeid	325	class _LIBCPP_EXCEPTION_ABI bad_typeid
212	: public exception	326	: public exception
213	{	327	{
214	public:	328	public:
215	bad_typeid() _NOEXCEPT;	329	bad_typeid() _NOEXCEPT;
216	virtual ~bad_typeid() _NOEXCEPT;	330	virtual ~bad_typeid() _NOEXCEPT;
217	virtual const char* what() const _NOEXCEPT;	331	virtual const char* what() const _NOEXCEPT;
218	};	332	};
219		333
220	} // std	334	} // std
221		335
222	#endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)	336	#endif // defined(_LIBCPP_ABI_VCRUNTIME)
223		337
224	_LIBCPP_BEGIN_NAMESPACE_STD	338	_LIBCPP_BEGIN_NAMESPACE_STD
225	_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY	339	_LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY

lib/libcxx/include/unordered_map+173-28

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- unordered_map -----------------------------===//	2	//===-------------------------- unordered_map -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -80,12 +79,12 @@ public:	...	@@ -80,12 +79,12 @@ public:
80	unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a)	79	unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
81	: unordered_map(f, l, n, hasher(), key_equal(), a) {} // C++14	80	: unordered_map(f, l, n, hasher(), key_equal(), a) {} // C++14
82	template <class InputIterator>	81	template <class InputIterator>
83	unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf,	82	unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf,
84	const allocator_type& a)	83	const allocator_type& a)
85	: unordered_map(f, l, n, hf, key_equal(), a) {} // C++14	84	: unordered_map(f, l, n, hf, key_equal(), a) {} // C++14
86	unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a)	85	unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a)
87	: unordered_map(il, n, hasher(), key_equal(), a) {} // C++14	86	: unordered_map(il, n, hasher(), key_equal(), a) {} // C++14
88	unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf,	87	unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf,
89	const allocator_type& a)	88	const allocator_type& a)
90	: unordered_map(il, n, hf, key_equal(), a) {} // C++14	89	: unordered_map(il, n, hf, key_equal(), a) {} // C++14
91	~unordered_map();	90	~unordered_map();
...	@@ -175,6 +174,7 @@ public:	...	@@ -175,6 +174,7 @@ public:
175	iterator find(const key_type& k);	174	iterator find(const key_type& k);
176	const_iterator find(const key_type& k) const;	175	const_iterator find(const key_type& k) const;
177	size_type count(const key_type& k) const;	176	size_type count(const key_type& k) const;
		177	bool contains(const key_type& k) const; // C++20
178	pair<iterator, iterator> equal_range(const key_type& k);	178	pair<iterator, iterator> equal_range(const key_type& k);
179	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;	179	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
180		180
...	@@ -278,12 +278,12 @@ public:	...	@@ -278,12 +278,12 @@ public:
278	unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a)	278	unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
279	: unordered_multimap(f, l, n, hasher(), key_equal(), a) {} // C++14	279	: unordered_multimap(f, l, n, hasher(), key_equal(), a) {} // C++14
280	template <class InputIterator>	280	template <class InputIterator>
281	unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf,	281	unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf,
282	const allocator_type& a)	282	const allocator_type& a)
283	: unordered_multimap(f, l, n, hf, key_equal(), a) {} // C++14	283	: unordered_multimap(f, l, n, hf, key_equal(), a) {} // C++14
284	unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a)	284	unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a)
285	: unordered_multimap(il, n, hasher(), key_equal(), a) {} // C++14	285	: unordered_multimap(il, n, hasher(), key_equal(), a) {} // C++14
286	unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf,	286	unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf,
287	const allocator_type& a)	287	const allocator_type& a)
288	: unordered_multimap(il, n, hf, key_equal(), a) {} // C++14	288	: unordered_multimap(il, n, hf, key_equal(), a) {} // C++14
289	~unordered_multimap();	289	~unordered_multimap();
...	@@ -356,6 +356,7 @@ public:	...	@@ -356,6 +356,7 @@ public:
356	iterator find(const key_type& k);	356	iterator find(const key_type& k);
357	const_iterator find(const key_type& k) const;	357	const_iterator find(const key_type& k) const;
358	size_type count(const key_type& k) const;	358	size_type count(const key_type& k) const;
		359	bool contains(const key_type& k) const; // C++20
359	pair<iterator, iterator> equal_range(const key_type& k);	360	pair<iterator, iterator> equal_range(const key_type& k);
360	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;	361	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
361		362
...	@@ -845,15 +846,14 @@ public:	...	@@ -845,15 +846,14 @@ public:
845	// types	846	// types
846	typedef _Key key_type;	847	typedef _Key key_type;
847	typedef _Tp mapped_type;	848	typedef _Tp mapped_type;
848	typedef _Hash hasher;	849	typedef typename __identity<_Hash>::type hasher;
849	typedef _Pred key_equal;	850	typedef typename __identity<_Pred>::type key_equal;
850	typedef _Alloc allocator_type;	851	typedef typename __identity<_Alloc>::type allocator_type;
851	typedef pair<const key_type, mapped_type> value_type;	852	typedef pair<const key_type, mapped_type> value_type;
852	typedef value_type& reference;	853	typedef value_type& reference;
853	typedef const value_type& const_reference;	854	typedef const value_type& const_reference;
854	static_assert((is_same<value_type, typename allocator_type::value_type>::value),	855	static_assert((is_same<value_type, typename allocator_type::value_type>::value),
855	"Invalid allocator::value_type");	856	"Invalid allocator::value_type");
856	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
857		857
858	private:	858	private:
859	typedef __hash_value_type<key_type, mapped_type> __value_type;	859	typedef __hash_value_type<key_type, mapped_type> __value_type;
...	@@ -953,18 +953,22 @@ public:	...	@@ -953,18 +953,22 @@ public:
953	: unordered_map(__first, __last, __n, hasher(), key_equal(), __a) {}	953	: unordered_map(__first, __last, __n, hasher(), key_equal(), __a) {}
954	template <class _InputIterator>	954	template <class _InputIterator>
955	_LIBCPP_INLINE_VISIBILITY	955	_LIBCPP_INLINE_VISIBILITY
956	unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf,	956	unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf,
957	const allocator_type& __a)	957	const allocator_type& __a)
958	: unordered_map(__first, __last, __n, __hf, key_equal(), __a) {}	958	: unordered_map(__first, __last, __n, __hf, key_equal(), __a) {}
959	_LIBCPP_INLINE_VISIBILITY	959	_LIBCPP_INLINE_VISIBILITY
960	unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)	960	unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
961	: unordered_map(__il, __n, hasher(), key_equal(), __a) {}	961	: unordered_map(__il, __n, hasher(), key_equal(), __a) {}
962	_LIBCPP_INLINE_VISIBILITY	962	_LIBCPP_INLINE_VISIBILITY
963	unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf,	963	unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf,
964	const allocator_type& __a)	964	const allocator_type& __a)
965	: unordered_map(__il, __n, __hf, key_equal(), __a) {}	965	: unordered_map(__il, __n, __hf, key_equal(), __a) {}
966	#endif	966	#endif
967	// ~unordered_map() = default;	967	_LIBCPP_INLINE_VISIBILITY
		968	~unordered_map() {
		969	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
		970	}
		971
968	_LIBCPP_INLINE_VISIBILITY	972	_LIBCPP_INLINE_VISIBILITY
969	unordered_map& operator=(const unordered_map& __u)	973	unordered_map& operator=(const unordered_map& __u)
970	{	974	{
...	@@ -1276,6 +1280,10 @@ public:	...	@@ -1276,6 +1280,10 @@ public:
1276	const_iterator find(const key_type& __k) const {return __table_.find(__k);}	1280	const_iterator find(const key_type& __k) const {return __table_.find(__k);}
1277	_LIBCPP_INLINE_VISIBILITY	1281	_LIBCPP_INLINE_VISIBILITY
1278	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}	1282	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
		1283	#if _LIBCPP_STD_VER > 17
		1284	_LIBCPP_INLINE_VISIBILITY
		1285	bool contains(const key_type& __k) const {return find(__k) != end();}
		1286	#endif // _LIBCPP_STD_VER > 17
1279	_LIBCPP_INLINE_VISIBILITY	1287	_LIBCPP_INLINE_VISIBILITY
1280	pair<iterator, iterator> equal_range(const key_type& __k)	1288	pair<iterator, iterator> equal_range(const key_type& __k)
1281	{return __table_.__equal_range_unique(__k);}	1289	{return __table_.__equal_range_unique(__k);}
...	@@ -1346,6 +1354,73 @@ private:	...	@@ -1346,6 +1354,73 @@ private:
1346	#endif	1354	#endif
1347	};	1355	};
1348		1356
		1357	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		1358	template<class _InputIterator,
		1359	class _Hash = hash<__iter_key_type<_InputIterator>>,
		1360	class _Pred = equal_to<__iter_key_type<_InputIterator>>,
		1361	class _Allocator = allocator<__iter_to_alloc_type<_InputIterator>>,
		1362	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1363	class = _EnableIf<!is_integral<_Hash>::value>,
		1364	class = _EnableIf<!__is_allocator<_Pred>::value>,
		1365	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1366	unordered_map(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type = 0,
		1367	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		1368	-> unordered_map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>, _Hash, _Pred, _Allocator>;
		1369
		1370	template<class _Key, class _Tp, class _Hash = hash<remove_const_t<_Key>>,
		1371	class _Pred = equal_to<remove_const_t<_Key>>,
		1372	class _Allocator = allocator<pair<const _Key, _Tp>>,
		1373	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1374	class = _EnableIf<!is_integral<_Hash>::value>,
		1375	class = _EnableIf<!__is_allocator<_Pred>::value>,
		1376	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1377	unordered_map(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type = 0,
		1378	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		1379	-> unordered_map<remove_const_t<_Key>, _Tp, _Hash, _Pred, _Allocator>;
		1380
		1381	template<class _InputIterator, class _Allocator,
		1382	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1383	unordered_map(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type, _Allocator)
		1384	-> unordered_map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		1385	hash<__iter_key_type<_InputIterator>>, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		1386
		1387	template<class _InputIterator, class _Allocator,
		1388	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1389	unordered_map(_InputIterator, _InputIterator, _Allocator)
		1390	-> unordered_map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		1391	hash<__iter_key_type<_InputIterator>>, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		1392
		1393	template<class _InputIterator, class _Hash, class _Allocator,
		1394	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1395	class = _EnableIf<!is_integral<_Hash>::value>,
		1396	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1397	unordered_map(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		1398	-> unordered_map<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		1399	_Hash, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		1400
		1401	template<class _Key, class _Tp, class _Allocator,
		1402	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1403	unordered_map(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type, _Allocator)
		1404	-> unordered_map<remove_const_t<_Key>, _Tp,
		1405	hash<remove_const_t<_Key>>,
		1406	equal_to<remove_const_t<_Key>>, _Allocator>;
		1407
		1408	template<class _Key, class _Tp, class _Allocator,
		1409	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1410	unordered_map(initializer_list<pair<_Key, _Tp>>, _Allocator)
		1411	-> unordered_map<remove_const_t<_Key>, _Tp,
		1412	hash<remove_const_t<_Key>>,
		1413	equal_to<remove_const_t<_Key>>, _Allocator>;
		1414
		1415	template<class _Key, class _Tp, class _Hash, class _Allocator,
		1416	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1417	class = _EnableIf<!is_integral<_Hash>::value>,
		1418	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1419	unordered_map(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		1420	-> unordered_map<remove_const_t<_Key>, _Tp, _Hash,
		1421	equal_to<remove_const_t<_Key>>, _Allocator>;
		1422	#endif
		1423
1349	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	1424	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
1350	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(	1425	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
1351	size_type __n, const hasher& __hf, const key_equal& __eql)	1426	size_type __n, const hasher& __hf, const key_equal& __eql)
...	@@ -1603,10 +1678,8 @@ _Tp&	...	@@ -1603,10 +1678,8 @@ _Tp&
1603	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k)	1678	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k)
1604	{	1679	{
1605	iterator __i = find(__k);	1680	iterator __i = find(__k);
1606	#ifndef _LIBCPP_NO_EXCEPTIONS
1607	if (__i == end())	1681	if (__i == end())
1608	throw out_of_range("unordered_map::at: key not found");	1682	__throw_out_of_range("unordered_map::at: key not found");
1609	#endif // _LIBCPP_NO_EXCEPTIONS
1610	return __i->second;	1683	return __i->second;
1611	}	1684	}
1612		1685
...	@@ -1615,10 +1688,8 @@ const _Tp&	...	@@ -1615,10 +1688,8 @@ const _Tp&
1615	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k) const	1688	unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k) const
1616	{	1689	{
1617	const_iterator __i = find(__k);	1690	const_iterator __i = find(__k);
1618	#ifndef _LIBCPP_NO_EXCEPTIONS
1619	if (__i == end())	1691	if (__i == end())
1620	throw out_of_range("unordered_map::at: key not found");	1692	__throw_out_of_range("unordered_map::at: key not found");
1621	#endif // _LIBCPP_NO_EXCEPTIONS
1622	return __i->second;	1693	return __i->second;
1623	}	1694	}
1624		1695
...	@@ -1675,15 +1746,14 @@ public:	...	@@ -1675,15 +1746,14 @@ public:
1675	// types	1746	// types
1676	typedef _Key key_type;	1747	typedef _Key key_type;
1677	typedef _Tp mapped_type;	1748	typedef _Tp mapped_type;
1678	typedef _Hash hasher;	1749	typedef typename __identity<_Hash>::type hasher;
1679	typedef _Pred key_equal;	1750	typedef typename __identity<_Pred>::type key_equal;
1680	typedef _Alloc allocator_type;	1751	typedef typename __identity<_Alloc>::type allocator_type;
1681	typedef pair<const key_type, mapped_type> value_type;	1752	typedef pair<const key_type, mapped_type> value_type;
1682	typedef value_type& reference;	1753	typedef value_type& reference;
1683	typedef const value_type& const_reference;	1754	typedef const value_type& const_reference;
1684	static_assert((is_same<value_type, typename allocator_type::value_type>::value),	1755	static_assert((is_same<value_type, typename allocator_type::value_type>::value),
1685	"Invalid allocator::value_type");	1756	"Invalid allocator::value_type");
1686	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
1687		1757
1688	private:	1758	private:
1689	typedef __hash_value_type<key_type, mapped_type> __value_type;	1759	typedef __hash_value_type<key_type, mapped_type> __value_type;
...	@@ -1781,18 +1851,22 @@ public:	...	@@ -1781,18 +1851,22 @@ public:
1781	: unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) {}	1851	: unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) {}
1782	template <class _InputIterator>	1852	template <class _InputIterator>
1783	_LIBCPP_INLINE_VISIBILITY	1853	_LIBCPP_INLINE_VISIBILITY
1784	unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf,	1854	unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf,
1785	const allocator_type& __a)	1855	const allocator_type& __a)
1786	: unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {}	1856	: unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {}
1787	_LIBCPP_INLINE_VISIBILITY	1857	_LIBCPP_INLINE_VISIBILITY
1788	unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)	1858	unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
1789	: unordered_multimap(__il, __n, hasher(), key_equal(), __a) {}	1859	: unordered_multimap(__il, __n, hasher(), key_equal(), __a) {}
1790	_LIBCPP_INLINE_VISIBILITY	1860	_LIBCPP_INLINE_VISIBILITY
1791	unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf,	1861	unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf,
1792	const allocator_type& __a)	1862	const allocator_type& __a)
1793	: unordered_multimap(__il, __n, __hf, key_equal(), __a) {}	1863	: unordered_multimap(__il, __n, __hf, key_equal(), __a) {}
1794	#endif	1864	#endif
1795	// ~unordered_multimap() = default;	1865	_LIBCPP_INLINE_VISIBILITY
		1866	~unordered_multimap() {
		1867	static_assert(sizeof(__diagnose_unordered_container_requirements<_Key, _Hash, _Pred>(0)), "");
		1868	}
		1869
1796	_LIBCPP_INLINE_VISIBILITY	1870	_LIBCPP_INLINE_VISIBILITY
1797	unordered_multimap& operator=(const unordered_multimap& __u)	1871	unordered_multimap& operator=(const unordered_multimap& __u)
1798	{	1872	{
...	@@ -1981,6 +2055,10 @@ public:	...	@@ -1981,6 +2055,10 @@ public:
1981	const_iterator find(const key_type& __k) const {return __table_.find(__k);}	2055	const_iterator find(const key_type& __k) const {return __table_.find(__k);}
1982	_LIBCPP_INLINE_VISIBILITY	2056	_LIBCPP_INLINE_VISIBILITY
1983	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}	2057	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
		2058	#if _LIBCPP_STD_VER > 17
		2059	_LIBCPP_INLINE_VISIBILITY
		2060	bool contains(const key_type& __k) const {return find(__k) != end();}
		2061	#endif // _LIBCPP_STD_VER > 17
1984	_LIBCPP_INLINE_VISIBILITY	2062	_LIBCPP_INLINE_VISIBILITY
1985	pair<iterator, iterator> equal_range(const key_type& __k)	2063	pair<iterator, iterator> equal_range(const key_type& __k)
1986	{return __table_.__equal_range_multi(__k);}	2064	{return __table_.__equal_range_multi(__k);}
...	@@ -2040,6 +2118,73 @@ public:	...	@@ -2040,6 +2118,73 @@ public:
2040		2118
2041	};	2119	};
2042		2120
		2121	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		2122	template<class _InputIterator,
		2123	class _Hash = hash<__iter_key_type<_InputIterator>>,
		2124	class _Pred = equal_to<__iter_key_type<_InputIterator>>,
		2125	class _Allocator = allocator<__iter_to_alloc_type<_InputIterator>>,
		2126	class = _EnableIf<!__is_allocator<_Hash>::value>,
		2127	class = _EnableIf<!is_integral<_Hash>::value>,
		2128	class = _EnableIf<!__is_allocator<_Pred>::value>,
		2129	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2130	unordered_multimap(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type = 0,
		2131	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		2132	-> unordered_multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>, _Hash, _Pred, _Allocator>;
		2133
		2134	template<class _Key, class _Tp, class _Hash = hash<remove_const_t<_Key>>,
		2135	class _Pred = equal_to<remove_const_t<_Key>>,
		2136	class _Allocator = allocator<pair<const _Key, _Tp>>,
		2137	class = _EnableIf<!__is_allocator<_Hash>::value>,
		2138	class = _EnableIf<!is_integral<_Hash>::value>,
		2139	class = _EnableIf<!__is_allocator<_Pred>::value>,
		2140	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2141	unordered_multimap(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type = 0,
		2142	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		2143	-> unordered_multimap<remove_const_t<_Key>, _Tp, _Hash, _Pred, _Allocator>;
		2144
		2145	template<class _InputIterator, class _Allocator,
		2146	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2147	unordered_multimap(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type, _Allocator)
		2148	-> unordered_multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		2149	hash<__iter_key_type<_InputIterator>>, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		2150
		2151	template<class _InputIterator, class _Allocator,
		2152	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2153	unordered_multimap(_InputIterator, _InputIterator, _Allocator)
		2154	-> unordered_multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		2155	hash<__iter_key_type<_InputIterator>>, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		2156
		2157	template<class _InputIterator, class _Hash, class _Allocator,
		2158	class = _EnableIf<!__is_allocator<_Hash>::value>,
		2159	class = _EnableIf<!is_integral<_Hash>::value>,
		2160	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2161	unordered_multimap(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		2162	-> unordered_multimap<__iter_key_type<_InputIterator>, __iter_mapped_type<_InputIterator>,
		2163	_Hash, equal_to<__iter_key_type<_InputIterator>>, _Allocator>;
		2164
		2165	template<class _Key, class _Tp, class _Allocator,
		2166	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2167	unordered_multimap(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type, _Allocator)
		2168	-> unordered_multimap<remove_const_t<_Key>, _Tp,
		2169	hash<remove_const_t<_Key>>,
		2170	equal_to<remove_const_t<_Key>>, _Allocator>;
		2171
		2172	template<class _Key, class _Tp, class _Allocator,
		2173	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2174	unordered_multimap(initializer_list<pair<_Key, _Tp>>, _Allocator)
		2175	-> unordered_multimap<remove_const_t<_Key>, _Tp,
		2176	hash<remove_const_t<_Key>>,
		2177	equal_to<remove_const_t<_Key>>, _Allocator>;
		2178
		2179	template<class _Key, class _Tp, class _Hash, class _Allocator,
		2180	class = _EnableIf<!__is_allocator<_Hash>::value>,
		2181	class = _EnableIf<!is_integral<_Hash>::value>,
		2182	class = _EnableIf<__is_allocator<_Allocator>::value>>
		2183	unordered_multimap(initializer_list<pair<_Key, _Tp>>, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		2184	-> unordered_multimap<remove_const_t<_Key>, _Tp, _Hash,
		2185	equal_to<remove_const_t<_Key>>, _Allocator>;
		2186	#endif
		2187
2043	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>	2188	template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
2044	unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(	2189	unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
2045	size_type __n, const hasher& __hf, const key_equal& __eql)	2190	size_type __n, const hasher& __hf, const key_equal& __eql)

lib/libcxx/include/unordered_set+145-20

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===-------------------------- unordered_set -----------------------------===//	2	//===-------------------------- unordered_set -----------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -76,7 +75,7 @@ public:	...	@@ -76,7 +75,7 @@ public:
76	template <class InputIterator>	75	template <class InputIterator>
77	unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14	76	unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
78	template <class InputIterator>	77	template <class InputIterator>
79	unordered_set(InputIterator f, InputIterator l, size_type n,	78	unordered_set(InputIterator f, InputIterator l, size_type n,
80	const hasher& hf, const allocator_type& a); // C++14	79	const hasher& hf, const allocator_type& a); // C++14
81	unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14	80	unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
82	unordered_set(initializer_list<value_type> il, size_type n,	81	unordered_set(initializer_list<value_type> il, size_type n,
...	@@ -147,6 +146,7 @@ public:	...	@@ -147,6 +146,7 @@ public:
147	iterator find(const key_type& k);	146	iterator find(const key_type& k);
148	const_iterator find(const key_type& k) const;	147	const_iterator find(const key_type& k) const;
149	size_type count(const key_type& k) const;	148	size_type count(const key_type& k) const;
		149	bool contains(const key_type& k) const; // C++20
150	pair<iterator, iterator> equal_range(const key_type& k);	150	pair<iterator, iterator> equal_range(const key_type& k);
151	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;	151	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
152		152
...	@@ -243,7 +243,7 @@ public:	...	@@ -243,7 +243,7 @@ public:
243	unordered_multiset(InputIterator f, InputIterator l, size_type n,	243	unordered_multiset(InputIterator f, InputIterator l, size_type n,
244	const hasher& hf, const allocator_type& a); // C++14	244	const hasher& hf, const allocator_type& a); // C++14
245	unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14	245	unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
246	unordered_multiset(initializer_list<value_type> il, size_type n,	246	unordered_multiset(initializer_list<value_type> il, size_type n,
247	const hasher& hf, const allocator_type& a); // C++14	247	const hasher& hf, const allocator_type& a); // C++14
248	~unordered_multiset();	248	~unordered_multiset();
249	unordered_multiset& operator=(const unordered_multiset&);	249	unordered_multiset& operator=(const unordered_multiset&);
...	@@ -311,6 +311,7 @@ public:	...	@@ -311,6 +311,7 @@ public:
311	iterator find(const key_type& k);	311	iterator find(const key_type& k);
312	const_iterator find(const key_type& k) const;	312	const_iterator find(const key_type& k) const;
313	size_type count(const key_type& k) const;	313	size_type count(const key_type& k) const;
		314	bool contains(const key_type& k) const; // C++20
314	pair<iterator, iterator> equal_range(const key_type& k);	315	pair<iterator, iterator> equal_range(const key_type& k);
315	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;	316	pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
316		317
...	@@ -384,14 +385,13 @@ public:	...	@@ -384,14 +385,13 @@ public:
384	// types	385	// types
385	typedef _Value key_type;	386	typedef _Value key_type;
386	typedef key_type value_type;	387	typedef key_type value_type;
387	typedef _Hash hasher;	388	typedef typename __identity<_Hash>::type hasher;
388	typedef _Pred key_equal;	389	typedef typename __identity<_Pred>::type key_equal;
389	typedef _Alloc allocator_type;	390	typedef typename __identity<_Alloc>::type allocator_type;
390	typedef value_type& reference;	391	typedef value_type& reference;
391	typedef const value_type& const_reference;	392	typedef const value_type& const_reference;
392	static_assert((is_same<value_type, typename allocator_type::value_type>::value),	393	static_assert((is_same<value_type, typename allocator_type::value_type>::value),
393	"Invalid allocator::value_type");	394	"Invalid allocator::value_type");
394	static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
395		395
396	private:	396	private:
397	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;	397	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
...	@@ -452,11 +452,11 @@ public:	...	@@ -452,11 +452,11 @@ public:
452	#if _LIBCPP_STD_VER > 11	452	#if _LIBCPP_STD_VER > 11
453	template <class _InputIterator>	453	template <class _InputIterator>
454	inline _LIBCPP_INLINE_VISIBILITY	454	inline _LIBCPP_INLINE_VISIBILITY
455	unordered_set(_InputIterator __first, _InputIterator __last,	455	unordered_set(_InputIterator __first, _InputIterator __last,
456	size_type __n, const allocator_type& __a)	456	size_type __n, const allocator_type& __a)
457	: unordered_set(__first, __last, __n, hasher(), key_equal(), __a) {}	457	: unordered_set(__first, __last, __n, hasher(), key_equal(), __a) {}
458	template <class _InputIterator>	458	template <class _InputIterator>
459	unordered_set(_InputIterator __first, _InputIterator __last,	459	unordered_set(_InputIterator __first, _InputIterator __last,
460	size_type __n, const hasher& __hf, const allocator_type& __a)	460	size_type __n, const hasher& __hf, const allocator_type& __a)
461	: unordered_set(__first, __last, __n, __hf, key_equal(), __a) {}	461	: unordered_set(__first, __last, __n, __hf, key_equal(), __a) {}
462	#endif	462	#endif
...	@@ -482,12 +482,16 @@ public:	...	@@ -482,12 +482,16 @@ public:
482	const allocator_type& __a)	482	const allocator_type& __a)
483	: unordered_set(__il, __n, hasher(), key_equal(), __a) {}	483	: unordered_set(__il, __n, hasher(), key_equal(), __a) {}
484	inline _LIBCPP_INLINE_VISIBILITY	484	inline _LIBCPP_INLINE_VISIBILITY
485	unordered_set(initializer_list<value_type> __il, size_type __n,	485	unordered_set(initializer_list<value_type> __il, size_type __n,
486	const hasher& __hf, const allocator_type& __a)	486	const hasher& __hf, const allocator_type& __a)
487	: unordered_set(__il, __n, __hf, key_equal(), __a) {}	487	: unordered_set(__il, __n, __hf, key_equal(), __a) {}
488	#endif	488	#endif
489	#endif // _LIBCPP_CXX03_LANG	489	#endif // _LIBCPP_CXX03_LANG
490	// ~unordered_set() = default;	490	_LIBCPP_INLINE_VISIBILITY
		491	~unordered_set() {
		492	static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
		493	}
		494
491	_LIBCPP_INLINE_VISIBILITY	495	_LIBCPP_INLINE_VISIBILITY
492	unordered_set& operator=(const unordered_set& __u)	496	unordered_set& operator=(const unordered_set& __u)
493	{	497	{
...	@@ -675,6 +679,10 @@ public:	...	@@ -675,6 +679,10 @@ public:
675	const_iterator find(const key_type& __k) const {return __table_.find(__k);}	679	const_iterator find(const key_type& __k) const {return __table_.find(__k);}
676	_LIBCPP_INLINE_VISIBILITY	680	_LIBCPP_INLINE_VISIBILITY
677	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}	681	size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
		682	#if _LIBCPP_STD_VER > 17
		683	_LIBCPP_INLINE_VISIBILITY
		684	bool contains(const key_type& __k) const {return find(__k) != end();}
		685	#endif // _LIBCPP_STD_VER > 17
678	_LIBCPP_INLINE_VISIBILITY	686	_LIBCPP_INLINE_VISIBILITY
679	pair<iterator, iterator> equal_range(const key_type& __k)	687	pair<iterator, iterator> equal_range(const key_type& __k)
680	{return __table_.__equal_range_unique(__k);}	688	{return __table_.__equal_range_unique(__k);}
...	@@ -731,6 +739,62 @@ public:	...	@@ -731,6 +739,62 @@ public:
731		739
732	};	740	};
733		741
		742	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		743	template<class _InputIterator,
		744	class _Hash = hash<__iter_value_type<_InputIterator>>,
		745	class _Pred = equal_to<__iter_value_type<_InputIterator>>,
		746	class _Allocator = allocator<__iter_value_type<_InputIterator>>,
		747	class = _EnableIf<!__is_allocator<_Hash>::value>,
		748	class = _EnableIf<!is_integral<_Hash>::value>,
		749	class = _EnableIf<!__is_allocator<_Pred>::value>,
		750	class = _EnableIf<__is_allocator<_Allocator>::value>>
		751	unordered_set(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type = 0,
		752	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		753	-> unordered_set<__iter_value_type<_InputIterator>, _Hash, _Pred, _Allocator>;
		754
		755	template<class _Tp, class _Hash = hash<_Tp>,
		756	class _Pred = equal_to<_Tp>,
		757	class _Allocator = allocator<_Tp>,
		758	class = _EnableIf<!__is_allocator<_Hash>::value>,
		759	class = _EnableIf<!is_integral<_Hash>::value>,
		760	class = _EnableIf<!__is_allocator<_Pred>::value>,
		761	class = _EnableIf<__is_allocator<_Allocator>::value>>
		762	unordered_set(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type = 0,
		763	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		764	-> unordered_set<_Tp, _Hash, _Pred, _Allocator>;
		765
		766	template<class _InputIterator, class _Allocator,
		767	class = _EnableIf<__is_allocator<_Allocator>::value>>
		768	unordered_set(_InputIterator, _InputIterator,
		769	typename allocator_traits<_Allocator>::size_type, _Allocator)
		770	-> unordered_set<__iter_value_type<_InputIterator>,
		771	hash<__iter_value_type<_InputIterator>>,
		772	equal_to<__iter_value_type<_InputIterator>>,
		773	_Allocator>;
		774
		775	template<class _InputIterator, class _Hash, class _Allocator,
		776	class = _EnableIf<!__is_allocator<_Hash>::value>,
		777	class = _EnableIf<!is_integral<_Hash>::value>,
		778	class = _EnableIf<__is_allocator<_Allocator>::value>>
		779	unordered_set(_InputIterator, _InputIterator,
		780	typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		781	-> unordered_set<__iter_value_type<_InputIterator>, _Hash,
		782	equal_to<__iter_value_type<_InputIterator>>,
		783	_Allocator>;
		784
		785	template<class _Tp, class _Allocator,
		786	class = _EnableIf<__is_allocator<_Allocator>::value>>
		787	unordered_set(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type, _Allocator)
		788	-> unordered_set<_Tp, hash<_Tp>, equal_to<_Tp>, _Allocator>;
		789
		790	template<class _Tp, class _Hash, class _Allocator,
		791	class = _EnableIf<!__is_allocator<_Hash>::value>,
		792	class = _EnableIf<!is_integral<_Hash>::value>,
		793	class = _EnableIf<__is_allocator<_Allocator>::value>>
		794	unordered_set(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		795	-> unordered_set<_Tp, _Hash, equal_to<_Tp>, _Allocator>;
		796	#endif
		797
734	template <class _Value, class _Hash, class _Pred, class _Alloc>	798	template <class _Value, class _Hash, class _Pred, class _Alloc>
735	unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,	799	unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,
736	const hasher& __hf, const key_equal& __eql)	800	const hasher& __hf, const key_equal& __eql)
...	@@ -984,14 +1048,13 @@ public:	...	@@ -984,14 +1048,13 @@ public:
984	// types	1048	// types
985	typedef _Value key_type;	1049	typedef _Value key_type;
986	typedef key_type value_type;	1050	typedef key_type value_type;
987	typedef _Hash hasher;	1051	typedef typename __identity<_Hash>::type hasher;
988	typedef _Pred key_equal;	1052	typedef typename __identity<_Pred>::type key_equal;
989	typedef _Alloc allocator_type;	1053	typedef typename __identity<_Alloc>::type allocator_type;
990	typedef value_type& reference;	1054	typedef value_type& reference;
991	typedef const value_type& const_reference;	1055	typedef const value_type& const_reference;
992	static_assert((is_same<value_type, typename allocator_type::value_type>::value),	1056	static_assert((is_same<value_type, typename allocator_type::value_type>::value),
993	"Invalid allocator::value_type");	1057	"Invalid allocator::value_type");
994	static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
995		1058
996	private:	1059	private:
997	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;	1060	typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
...	@@ -1051,7 +1114,7 @@ public:	...	@@ -1051,7 +1114,7 @@ public:
1051	#if _LIBCPP_STD_VER > 11	1114	#if _LIBCPP_STD_VER > 11
1052	template <class _InputIterator>	1115	template <class _InputIterator>
1053	inline _LIBCPP_INLINE_VISIBILITY	1116	inline _LIBCPP_INLINE_VISIBILITY
1054	unordered_multiset(_InputIterator __first, _InputIterator __last,	1117	unordered_multiset(_InputIterator __first, _InputIterator __last,
1055	size_type __n, const allocator_type& __a)	1118	size_type __n, const allocator_type& __a)
1056	: unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) {}	1119	: unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) {}
1057	template <class _InputIterator>	1120	template <class _InputIterator>
...	@@ -1085,7 +1148,11 @@ public:	...	@@ -1085,7 +1148,11 @@ public:
1085	: unordered_multiset(__il, __n, __hf, key_equal(), __a) {}	1148	: unordered_multiset(__il, __n, __hf, key_equal(), __a) {}
1086	#endif	1149	#endif
1087	#endif // _LIBCPP_CXX03_LANG	1150	#endif // _LIBCPP_CXX03_LANG
1088	// ~unordered_multiset() = default;	1151	_LIBCPP_INLINE_VISIBILITY
		1152	~unordered_multiset() {
		1153	static_assert(sizeof(__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
		1154	}
		1155
1089	_LIBCPP_INLINE_VISIBILITY	1156	_LIBCPP_INLINE_VISIBILITY
1090	unordered_multiset& operator=(const unordered_multiset& __u)	1157	unordered_multiset& operator=(const unordered_multiset& __u)
1091	{	1158	{
...	@@ -1243,6 +1310,10 @@ public:	...	@@ -1243,6 +1310,10 @@ public:
1243	const_iterator find(const key_type& __k) const {return __table_.find(__k);}	1310	const_iterator find(const key_type& __k) const {return __table_.find(__k);}
1244	_LIBCPP_INLINE_VISIBILITY	1311	_LIBCPP_INLINE_VISIBILITY
1245	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}	1312	size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
		1313	#if _LIBCPP_STD_VER > 17
		1314	_LIBCPP_INLINE_VISIBILITY
		1315	bool contains(const key_type& __k) const {return find(__k) != end();}
		1316	#endif // _LIBCPP_STD_VER > 17
1246	_LIBCPP_INLINE_VISIBILITY	1317	_LIBCPP_INLINE_VISIBILITY
1247	pair<iterator, iterator> equal_range(const key_type& __k)	1318	pair<iterator, iterator> equal_range(const key_type& __k)
1248	{return __table_.__equal_range_multi(__k);}	1319	{return __table_.__equal_range_multi(__k);}
...	@@ -1299,6 +1370,60 @@ public:	...	@@ -1299,6 +1370,60 @@ public:
1299		1370
1300	};	1371	};
1301		1372
		1373	#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
		1374	template<class _InputIterator,
		1375	class _Hash = hash<__iter_value_type<_InputIterator>>,
		1376	class _Pred = equal_to<__iter_value_type<_InputIterator>>,
		1377	class _Allocator = allocator<__iter_value_type<_InputIterator>>,
		1378	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1379	class = _EnableIf<!is_integral<_Hash>::value>,
		1380	class = _EnableIf<!__is_allocator<_Pred>::value>,
		1381	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1382	unordered_multiset(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type = 0,
		1383	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		1384	-> unordered_multiset<__iter_value_type<_InputIterator>, _Hash, _Pred, _Allocator>;
		1385
		1386	template<class _Tp, class _Hash = hash<_Tp>,
		1387	class _Pred = equal_to<_Tp>, class _Allocator = allocator<_Tp>,
		1388	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1389	class = _EnableIf<!is_integral<_Hash>::value>,
		1390	class = _EnableIf<!__is_allocator<_Pred>::value>,
		1391	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1392	unordered_multiset(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type = 0,
		1393	_Hash = _Hash(), _Pred = _Pred(), _Allocator = _Allocator())
		1394	-> unordered_multiset<_Tp, _Hash, _Pred, _Allocator>;
		1395
		1396	template<class _InputIterator, class _Allocator,
		1397	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1398	unordered_multiset(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type, _Allocator)
		1399	-> unordered_multiset<__iter_value_type<_InputIterator>,
		1400	hash<__iter_value_type<_InputIterator>>,
		1401	equal_to<__iter_value_type<_InputIterator>>,
		1402	_Allocator>;
		1403
		1404	template<class _InputIterator, class _Hash, class _Allocator,
		1405	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1406	class = _EnableIf<!is_integral<_Hash>::value>,
		1407	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1408	unordered_multiset(_InputIterator, _InputIterator, typename allocator_traits<_Allocator>::size_type,
		1409	_Hash, _Allocator)
		1410	-> unordered_multiset<__iter_value_type<_InputIterator>, _Hash,
		1411	equal_to<__iter_value_type<_InputIterator>>,
		1412	_Allocator>;
		1413
		1414	template<class _Tp, class _Allocator,
		1415	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1416	unordered_multiset(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type, _Allocator)
		1417	-> unordered_multiset<_Tp, hash<_Tp>, equal_to<_Tp>, _Allocator>;
		1418
		1419	template<class _Tp, class _Hash, class _Allocator,
		1420	class = _EnableIf<!__is_allocator<_Hash>::value>,
		1421	class = _EnableIf<!is_integral<_Hash>::value>,
		1422	class = _EnableIf<__is_allocator<_Allocator>::value>>
		1423	unordered_multiset(initializer_list<_Tp>, typename allocator_traits<_Allocator>::size_type, _Hash, _Allocator)
		1424	-> unordered_multiset<_Tp, _Hash, equal_to<_Tp>, _Allocator>;
		1425	#endif
		1426
1302	template <class _Value, class _Hash, class _Pred, class _Alloc>	1427	template <class _Value, class _Hash, class _Pred, class _Alloc>
1303	unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(	1428	unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
1304	size_type __n, const hasher& __hf, const key_equal& __eql)	1429	size_type __n, const hasher& __hf, const key_equal& __eql)

lib/libcxx/include/utility+27-30

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- utility -----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -104,7 +103,7 @@ struct piecewise_construct_t { };
 inline constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
 template <class T> struct tuple_size;
-template <size_t I, class T> class tuple_element;
+template <size_t I, class T> struct tuple_element;
 template <class T1, class T2> struct tuple_size<pair<T1, T2> >;
 template <class T1, class T2> struct tuple_element<0, pair<T1, T2> >;
 @@ -253,7 +252,7 @@ operator>=(const _Tp& __x, const _Tp& __y)
 template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
 _ForwardIterator2
 swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2)
 {
 @@ -264,7 +263,7 @@ swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardItera
 // forward declared in <type_traits>
 template<class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
 typename enable_if<
     __is_swappable<_Tp>::value
 >::type
 @@ -350,7 +349,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     }
 #else
     template <bool _Val>
-    using _EnableB = typename enable_if<_Val, bool>::type;
+    using _EnableB _LIBCPP_NODEBUG_TYPE = typename enable_if<_Val, bool>::type;
     struct _CheckArgs {
       template <class _U1, class _U2>
 @@ -377,7 +376,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     };
     template <bool _MaybeEnable>
-    using _CheckArgsDep = typename conditional<
+    using _CheckArgsDep _LIBCPP_NODEBUG_TYPE = typename conditional<
       _MaybeEnable, _CheckArgs, __check_tuple_constructor_fail>::type;
     struct _CheckTupleLikeConstructor {
 @@ -399,7 +398,7 @@ struct _LIBCPP_TEMPLATE_VIS pair
     };
     template <class _Tuple>
-    using _CheckTLC = typename conditional<
+    using _CheckTLC _LIBCPP_NODEBUG_TYPE = typename conditional<
         __tuple_like_with_size<_Tuple, 2>::value
             && !is_same<typename decay<_Tuple>::type, pair>::value,
         _CheckTupleLikeConstructor,
 @@ -638,10 +637,10 @@ swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
 }
 template <class _Tp>
-struct __unwrap_reference { typedef _Tp type; };
+struct __unwrap_reference { typedef _LIBCPP_NODEBUG_TYPE _Tp type; };
 template <class _Tp>
-struct __unwrap_reference<reference_wrapper<_Tp> > { typedef _Tp& type; };
+struct __unwrap_reference<reference_wrapper<_Tp> > { typedef _LIBCPP_NODEBUG_TYPE _Tp& type; };
 #if _LIBCPP_STD_VER > 17
 template <class _Tp>
 @@ -688,23 +687,21 @@ template <class _T1, class _T2>
     : public integral_constant<size_t, 2> {};
 template <size_t _Ip, class _T1, class _T2>
-class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, pair<_T1, _T2> >
+struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, pair<_T1, _T2> >
 {
     static_assert(_Ip < 2, "Index out of bounds in std::tuple_element<std::pair<T1, T2>>");
 };
 template <class _T1, class _T2>
-class _LIBCPP_TEMPLATE_VIS tuple_element<0, pair<_T1, _T2> >
+struct _LIBCPP_TEMPLATE_VIS tuple_element<0, pair<_T1, _T2> >
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE _T1 type;
-    typedef _T1 type;
 };
 template <class _T1, class _T2>
-class _LIBCPP_TEMPLATE_VIS tuple_element<1, pair<_T1, _T2> >
+struct _LIBCPP_TEMPLATE_VIS tuple_element<1, pair<_T1, _T2> >
 {
-public:
+    typedef _LIBCPP_NODEBUG_TYPE _T2 type;
-    typedef _T2 type;
 };
 template <size_t _Ip> struct __get_pair;
 @@ -883,11 +880,11 @@ template<size_t... _Ip>
 #if __has_builtin(__make_integer_seq) && !defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
 template <class _Tp, _Tp _Ep>
-using __make_integer_sequence = __make_integer_seq<integer_sequence, _Tp, _Ep>;
+using __make_integer_sequence _LIBCPP_NODEBUG_TYPE = __make_integer_seq<integer_sequence, _Tp, _Ep>;
 #else
-template<typename _Tp, _Tp _Np> using __make_integer_sequence_unchecked =
+template<typename _Tp, _Tp _Np> using __make_integer_sequence_unchecked _LIBCPP_NODEBUG_TYPE  =
   typename __detail::__make<_Np>::type::template __convert<integer_sequence, _Tp>;
 template <class _Tp, _Tp _Ep>
 @@ -898,11 +895,11 @@ struct __make_integer_sequence_checked
     static_assert(0 <= _Ep, "std::make_integer_sequence must have a non-negative sequence length");
     // Workaround GCC bug by preventing bad installations when 0 <= _Ep
     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68929
-    typedef __make_integer_sequence_unchecked<_Tp, 0 <= _Ep ? _Ep : 0> type;
+    typedef _LIBCPP_NODEBUG_TYPE  __make_integer_sequence_unchecked<_Tp, 0 <= _Ep ? _Ep : 0> type;
 };
 template <class _Tp, _Tp _Ep>
-using __make_integer_sequence = typename __make_integer_sequence_checked<_Tp, _Ep>::type;
+using __make_integer_sequence _LIBCPP_NODEBUG_TYPE = typename __make_integer_sequence_checked<_Tp, _Ep>::type;
 #endif
 @@ -1482,7 +1479,7 @@ struct _LIBCPP_TEMPLATE_VIS hash<float>
     size_t operator()(float __v) const _NOEXCEPT
     {
         // -0.0 and 0.0 should return same hash
-       if (__v == 0.0)
+       if (__v == 0.0f)
            return 0;
         return __scalar_hash<float>::operator()(__v);
     }
 @@ -1510,7 +1507,7 @@ struct _LIBCPP_TEMPLATE_VIS hash<long double>
     size_t operator()(long double __v) const _NOEXCEPT
     {
         // -0.0 and 0.0 should return same hash
-        if (__v == 0.0)
+        if (__v == 0.0L)
             return 0;
 #if defined(__i386__)
         // Zero out padding bits
 @@ -1593,29 +1590,29 @@ struct _LIBCPP_TEMPLATE_VIS hash<nullptr_t>
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Key, class _Hash>
-using __check_hash_requirements = integral_constant<bool,
+using __check_hash_requirements _LIBCPP_NODEBUG_TYPE  = integral_constant<bool,
     is_copy_constructible<_Hash>::value &&
     is_move_constructible<_Hash>::value &&
     __invokable_r<size_t, _Hash, _Key const&>::value
 >;
 template <class _Key, class _Hash = std::hash<_Key> >
-using __has_enabled_hash = integral_constant<bool,
+using __has_enabled_hash _LIBCPP_NODEBUG_TYPE = integral_constant<bool,
     __check_hash_requirements<_Key, _Hash>::value &&
     is_default_constructible<_Hash>::value
 >;
 #if _LIBCPP_STD_VER > 14
 template <class _Type, class>
-using __enable_hash_helper_imp = _Type;
+using __enable_hash_helper_imp _LIBCPP_NODEBUG_TYPE  = _Type;
 template <class _Type, class ..._Keys>
-using __enable_hash_helper = __enable_hash_helper_imp<_Type,
+using __enable_hash_helper _LIBCPP_NODEBUG_TYPE  = __enable_hash_helper_imp<_Type,
   typename enable_if<__all<__has_enabled_hash<_Keys>::value...>::value>::type
 >;
 #else
 template <class _Type, class ...>
-using __enable_hash_helper = _Type;
+using __enable_hash_helper _LIBCPP_NODEBUG_TYPE = _Type;
 #endif
 #endif // !_LIBCPP_CXX03_LANG

lib/libcxx/include/valarray+22-10

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===-------------------------- valarray ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -674,6 +673,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     size_t size() const {return __size_;}
+    template <class> friend class __val_expr;
     template <class> friend class _LIBCPP_TEMPLATE_VIS valarray;
 };
 @@ -1059,8 +1059,6 @@ private:
     valarray& __assign_range(const value_type* __f, const value_type* __l);
 };
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::valarray(size_t))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::~valarray())
 _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void valarray<size_t>::resize(size_t, size_t))
 template <class _Op, class _Tp>
 @@ -2222,6 +2220,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     size_t size() const {return __1d_.size();}
+    template <class> friend class __val_expr;
     template <class> friend class valarray;
 };
 @@ -2592,6 +2591,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     size_t size() const {return __1d_.size();}
+    template <class> friend class __val_expr;
     template <class> friend class _LIBCPP_TEMPLATE_VIS valarray;
 };
 @@ -2614,19 +2614,31 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     __val_expr<__slice_expr<_ValExpr> > operator[](slice __s) const
-        {return __val_expr<__slice_expr<_ValExpr> >(__expr_, __s);}
+    {
+        typedef __slice_expr<_ValExpr> _NewExpr;
+        return __val_expr< _NewExpr >(_NewExpr(__s, __expr_));
+    }
     _LIBCPP_INLINE_VISIBILITY
     __val_expr<__indirect_expr<_ValExpr> > operator[](const gslice& __gs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __gs.__1d_);}
+    {
+        typedef __indirect_expr<_ValExpr> _NewExpr;
+        return __val_expr<_NewExpr >(_NewExpr(__gs.__1d_, __expr_));
+    }
     _LIBCPP_INLINE_VISIBILITY
     __val_expr<__mask_expr<_ValExpr> > operator[](const valarray<bool>& __vb) const
-        {return __val_expr<__mask_expr<_ValExpr> >(__expr_, __vb);}
+    {
+        typedef __mask_expr<_ValExpr> _NewExpr;
+        return __val_expr< _NewExpr >( _NewExpr(__vb, __expr_));
+    }
     _LIBCPP_INLINE_VISIBILITY
     __val_expr<__indirect_expr<_ValExpr> > operator[](const valarray<size_t>& __vs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __vs);}
+    {
+        typedef __indirect_expr<_ValExpr> _NewExpr;
+        return __val_expr< _NewExpr >(_NewExpr(__vs, __expr_));
+    }
     _LIBCPP_INLINE_VISIBILITY
     __val_expr<_UnaryOp<__unary_plus<value_type>, _ValExpr> >

lib/libcxx/include/variant+65-13

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===------------------------------ variant -------------------------------===//	2	//===------------------------------ variant -------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9
...	@@ -1090,20 +1089,73 @@ private:	...	@@ -1090,20 +1089,73 @@ private:
1090	}	1089	}
1091	};	1090	};
1092		1091
1093	template <class... _Types>	1092	struct __no_narrowing_check {
1094	struct __overload;	1093	template <class _Dest, class _Source>
		1094	using _Apply = __identity<_Dest>;
		1095	};
1095		1096
1096	template <>	1097	struct __narrowing_check {
1097	struct __overload<> { void operator()() const; };	1098	template <class _Dest>
		1099	static auto __test_impl(_Dest (&&)[1]) -> __identity<_Dest>;
		1100	template <class _Dest, class _Source>
		1101	using _Apply _LIBCPP_NODEBUG_TYPE = decltype(__test_impl<_Dest>({std::declval<_Source>()}));
		1102	};
1098		1103
1099	template <class _Tp, class... _Types>	1104	template <class _Dest, class _Source>
1100	struct __overload<_Tp, _Types...> : __overload<_Types...> {	1105	using __check_for_narrowing _LIBCPP_NODEBUG_TYPE =
1101	using __overload<_Types...>::operator();	1106	typename _If<
1102	__identity<_Tp> operator()(_Tp) const;	1107	#ifdef _LIBCPP_ENABLE_NARROWING_CONVERSIONS_IN_VARIANT
		1108	false &&
		1109	#endif
		1110	is_arithmetic<_Dest>::value,
		1111	__narrowing_check,
		1112	__no_narrowing_check
		1113	>::template _Apply<_Dest, _Source>;
		1114
		1115	template <class _Tp, size_t _Idx>
		1116	struct __overload {
		1117	template <class _Up>
		1118	auto operator()(_Tp, _Up&&) const -> __check_for_narrowing<_Tp, _Up>;
1103	};	1119	};
1104		1120
		1121	template <class _Tp, size_t>
		1122	struct __overload_bool {
		1123	template <class _Up, class _Ap = __uncvref_t<_Up>>
		1124	auto operator()(bool, _Up&&) const
		1125	-> enable_if_t<is_same_v<_Ap, bool>, __identity<_Tp>>;
		1126	};
		1127
		1128	template <size_t _Idx>
		1129	struct __overload<bool, _Idx> : __overload_bool<bool, _Idx> {};
		1130	template <size_t _Idx>
		1131	struct __overload<bool const, _Idx> : __overload_bool<bool const, _Idx> {};
		1132	template <size_t _Idx>
		1133	struct __overload<bool volatile, _Idx> : __overload_bool<bool volatile, _Idx> {};
		1134	template <size_t _Idx>
		1135	struct __overload<bool const volatile, _Idx> : __overload_bool<bool const volatile, _Idx> {};
		1136
		1137	template <class ..._Bases>
		1138	struct __all_overloads : _Bases... {
		1139	void operator()() const;
		1140	using _Bases::operator()...;
		1141	};
		1142
		1143	template <class IdxSeq>
		1144	struct __make_overloads_imp;
		1145
		1146	template <size_t ..._Idx>
		1147	struct __make_overloads_imp<__tuple_indices<_Idx...> > {
		1148	template <class ..._Types>
		1149	using _Apply _LIBCPP_NODEBUG_TYPE = __all_overloads<__overload<_Types, _Idx>...>;
		1150	};
		1151
		1152	template <class ..._Types>
		1153	using _MakeOverloads _LIBCPP_NODEBUG_TYPE = typename __make_overloads_imp<
		1154	__make_indices_imp<sizeof...(_Types), 0> >::template _Apply<_Types...>;
		1155
1105	template <class _Tp, class... _Types>	1156	template <class _Tp, class... _Types>
1106	using __best_match_t = typename result_of_t<__overload<_Types...>(_Tp&&)>::type;	1157	using __best_match_t =
		1158	typename invoke_result_t<_MakeOverloads<_Types...>, _Tp, _Tp>::type;
1107		1159
1108	} // __variant_detail	1160	} // __variant_detail
1109		1161

lib/libcxx/include/vector+23-19

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===------------------------------ vector --------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -665,27 +664,27 @@ public:
     void reserve(size_type __n);
     void shrink_to_fit() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n);
+    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const;
+    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const _NOEXCEPT;
     reference       at(size_type __n);
     const_reference at(size_type __n) const;
-    _LIBCPP_INLINE_VISIBILITY reference       front()
+    _LIBCPP_INLINE_VISIBILITY reference       front() _NOEXCEPT
     {
         _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
         return *this->__begin_;
     }
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const
+    _LIBCPP_INLINE_VISIBILITY const_reference front() const _NOEXCEPT
     {
         _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
         return *this->__begin_;
     }
-    _LIBCPP_INLINE_VISIBILITY reference       back()
+    _LIBCPP_INLINE_VISIBILITY reference       back() _NOEXCEPT
     {
         _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
         return *(this->__end_ - 1);
     }
-    _LIBCPP_INLINE_VISIBILITY const_reference back()  const
+    _LIBCPP_INLINE_VISIBILITY const_reference back()  const _NOEXCEPT
     {
         _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
         return *(this->__end_ - 1);
 @@ -780,9 +779,9 @@ public:
     void swap(vector&)
 #if _LIBCPP_STD_VER >= 14
-        _NOEXCEPT_DEBUG;
+        _NOEXCEPT;
 #else
-        _NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value ||
+        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
                     __is_nothrow_swappable<allocator_type>::value);
 #endif
 @@ -836,12 +835,17 @@ private:
     }
 #ifndef _LIBCPP_CXX03_LANG
-    template <class _Up> void __push_back_slow_path(_Up&& __x);
+    template <class _Up>
+    _LIBCPP_INLINE_VISIBILITY
+    inline void __push_back_slow_path(_Up&& __x);
     template <class... _Args>
-    void __emplace_back_slow_path(_Args&&... __args);
+    _LIBCPP_INLINE_VISIBILITY
+    inline void __emplace_back_slow_path(_Args&&... __args);
 #else
-    template <class _Up> void __push_back_slow_path(_Up& __x);
+    template <class _Up>
+    _LIBCPP_INLINE_VISIBILITY
+    inline void __push_back_slow_path(_Up& __x);
 #endif
     // The following functions are no-ops outside of AddressSanitizer mode.
 @@ -1538,7 +1542,7 @@ vector<_Tp, _Allocator>::end() const _NOEXCEPT
 template <class _Tp, class _Allocator>
 inline _LIBCPP_INLINE_VISIBILITY
 typename vector<_Tp, _Allocator>::reference
-vector<_Tp, _Allocator>::operator[](size_type __n)
+vector<_Tp, _Allocator>::operator[](size_type __n) _NOEXCEPT
 {
     _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
     return this->__begin_[__n];
 @@ -1547,7 +1551,7 @@ vector<_Tp, _Allocator>::operator[](size_type __n)
 template <class _Tp, class _Allocator>
 inline _LIBCPP_INLINE_VISIBILITY
 typename vector<_Tp, _Allocator>::const_reference
-vector<_Tp, _Allocator>::operator[](size_type __n) const
+vector<_Tp, _Allocator>::operator[](size_type __n) const _NOEXCEPT
 {
     _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
     return this->__begin_[__n];
 @@ -2065,9 +2069,9 @@ template <class _Tp, class _Allocator>
 void
 vector<_Tp, _Allocator>::swap(vector& __x)
 #if _LIBCPP_STD_VER >= 14
-    _NOEXCEPT_DEBUG
+    _NOEXCEPT
 #else
-    _NOEXCEPT_DEBUG_(!__alloc_traits::propagate_on_container_swap::value ||
+    _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
                 __is_nothrow_swappable<allocator_type>::value)
 #endif
 {

lib/libcxx/include/version+11-6

 @@ -1,10 +1,9 @@
 // -*- C++ -*-
 //===--------------------------- version ----------------------------------===//
 //
-//                     The LLVM Compiler Infrastructure
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-//
+// See https://llvm.org/LICENSE.txt for license information.
-// This file is dual licensed under the MIT and the University of Illinois Open
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 @@ -59,6 +58,7 @@ __cpp_lib_hypot                                         201603L <cmath>
 __cpp_lib_incomplete_container_elements                 201505L <forward_list> <list> <vector>
 __cpp_lib_integer_sequence                              201304L <utility>
 __cpp_lib_integral_constant_callable                    201304L <type_traits>
+__cpp_lib_interpolate                                   201902L <numeric>
 __cpp_lib_invoke                                        201411L <functional>
 __cpp_lib_is_aggregate                                  201703L <type_traits>
 __cpp_lib_is_constant_evaluated                         201811L <type_traits>
 @@ -220,10 +220,15 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_concepts                             201806L
 // # define __cpp_lib_constexpr_misc                       201811L
 // # define __cpp_lib_constexpr_swap_algorithms            201806L
-// # define __cpp_lib_destroying_delete                    201806L
+# if _LIBCPP_STD_VER > 17 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L
+#   define __cpp_lib_destroying_delete                  201806L
+# endif
 # define __cpp_lib_erase_if                             201811L
 // # define __cpp_lib_generic_unordered_lookup             201811L
-// # define __cpp_lib_is_constant_evaluated                201811L
+# define __cpp_lib_interpolate                          201902L
+# if !defined(_LIBCPP_HAS_NO_BUILTIN_IS_CONSTANT_EVALUATED)
+#   define __cpp_lib_is_constant_evaluated              201811L
+# endif
 // # define __cpp_lib_list_remove_return_type              201806L
 // # define __cpp_lib_ranges                               201811L
 // # define __cpp_lib_three_way_comparison                 201711L

lib/libcxx/include/wchar.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- wchar.h ----------------------------------===//	2	//===--------------------------- wchar.h ----------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

lib/libcxx/include/wctype.h+3-4

...	@@ -1,10 +1,9 @@	...	@@ -1,10 +1,9 @@
1	// -- C++ --	1	// -- C++ --
2	//===--------------------------- wctype.h ---------------------------------===//	2	//===--------------------------- wctype.h ---------------------------------===//
3	//	3	//
4	// The LLVM Compiler Infrastructure	4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	//	5	// See https://llvm.org/LICENSE.txt for license information.
6	// This file is dual licensed under the MIT and the University of Illinois Open	6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	// Source Licenses. See LICENSE.TXT for details.
8	//	7	//
9	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
10		9

author	Andrew Kelley <andrew@ziglang.org> 2019-07-19 16:55:59-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-07-19 16:55:59-04:00
log	70e05c67ce6f044b5b99e01a5d972bbe92c38344
tree	6f13ca6ee7147f053b88d33e62bfdd1e284d9019
parent	dab0cf6428d96af540399563f2e2d5a79c3a7d5e
signature	Commit is signed but in an unrecognized format.

update libcxx to llvm9