diff options
| author | Mikhail Borisov <borisov.mikhail@gmail.com> | 2022-02-10 16:45:39 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:39 +0300 |
| commit | a6a92afe03e02795227d2641b49819b687f088f8 (patch) | |
| tree | f6984a1d27d5a7ec88a6fdd6e20cd5b7693b6ece /contrib/libs/cxxsupp/libcxx | |
| parent | c6dc8b8bd530985bc4cce0137e9a5de32f1087cb (diff) | |
| download | ydb-a6a92afe03e02795227d2641b49819b687f088f8.tar.gz | |
Restoring authorship annotation for Mikhail Borisov <borisov.mikhail@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx')
74 files changed, 681 insertions, 681 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/glibcxx_eh_cxx17.cpp b/contrib/libs/cxxsupp/libcxx/glibcxx_eh_cxx17.cpp index 5e5ad083ba..cc2bd0d223 100644 --- a/contrib/libs/cxxsupp/libcxx/glibcxx_eh_cxx17.cpp +++ b/contrib/libs/cxxsupp/libcxx/glibcxx_eh_cxx17.cpp @@ -1,17 +1,17 @@ -#include <cxxabi.h> - -/** - * libc++ expects std::uncaught_exceptions() to be provided by C++ runtime library. - * - * GCC versions prior to GCC 6 did not provide this function yet, but it can be - * implemented using its API. - * - * This implementation should cover ubuntu-12, ubuntu-14, ubuntu-16. - */ - -namespace std { - int uncaught_exceptions() noexcept { - const auto* globals{__cxxabiv1::__cxa_get_globals()}; - return static_cast<int>(globals->uncaughtExceptions); - } -} +#include <cxxabi.h> + +/** + * libc++ expects std::uncaught_exceptions() to be provided by C++ runtime library. + * + * GCC versions prior to GCC 6 did not provide this function yet, but it can be + * implemented using its API. + * + * This implementation should cover ubuntu-12, ubuntu-14, ubuntu-16. + */ + +namespace std { + int uncaught_exceptions() noexcept { + const auto* globals{__cxxabiv1::__cxa_get_globals()}; + return static_cast<int>(globals->uncaughtExceptions); + } +} diff --git a/contrib/libs/cxxsupp/libcxx/import b/contrib/libs/cxxsupp/libcxx/import index 9b93145897..60f276b136 100755 --- a/contrib/libs/cxxsupp/libcxx/import +++ b/contrib/libs/cxxsupp/libcxx/import @@ -17,6 +17,6 @@ cp libcxx/LICENSE.TXT ../LICENSE.TXT cd .. rm -rf tmp rm src/CMakeLists.txt include/CMakeLists.txt - -# Fix tabs and trailing spaces -find -type f | xargs sed -e 's/\t/ /g' -e 's/ *$//' -i + +# Fix tabs and trailing spaces +find -type f | xargs sed -e 's/\t/ /g' -e 's/ *$//' -i diff --git a/contrib/libs/cxxsupp/libcxx/include/__config b/contrib/libs/cxxsupp/libcxx/include/__config index bdc54b92d1..723053f7d6 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__config +++ b/contrib/libs/cxxsupp/libcxx/include/__config @@ -418,8 +418,8 @@ (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 130000) || \ (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 60000)) # define _LIBCPP_HAS_ALIGNED_ALLOC -# define _LIBCPP_HAS_TIMESPEC_GET -# endif +# define _LIBCPP_HAS_TIMESPEC_GET +# endif # endif // __APPLE__ #endif #endif // __has_attribute(using_if_exists) @@ -441,7 +441,7 @@ #endif #if defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) && \ (!defined(__arm__) || __ARM_ARCH_7K__ >= 2) -# define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT +# define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT #endif #if __has_feature(cxx_alignas) @@ -458,7 +458,7 @@ typedef __char32_t char32_t; #endif #if !__has_feature(cxx_exceptions) -# define _LIBCPP_NO_EXCEPTIONS +# define _LIBCPP_NO_EXCEPTIONS #endif #if !(__has_feature(cxx_strong_enums)) @@ -521,7 +521,7 @@ typedef __char32_t char32_t; #define _LIBCPP_NORETURN __attribute__((noreturn)) #if !defined(__EXCEPTIONS) -# define _LIBCPP_NO_EXCEPTIONS +# define _LIBCPP_NO_EXCEPTIONS #endif #if !defined(__SANITIZE_ADDRESS__) @@ -633,8 +633,8 @@ typedef __char32_t char32_t; # 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 +# 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) @@ -901,12 +901,12 @@ typedef unsigned int char32_t; #if !defined(_LIBCPP_DEBUG) # define _LIBCPP_DEBUG_LEVEL 0 #elif _LIBCPP_DEBUG == 0 -# define _LIBCPP_DEBUG_LEVEL 1 -#elif _LIBCPP_DEBUG == 1 -# define _LIBCPP_DEBUG_LEVEL 2 -#else -# error Supported values for _LIBCPP_DEBUG are 0 and 1 -#endif +# define _LIBCPP_DEBUG_LEVEL 1 +#elif _LIBCPP_DEBUG == 1 +# define _LIBCPP_DEBUG_LEVEL 2 +#else +# error Supported values for _LIBCPP_DEBUG are 0 and 1 +#endif // Libc++ allows disabling extern template instantiation declarations by // means of users defining _LIBCPP_DISABLE_EXTERN_TEMPLATE. @@ -1096,10 +1096,10 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container( #if defined(_LIBCPP_COMPILER_CLANG_BASED) && !__has_feature(cxx_rtti) # define _LIBCPP_NO_RTTI #elif defined(__GNUC__) && !defined(__GXX_RTTI) -# define _LIBCPP_NO_RTTI -#elif defined(_LIBCPP_COMPILER_MSVC) && !defined(_CPPRTTI) -# define _LIBCPP_NO_RTTI -#endif +# define _LIBCPP_NO_RTTI +#elif defined(_LIBCPP_COMPILER_MSVC) && !defined(_CPPRTTI) +# define _LIBCPP_NO_RTTI +#endif #ifndef _LIBCPP_WEAK #define _LIBCPP_WEAK __attribute__((__weak__)) diff --git a/contrib/libs/cxxsupp/libcxx/include/__debug b/contrib/libs/cxxsupp/libcxx/include/__debug index 771e431632..3acd97da29 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__debug +++ b/contrib/libs/cxxsupp/libcxx/include/__debug @@ -34,7 +34,7 @@ # define _LIBCPP_DEBUG_ASSERT(x, m) ((void)0) # define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m))) #elif _LIBCPP_DEBUG_LEVEL == 2 -# define _LIBCPP_DEBUG_ASSERT(x, m) _LIBCPP_ASSERT(x, m) +# define _LIBCPP_DEBUG_ASSERT(x, m) _LIBCPP_ASSERT(x, m) # define _LIBCPP_ASSERT_IMPL(x, m) ((x) ? (void)0 : _VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, #x, m))) #else # error _LIBCPP_DEBUG_LEVEL must be one of 0, 1, 2 @@ -221,7 +221,7 @@ public: 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); + return ::new (__mem) _C_node<_Cont>(__c, __next); } template <class _Cont> diff --git a/contrib/libs/cxxsupp/libcxx/include/__hash_table b/contrib/libs/cxxsupp/libcxx/include/__hash_table index bd97027c1a..30ae07aab9 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__hash_table +++ b/contrib/libs/cxxsupp/libcxx/include/__hash_table @@ -38,7 +38,7 @@ template <class _Tp> struct __is_hash_value_type_imp : false_type {}; template <class _Key, class _Value> -struct __is_hash_value_type_imp<__hash_value_type<_Key, _Value> > : true_type {}; +struct __is_hash_value_type_imp<__hash_value_type<_Key, _Value> > : true_type {}; template <class ..._Args> struct __is_hash_value_type : false_type {}; diff --git a/contrib/libs/cxxsupp/libcxx/include/__locale b/contrib/libs/cxxsupp/libcxx/include/__locale index 38cb7a6f39..153aa812d4 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__locale +++ b/contrib/libs/cxxsupp/libcxx/include/__locale @@ -96,7 +96,7 @@ struct __libcpp_locale_guard { __setlocale(__locale_all); free(__locale_all); } - _configthreadlocale(__status); + _configthreadlocale(__status); } static const char* __setlocale(const char* __locale) { const char* __new_locale = setlocale(LC_ALL, __locale); diff --git a/contrib/libs/cxxsupp/libcxx/include/__string b/contrib/libs/cxxsupp/libcxx/include/__string index 7074a73538..b1a209d7bf 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__string +++ b/contrib/libs/cxxsupp/libcxx/include/__string @@ -626,7 +626,7 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t> return __libcpp_is_constant_evaluated() ? _VSTD::__copy_constexpr(__s1, __s2, __n) : __n == 0 ? __s1 : (char_type*)_VSTD::memcpy(__s1, __s2, __n); - } + } static _LIBCPP_CONSTEXPR_AFTER_CXX17 char_type* assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT diff --git a/contrib/libs/cxxsupp/libcxx/include/__support/ibm/xlocale.h b/contrib/libs/cxxsupp/libcxx/include/__support/ibm/xlocale.h index 15b8386dd3..4a6b86a068 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__support/ibm/xlocale.h +++ b/contrib/libs/cxxsupp/libcxx/include/__support/ibm/xlocale.h @@ -125,7 +125,7 @@ int vasprintf(char **strp, const char *fmt, va_list ap) { str_size = vsnprintf(*strp, str_size + 1, fmt, ap); } return str_size; -} +} #ifdef __cplusplus } diff --git a/contrib/libs/cxxsupp/libcxx/include/__support/solaris/wchar.h b/contrib/libs/cxxsupp/libcxx/include/__support/solaris/wchar.h index f01fd743a2..9dc9ac3f00 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__support/solaris/wchar.h +++ b/contrib/libs/cxxsupp/libcxx/include/__support/solaris/wchar.h @@ -26,7 +26,7 @@ #define wctype sun_wctype #define _WCHAR_T 1 #include_next "wchar.h" -#undef iswalpha +#undef iswalpha #undef iswupper #undef iswlower #undef iswdigit diff --git a/contrib/libs/cxxsupp/libcxx/include/__threading_support b/contrib/libs/cxxsupp/libcxx/include/__threading_support index 9b0de00dfc..f07b79841e 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__threading_support +++ b/contrib/libs/cxxsupp/libcxx/include/__threading_support @@ -83,7 +83,7 @@ typedef pthread_cond_t __libcpp_condvar_t; #ifndef _LIBCPP_NO_NATIVE_SEMAPHORES // Semaphore typedef sem_t __libcpp_semaphore_t; -# define _LIBCPP_SEMAPHORE_MAX SEM_VALUE_MAX +# define _LIBCPP_SEMAPHORE_MAX SEM_VALUE_MAX #endif // Execute once @@ -94,7 +94,7 @@ typedef pthread_once_t __libcpp_exec_once_flag; #if defined(__MVS__) typedef unsigned long long __libcpp_thread_id; #else - typedef pthread_t __libcpp_thread_id; + typedef pthread_t __libcpp_thread_id; #endif // Thread diff --git a/contrib/libs/cxxsupp/libcxx/include/__tree b/contrib/libs/cxxsupp/libcxx/include/__tree index f3f2e8d15f..fd5b429ea5 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__tree +++ b/contrib/libs/cxxsupp/libcxx/include/__tree @@ -539,7 +539,7 @@ template <class _Tp> struct __is_tree_value_type_imp : false_type {}; template <class _Key, class _Value> -struct __is_tree_value_type_imp<__value_type<_Key, _Value> > : true_type {}; +struct __is_tree_value_type_imp<__value_type<_Key, _Value> > : true_type {}; template <class ..._Args> struct __is_tree_value_type : false_type {}; @@ -1638,7 +1638,7 @@ __tree<_Tp, _Compare, _Allocator>::__assign_unique(_ForwardIterator __first, _Fo for (; __cache.__get() != nullptr && __first != __last; ++__first) { if (__node_assign_unique(*__first, __cache.__get()).second) __cache.__advance(); - } + } } for (; __first != __last; ++__first) __insert_unique(*__first); @@ -2251,7 +2251,7 @@ __tree<_Tp, _Compare, _Allocator>::__remove_node_pointer(__node_pointer __ptr) _ __begin_node() = __r.__ptr_; --size(); _VSTD::__tree_remove(__end_node()->__left_, - static_cast<__node_base_pointer>(__ptr)); + static_cast<__node_base_pointer>(__ptr)); return __r; } @@ -2727,7 +2727,7 @@ __tree<_Tp, _Compare, _Allocator>::remove(const_iterator __p) _NOEXCEPT } --size(); _VSTD::__tree_remove(__end_node()->__left_, - static_cast<__node_base_pointer>(__np)); + static_cast<__node_base_pointer>(__np)); return __node_holder(__np, _Dp(__node_alloc(), true)); } diff --git a/contrib/libs/cxxsupp/libcxx/include/algorithm b/contrib/libs/cxxsupp/libcxx/include/algorithm index 3fe0c8c1c9..307c740247 100644 --- a/contrib/libs/cxxsupp/libcxx/include/algorithm +++ b/contrib/libs/cxxsupp/libcxx/include/algorithm @@ -563,10 +563,10 @@ template<class T, class Compare> min(initializer_list<T> t, Compare comp); template<class T> - constexpr const T& clamp(const T& v, const T& lo, const T& hi); // C++17 + constexpr const T& clamp(const T& v, const T& lo, const T& hi); // C++17 template<class T, class Compare> - constexpr const T& clamp(const T& v, const T& lo, const T& hi, Compare comp); // C++17 + constexpr const T& clamp(const T& v, const T& lo, const T& hi, Compare comp); // C++17 template <class ForwardIterator> constexpr ForwardIterator // constexpr in C++14 diff --git a/contrib/libs/cxxsupp/libcxx/include/atomic b/contrib/libs/cxxsupp/libcxx/include/atomic index 992c745961..c9fec104ef 100644 --- a/contrib/libs/cxxsupp/libcxx/include/atomic +++ b/contrib/libs/cxxsupp/libcxx/include/atomic @@ -23,10 +23,10 @@ namespace std #define __cpp_lib_atomic_lock_free_type_aliases #define __cpp_lib_atomic_wait - // order and consistency + // order and consistency enum memory_order: unspecified // enum class in C++20 - { + { relaxed, consume, // load-consume acquire, // load-acquire @@ -532,13 +532,13 @@ template <class T> #endif #ifdef _LIBCPP_HAS_NO_THREADS -# error <atomic> is not supported on this single threaded system +# error <atomic> is not supported on this single threaded system #endif #ifdef _LIBCPP_HAS_NO_ATOMIC_HEADER -# error <atomic> is not implemented +# error <atomic> is not implemented #endif #ifdef kill_dependency -# error C++ standard library is incompatible with <stdatomic.h> +# error C++ standard library is incompatible with <stdatomic.h> #endif #define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \ @@ -613,7 +613,7 @@ static_assert((is_same<underlying_type<memory_order>::type, __memory_order_under "unexpected underlying type for std::memory_order"); #if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) || \ - defined(_LIBCPP_ATOMIC_ONLY_USE_BUILTINS) + defined(_LIBCPP_ATOMIC_ONLY_USE_BUILTINS) // [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because // the default operator= in an object is not volatile, a byte-by-byte copy @@ -696,7 +696,7 @@ void __cxx_atomic_signal_fence(memory_order __order) { template <typename _Tp> _LIBCPP_INLINE_VISIBILITY void __cxx_atomic_store(volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp __val, - memory_order __order) { + memory_order __order) { __atomic_store(&__a->__a_value, &__val, __to_gcc_order(__order)); } @@ -704,7 +704,7 @@ void __cxx_atomic_store(volatile __cxx_atomic_base_impl<_Tp>* __a, _Tp __val, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp>* __a, _Tp __val, - memory_order __order) { + memory_order __order) { __atomic_store(&__a->__a_value, &__val, __to_gcc_order(__order)); } @@ -712,7 +712,7 @@ void __cxx_atomic_store(__cxx_atomic_base_impl<_Tp>* __a, _Tp __val, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_load(const volatile __cxx_atomic_base_impl<_Tp>* __a, - memory_order __order) { + memory_order __order) { _Tp __ret; __atomic_load(&__a->__a_value, &__ret, __to_gcc_order(__order)); @@ -731,7 +731,7 @@ _Tp __cxx_atomic_load(const __cxx_atomic_base_impl<_Tp>* __a, memory_order __ord template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_exchange(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Tp __value, memory_order __order) { + _Tp __value, memory_order __order) { _Tp __ret; __atomic_exchange(&__a->__a_value, &__value, &__ret, __to_gcc_order(__order)); @@ -741,7 +741,7 @@ _Tp __cxx_atomic_exchange(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_exchange(__cxx_atomic_base_impl<_Tp>* __a, _Tp __value, - memory_order __order) { + memory_order __order) { _Tp __ret; __atomic_exchange(&__a->__a_value, &__value, &__ret, __to_gcc_order(__order)); @@ -808,7 +808,7 @@ struct __skip_amt<_Tp[n]> { }; template <typename _Tp, typename _Td> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_add(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Td __delta, memory_order __order) { + _Td __delta, memory_order __order) { return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value, __to_gcc_order(__order)); } @@ -816,7 +816,7 @@ _Tp __cxx_atomic_fetch_add(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp, typename _Td> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta, - memory_order __order) { + memory_order __order) { return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value, __to_gcc_order(__order)); } @@ -824,7 +824,7 @@ _Tp __cxx_atomic_fetch_add(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta, template <typename _Tp, typename _Td> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_sub(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Td __delta, memory_order __order) { + _Td __delta, memory_order __order) { return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value, __to_gcc_order(__order)); } @@ -832,7 +832,7 @@ _Tp __cxx_atomic_fetch_sub(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp, typename _Td> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta, - memory_order __order) { + memory_order __order) { return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value, __to_gcc_order(__order)); } @@ -840,7 +840,7 @@ _Tp __cxx_atomic_fetch_sub(__cxx_atomic_base_impl<_Tp>* __a, _Td __delta, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_and(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Tp __pattern, memory_order __order) { + _Tp __pattern, memory_order __order) { return __atomic_fetch_and(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -848,7 +848,7 @@ _Tp __cxx_atomic_fetch_and(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_and(__cxx_atomic_base_impl<_Tp>* __a, - _Tp __pattern, memory_order __order) { + _Tp __pattern, memory_order __order) { return __atomic_fetch_and(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -856,7 +856,7 @@ _Tp __cxx_atomic_fetch_and(__cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_or(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Tp __pattern, memory_order __order) { + _Tp __pattern, memory_order __order) { return __atomic_fetch_or(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -864,7 +864,7 @@ _Tp __cxx_atomic_fetch_or(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_or(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern, - memory_order __order) { + memory_order __order) { return __atomic_fetch_or(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -872,7 +872,7 @@ _Tp __cxx_atomic_fetch_or(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_xor(volatile __cxx_atomic_base_impl<_Tp>* __a, - _Tp __pattern, memory_order __order) { + _Tp __pattern, memory_order __order) { return __atomic_fetch_xor(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -880,7 +880,7 @@ _Tp __cxx_atomic_fetch_xor(volatile __cxx_atomic_base_impl<_Tp>* __a, template <typename _Tp> _LIBCPP_INLINE_VISIBILITY _Tp __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern, - memory_order __order) { + memory_order __order) { return __atomic_fetch_xor(&__a->__a_value, __pattern, __to_gcc_order(__order)); } @@ -928,7 +928,7 @@ void __cxx_atomic_signal_fence(memory_order __order) _NOEXCEPT { #pragma warning ( pop ) #endif -template<class _Tp> +template<class _Tp> _LIBCPP_INLINE_VISIBILITY void __cxx_atomic_init(__cxx_atomic_base_impl<_Tp> volatile* __a, _Tp __val) _NOEXCEPT { __c11_atomic_init(&__a->__a_value, __val); diff --git a/contrib/libs/cxxsupp/libcxx/include/barrier b/contrib/libs/cxxsupp/libcxx/include/barrier index c40a1e43f3..eda9433a4b 100644 --- a/contrib/libs/cxxsupp/libcxx/include/barrier +++ b/contrib/libs/cxxsupp/libcxx/include/barrier @@ -308,11 +308,11 @@ public: { __b.wait(_VSTD::move(__phase)); } - _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY + _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void arrive_and_wait() { wait(arrive()); - } + } _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY void arrive_and_drop() { diff --git a/contrib/libs/cxxsupp/libcxx/include/bit b/contrib/libs/cxxsupp/libcxx/include/bit index eab67977a1..5da3eaf788 100644 --- a/contrib/libs/cxxsupp/libcxx/include/bit +++ b/contrib/libs/cxxsupp/libcxx/include/bit @@ -219,7 +219,7 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bool __has_single_bit(_Tp __t) _NOEXCEPT { static_assert(__libcpp_is_unsigned_integer<_Tp>::value, "__has_single_bit requires an unsigned integer type"); - return __t != 0 && (((__t & (__t - 1)) == 0)); + return __t != 0 && (((__t & (__t - 1)) == 0)); } #if _LIBCPP_STD_VER > 17 @@ -261,7 +261,7 @@ _LIBCPP_INLINE_VISIBILITY constexpr enable_if_t<__libcpp_is_unsigned_integer<_Tp>::value, int> countr_zero(_Tp __t) noexcept { - return __countr_zero(__t); + return __countr_zero(__t); } template<class _Tp> diff --git a/contrib/libs/cxxsupp/libcxx/include/chrono b/contrib/libs/cxxsupp/libcxx/include/chrono index db186a4fba..45c7a495a8 100644 --- a/contrib/libs/cxxsupp/libcxx/include/chrono +++ b/contrib/libs/cxxsupp/libcxx/include/chrono @@ -1972,7 +1972,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 +inline constexpr weekday_last weekday::operator[](last_spec) const noexcept { return weekday_last{*this}; } @@ -2283,7 +2283,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} {} + : __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())) {} @@ -2538,7 +2538,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()} {} + : __y{__ymdl.year()}, __m{__ymdl.month()}, __d{__ymdl.day()} {} inline constexpr bool year_month_day::ok() const noexcept { @@ -2594,7 +2594,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(), + return year_month_weekday{__ymd.year(), __ymd.month(), __wd[(static_cast<unsigned>(__ymd.day())-1)/7+1]}; } @@ -2686,9 +2686,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 @@ -2726,7 +2726,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; } +{ return year(__rhs) / __lhs; } inline constexpr @@ -2916,7 +2916,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)); diff --git a/contrib/libs/cxxsupp/libcxx/include/cmath b/contrib/libs/cxxsupp/libcxx/include/cmath index e14905c57c..a2a7dde190 100644 --- a/contrib/libs/cxxsupp/libcxx/include/cmath +++ b/contrib/libs/cxxsupp/libcxx/include/cmath @@ -622,9 +622,9 @@ _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept { if (__t == 1) return __b; const _Fp __x = __a + __t * (__b - __a); if ((__t > 1) == (__b > __a)) - return __b < __x ? __x : __b; + return __b < __x ? __x : __b; else - return __x < __b ? __x : __b; + return __x < __b ? __x : __b; } constexpr float diff --git a/contrib/libs/cxxsupp/libcxx/include/complex b/contrib/libs/cxxsupp/libcxx/include/complex index e4c59193bc..01c072c800 100644 --- a/contrib/libs/cxxsupp/libcxx/include/complex +++ b/contrib/libs/cxxsupp/libcxx/include/complex @@ -1447,10 +1447,10 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x) } #endif // !_LIBCPP_HAS_NO_LOCALIZATION -#if _LIBCPP_STD_VER > 11 +#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) diff --git a/contrib/libs/cxxsupp/libcxx/include/ctime b/contrib/libs/cxxsupp/libcxx/include/ctime index 816618f6a3..6034bf2185 100644 --- a/contrib/libs/cxxsupp/libcxx/include/ctime +++ b/contrib/libs/cxxsupp/libcxx/include/ctime @@ -18,7 +18,7 @@ Macros: NULL CLOCKS_PER_SEC TIME_UTC // C++17 - + namespace std { @@ -29,7 +29,7 @@ Types: time_t tm timespec // C++17 - + clock_t clock(); double difftime(time_t time1, time_t time0); time_t mktime(tm* timeptr); diff --git a/contrib/libs/cxxsupp/libcxx/include/deque b/contrib/libs/cxxsupp/libcxx/include/deque index 67cd6654f1..8108abecd9 100644 --- a/contrib/libs/cxxsupp/libcxx/include/deque +++ b/contrib/libs/cxxsupp/libcxx/include/deque @@ -2889,7 +2889,7 @@ deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l) __alloc_traits::destroy(__a, _VSTD::addressof(*__b)); __base::size() -= __n; __base::__start_ += __n; - while (__maybe_remove_front_spare()) { + while (__maybe_remove_front_spare()) { } } else @@ -2898,7 +2898,7 @@ deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l) for (iterator __e = __base::end(); __i != __e; ++__i) __alloc_traits::destroy(__a, _VSTD::addressof(*__i)); __base::size() -= __n; - while (__maybe_remove_back_spare()) { + while (__maybe_remove_back_spare()) { } } } @@ -2919,7 +2919,7 @@ deque<_Tp, _Allocator>::__erase_to_end(const_iterator __f) for (iterator __p = __b + __pos; __p != __e; ++__p) __alloc_traits::destroy(__a, _VSTD::addressof(*__p)); __base::size() -= __n; - while (__maybe_remove_back_spare()) { + while (__maybe_remove_back_spare()) { } } } diff --git a/contrib/libs/cxxsupp/libcxx/include/experimental/functional b/contrib/libs/cxxsupp/libcxx/include/experimental/functional index e3220e16ca..5d28714566 100644 --- a/contrib/libs/cxxsupp/libcxx/include/experimental/functional +++ b/contrib/libs/cxxsupp/libcxx/include/experimental/functional @@ -113,7 +113,7 @@ template<class _ForwardIterator, class _BinaryPredicate = equal_to<>> class _LIBCPP_TEMPLATE_VIS default_searcher { public: _LIBCPP_INLINE_VISIBILITY - default_searcher(_ForwardIterator __f, _ForwardIterator __l, + default_searcher(_ForwardIterator __f, _ForwardIterator __l, _BinaryPredicate __p = _BinaryPredicate()) : __first_(__f), __last_(__l), __pred_(__p) {} @@ -152,12 +152,12 @@ public: // TODO private: const _Value __default_value_; std::unordered_map<_Key, _Value, _Hash, _BinaryPredicate> __table; - + public: _LIBCPP_INLINE_VISIBILITY _BMSkipTable(size_t __sz, _Value __default, _Hash __hf, _BinaryPredicate __pred) : __default_value_(__default), __table(__sz, __hf, __pred) {} - + _LIBCPP_INLINE_VISIBILITY void insert(const key_type &__key, value_type __val) { @@ -172,7 +172,7 @@ public: } }; - + // Special case small numeric values; use an array template<class _Key, typename _Value, class _Hash, class _BinaryPredicate> class _BMSkipTable<_Key, _Value, _Hash, _BinaryPredicate, true> { @@ -190,7 +190,7 @@ public: { std::fill_n(__table.begin(), __table.size(), __default); } - + _LIBCPP_INLINE_VISIBILITY void insert(key_type __key, value_type __val) { @@ -205,8 +205,8 @@ public: }; -template <class _RandomAccessIterator1, - class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, +template <class _RandomAccessIterator1, + class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, class _BinaryPredicate = equal_to<>> class _LIBCPP_TEMPLATE_VIS boyer_moore_searcher { private: @@ -218,9 +218,9 @@ private: is_same<_Hash, hash<value_type>>::value && is_same<_BinaryPredicate, equal_to<>>::value > skip_table_type; - + public: - boyer_moore_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, + boyer_moore_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, _Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate()) : __first_(__f), __last_(__l), __pred_(__pred), __pattern_length_(_VSTD::distance(__first_, __last_)), @@ -233,13 +233,13 @@ public: this->__build_suffix_table ( __first_, __last_, __pred_ ); } - + template <typename _RandomAccessIterator2> pair<_RandomAccessIterator2, _RandomAccessIterator2> operator ()(_RandomAccessIterator2 __f, _RandomAccessIterator2 __l) const { static_assert ( std::is_same< - typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, + typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator2>::value_type>::type >::value, "Corpus and Pattern iterators must point to the same type" ); @@ -251,10 +251,10 @@ public: if ( __pattern_length_ > _VSTD::distance(__f, __l)) return make_pair(__l, __l); - // Do the search + // Do the search return this->__search(__f, __l); } - + public: // TODO private: _RandomAccessIterator1 __first_; _RandomAccessIterator1 __last_; @@ -271,7 +271,7 @@ public: // TODO private: const _RandomAccessIterator2 __last = __l - __pattern_length_; const skip_table_type & __skip = *__skip_.get(); const vector<difference_type> & __suffix = *__suffix_.get(); - + while (__cur <= __last) { @@ -283,7 +283,7 @@ public: // TODO private: if ( __j == 0 ) return make_pair(__cur, __cur + __pattern_length_); } - + // Since we didn't match, figure out how far to skip forward difference_type __k = __skip[__cur [ __j - 1 ]]; difference_type __m = __j - __k - 1; @@ -292,7 +292,7 @@ public: // TODO private: else __cur += __suffix[ __j ]; } - + return make_pair(__l, __l); // We didn't find anything } @@ -301,21 +301,21 @@ public: // TODO private: void __compute_bm_prefix ( _Iterator __f, _Iterator __l, _BinaryPredicate __pred, _Container &__prefix ) { const size_t __count = _VSTD::distance(__f, __l); - + __prefix[0] = 0; size_t __k = 0; for ( size_t __i = 1; __i < __count; ++__i ) { while ( __k > 0 && !__pred ( __f[__k], __f[__i] )) __k = __prefix [ __k - 1 ]; - + if ( __pred ( __f[__k], __f[__i] )) __k++; __prefix [ __i ] = __k; } } - void __build_suffix_table(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, + void __build_suffix_table(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, _BinaryPredicate __pred) { const size_t __count = _VSTD::distance(__f, __l); @@ -323,19 +323,19 @@ public: // TODO private: if (__count > 0) { vector<value_type> __scratch(__count); - + __compute_bm_prefix(__f, __l, __pred, __scratch); for ( size_t __i = 0; __i <= __count; __i++ ) __suffix[__i] = __count - __scratch[__count-1]; - + typedef reverse_iterator<_RandomAccessIterator1> _RevIter; __compute_bm_prefix(_RevIter(__l), _RevIter(__f), __pred, __scratch); - + for ( size_t __i = 0; __i < __count; __i++ ) { const size_t __j = __count - __scratch[__i]; const difference_type __k = __i - __scratch[__i] + 1; - + if (__suffix[__j] > __k) __suffix[__j] = __k; } @@ -344,20 +344,20 @@ public: // TODO private: }; -template<class _RandomAccessIterator, - class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, +template<class _RandomAccessIterator, + class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, class _BinaryPredicate = equal_to<>> _LIBCPP_INLINE_VISIBILITY boyer_moore_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate> -make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, +make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, _Hash __hf = _Hash(), _BinaryPredicate __p = _BinaryPredicate ()) { return boyer_moore_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>(__f, __l, __hf, __p); } // boyer-moore-horspool -template <class _RandomAccessIterator1, - class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, +template <class _RandomAccessIterator1, + class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, class _BinaryPredicate = equal_to<>> class _LIBCPP_TEMPLATE_VIS boyer_moore_horspool_searcher { private: @@ -371,7 +371,7 @@ private: > skip_table_type; public: - boyer_moore_horspool_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, + boyer_moore_horspool_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, _Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate()) : __first_(__f), __last_(__l), __pred_(__pred), __pattern_length_(_VSTD::distance(__first_, __last_)), @@ -385,13 +385,13 @@ public: __skip_->insert(*__f, __pattern_length_ - 1 - __i); } } - + template <typename _RandomAccessIterator2> pair<_RandomAccessIterator2, _RandomAccessIterator2> operator ()(_RandomAccessIterator2 __f, _RandomAccessIterator2 __l) const { static_assert ( std::is_same< - typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, + typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator2>::value_type>::type >::value, "Corpus and Pattern iterators must point to the same type" ); @@ -403,10 +403,10 @@ public: if ( __pattern_length_ > _VSTD::distance(__f, __l)) return make_pair(__l, __l); - // Do the search + // Do the search return this->__search(__f, __l); } - + private: _RandomAccessIterator1 __first_; _RandomAccessIterator1 __last_; @@ -434,17 +434,17 @@ private: } __cur += __skip[__cur[__pattern_length_-1]]; } - + return make_pair(__l, __l); } }; -template<class _RandomAccessIterator, - class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, +template<class _RandomAccessIterator, + class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, class _BinaryPredicate = equal_to<>> _LIBCPP_INLINE_VISIBILITY boyer_moore_horspool_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate> -make_boyer_moore_horspool_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, +make_boyer_moore_horspool_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, _Hash __hf = _Hash(), _BinaryPredicate __p = _BinaryPredicate ()) { return boyer_moore_horspool_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>(__f, __l, __hf, __p); diff --git a/contrib/libs/cxxsupp/libcxx/include/experimental/iterator b/contrib/libs/cxxsupp/libcxx/include/experimental/iterator index 09ea2cbcc7..43f1bd8d7a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/experimental/iterator +++ b/contrib/libs/cxxsupp/libcxx/include/experimental/iterator @@ -26,19 +26,19 @@ namespace std { typedef void difference_type; typedef void pointer; typedef void reference; - + ostream_joiner(ostream_type& s, const DelimT& delimiter); ostream_joiner(ostream_type& s, DelimT&& delimiter); - template<typename T> + template<typename T> ostream_joiner& operator=(const T& value); ostream_joiner& operator*() noexcept; ostream_joiner& operator++() noexcept; ostream_joiner& operator++(int) noexcept; private: - ostream_type* out_stream; // exposition only - DelimT delim; // exposition only + ostream_type* out_stream; // exposition only + DelimT delim; // exposition only bool first_element; // exposition only }; @@ -78,11 +78,11 @@ public: ostream_joiner(ostream_type& __os, _Delim&& __d) : __output_iter(_VSTD::addressof(__os)), __delim(_VSTD::move(__d)), __first(true) {} - + ostream_joiner(ostream_type& __os, const _Delim& __d) : __output_iter(_VSTD::addressof(__os)), __delim(__d), __first(true) {} - + template<typename _Tp> ostream_joiner& operator=(const _Tp& __v) { diff --git a/contrib/libs/cxxsupp/libcxx/include/experimental/type_traits b/contrib/libs/cxxsupp/libcxx/include/experimental/type_traits index ea1335f96a..a5e554b34a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/experimental/type_traits +++ b/contrib/libs/cxxsupp/libcxx/include/experimental/type_traits @@ -60,7 +60,7 @@ inline namespace fundamentals_v1 { using is_detected_convertible = is_convertible<detected_t<Op, Args...>, To>; template <class To, template<class...> class Op, class... Args> constexpr bool is_detected_convertible_v - = is_detected_convertible<To, Op, Args...>::value; + = is_detected_convertible<To, Op, Args...>::value; } // namespace fundamentals_v1 } // namespace experimental @@ -106,9 +106,9 @@ using raw_invocation_type_t = typename raw_invocation_type<_Tp>::type; template <class...> using void_t = void; struct nonesuch : private __nat { // make nonesuch "not an aggregate" - ~nonesuch() = delete; - nonesuch (nonesuch const&) = delete; - void operator=(nonesuch const&) = delete; + ~nonesuch() = delete; + nonesuch (nonesuch const&) = delete; + void operator=(nonesuch const&) = delete; }; template <class _Default, class _AlwaysVoid, template <class...> class _Op, class... _Args> @@ -123,7 +123,7 @@ struct _DETECTOR<_Default, void_t<_Op<_Args...>>, _Op, _Args...> { using type = _Op<_Args...>; }; - + template <template<class...> class _Op, class... _Args> using is_detected = typename _DETECTOR<nonesuch, void, _Op, _Args...>::value_t; template <template<class...> class _Op, class... _Args> @@ -144,7 +144,7 @@ template <class Expected, template<class...> class _Op, class... _Args> template <class To, template<class...> class _Op, class... _Args> using is_detected_convertible = is_convertible<detected_t<_Op, _Args...>, To>; template <class To, template<class...> class _Op, class... _Args> - _LIBCPP_CONSTEXPR bool is_detected_convertible_v = is_detected_convertible<To, _Op, _Args...>::value; + _LIBCPP_CONSTEXPR bool is_detected_convertible_v = is_detected_convertible<To, _Op, _Args...>::value; _LIBCPP_END_NAMESPACE_LFTS diff --git a/contrib/libs/cxxsupp/libcxx/include/ext/hash_map b/contrib/libs/cxxsupp/libcxx/include/ext/hash_map index 60e32b09e3..067f4a1ada 100644 --- a/contrib/libs/cxxsupp/libcxx/include/ext/hash_map +++ b/contrib/libs/cxxsupp/libcxx/include/ext/hash_map @@ -46,10 +46,10 @@ public: template <class InputIterator> hash_map(InputIterator f, InputIterator l); template <class InputIterator> - hash_map(InputIterator f, InputIterator l, + hash_map(InputIterator f, InputIterator l, size_type n, const hasher& hf = hasher(), - const key_equal& eql = key_equal(), - const allocator_type& a = allocator_type()); + const key_equal& eql = key_equal(), + const allocator_type& a = allocator_type()); hash_map(const hash_map&); ~hash_map(); hash_map& operator=(const hash_map&); @@ -395,10 +395,10 @@ public: return __t; } - friend _LIBCPP_INLINE_VISIBILITY + friend _LIBCPP_INLINE_VISIBILITY bool operator==(const __hash_map_iterator& __x, const __hash_map_iterator& __y) {return __x.__i_ == __y.__i_;} - friend _LIBCPP_INLINE_VISIBILITY + friend _LIBCPP_INLINE_VISIBILITY bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y) {return __x.__i_ != __y.__i_;} diff --git a/contrib/libs/cxxsupp/libcxx/include/ext/hash_set b/contrib/libs/cxxsupp/libcxx/include/ext/hash_set index af3f9c5de0..d1fecdd111 100644 --- a/contrib/libs/cxxsupp/libcxx/include/ext/hash_set +++ b/contrib/libs/cxxsupp/libcxx/include/ext/hash_set @@ -607,7 +607,7 @@ template <class _InputIterator> inline void hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, - _InputIterator __last) + _InputIterator __last) { for (; __first != __last; ++__first) __table_.__insert_multi(*__first); diff --git a/contrib/libs/cxxsupp/libcxx/include/forward_list b/contrib/libs/cxxsupp/libcxx/include/forward_list index 3454a784a1..4273c2750b 100644 --- a/contrib/libs/cxxsupp/libcxx/include/forward_list +++ b/contrib/libs/cxxsupp/libcxx/include/forward_list @@ -604,7 +604,7 @@ __forward_list_base<_Tp, _Alloc>::swap(__forward_list_base& __x) __is_nothrow_swappable<__node_allocator>::value) #endif { - _VSTD::__swap_allocator(__alloc(), __x.__alloc(), + _VSTD::__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_); diff --git a/contrib/libs/cxxsupp/libcxx/include/future b/contrib/libs/cxxsupp/libcxx/include/future index 89acdba62b..4761a1747d 100644 --- a/contrib/libs/cxxsupp/libcxx/include/future +++ b/contrib/libs/cxxsupp/libcxx/include/future @@ -628,10 +628,10 @@ protected: public: template <class _Arg> - void set_value(_Arg&& __arg); + void set_value(_Arg&& __arg); template <class _Arg> - void set_value_at_thread_exit(_Arg&& __arg); + void set_value_at_thread_exit(_Arg&& __arg); _Rp move(); typename add_lvalue_reference<_Rp>::type copy(); @@ -1887,7 +1887,7 @@ public: class = typename enable_if < !is_same< - typename __uncvref<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -1898,7 +1898,7 @@ public: class = typename enable_if < !is_same< - typename __uncvref<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -2016,7 +2016,7 @@ public: class = typename enable_if < !is_same< - typename __uncvref<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -2027,11 +2027,11 @@ public: class = typename enable_if < !is_same< - typename __uncvref<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type - > + > _LIBCPP_INLINE_VISIBILITY packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f) : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)), diff --git a/contrib/libs/cxxsupp/libcxx/include/inttypes.h b/contrib/libs/cxxsupp/libcxx/include/inttypes.h index 6f8021263e..9b6e8eb4f1 100644 --- a/contrib/libs/cxxsupp/libcxx/include/inttypes.h +++ b/contrib/libs/cxxsupp/libcxx/include/inttypes.h @@ -248,7 +248,7 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int # define __STDC_FORMAT_MACROS #endif -#ifdef _LIBCPP_COMPILER_MSVC +#ifdef _LIBCPP_COMPILER_MSVC #include _LIBCPP_UCRT_INCLUDE(inttypes.h) #else #include_next <inttypes.h> diff --git a/contrib/libs/cxxsupp/libcxx/include/ios b/contrib/libs/cxxsupp/libcxx/include/ios index c9230d6a94..555d34f4fe 100644 --- a/contrib/libs/cxxsupp/libcxx/include/ios +++ b/contrib/libs/cxxsupp/libcxx/include/ios @@ -202,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; +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 @@ -635,45 +635,45 @@ public: virtual ~basic_ios(); // 27.5.4.2 Members: - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY basic_ostream<char_type, traits_type>* tie() const; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY basic_ostream<char_type, traits_type>* tie(basic_ostream<char_type, traits_type>* __tiestr); - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY basic_streambuf<char_type, traits_type>* rdbuf() const; - _LIBCPP_INLINE_VISIBILITY + _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 + _LIBCPP_INLINE_VISIBILITY char_type fill() const; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY char_type fill(char_type __ch); - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY locale imbue(const locale& __loc); - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY char narrow(char_type __c, char __dfault) const; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY char_type widen(char __c) const; protected: _LIBCPP_INLINE_VISIBILITY basic_ios() {// purposefully does no initialization } - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY void init(basic_streambuf<char_type, traits_type>* __sb); - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY void move(basic_ios& __rhs); _LIBCPP_INLINE_VISIBILITY void move(basic_ios&& __rhs) {move(__rhs);} - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY void swap(basic_ios& __rhs) _NOEXCEPT; - _LIBCPP_INLINE_VISIBILITY + _LIBCPP_INLINE_VISIBILITY void set_rdbuf(basic_streambuf<char_type, traits_type>* __sb); private: basic_ostream<char_type, traits_type>* __tie_; diff --git a/contrib/libs/cxxsupp/libcxx/include/istream b/contrib/libs/cxxsupp/libcxx/include/istream index 6fb296f820..bf8c066dc6 100644 --- a/contrib/libs/cxxsupp/libcxx/include/istream +++ b/contrib/libs/cxxsupp/libcxx/include/istream @@ -359,16 +359,16 @@ __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) { if (__s) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS typedef istreambuf_iterator<_CharT, _Traits> _Ip; typedef num_get<_CharT, _Ip> _Fp; use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __state, __n); #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) @@ -468,8 +468,8 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp if (__s) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS typedef istreambuf_iterator<_CharT, _Traits> _Ip; typedef num_get<_CharT, _Ip> _Fp; @@ -488,18 +488,18 @@ __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp else { __n = static_cast<_Tp>(__temp); - } -#ifndef _LIBCPP_NO_EXCEPTIONS + } +#ifndef _LIBCPP_NO_EXCEPTIONS } - catch (...) - { + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS __is.setstate(__state); } @@ -526,9 +526,9 @@ basic_istream<_CharT, _Traits>& __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n) { ios_base::iostate __state = ios_base::goodbit; - typename basic_istream<_CharT, _Traits>::sentry __sen(__is); - if (__sen) - { + typename basic_istream<_CharT, _Traits>::sentry __sen(__is); + if (__sen) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -554,9 +554,9 @@ __input_c_string(basic_istream<_CharT, _Traits>& __is, _CharT* __p, size_t __n) if (__s == __p) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) @@ -635,9 +635,9 @@ basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c) { ios_base::iostate __state = ios_base::goodbit; - typename basic_istream<_CharT, _Traits>::sentry __sen(__is); - if (__sen) - { + typename basic_istream<_CharT, _Traits>::sentry __sen(__is); + if (__sen) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -648,9 +648,9 @@ operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c) else __c = _Traits::to_char_type(__i); #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) @@ -686,38 +686,38 @@ basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_typ { ios_base::iostate __state = ios_base::goodbit; __gc_ = 0; - sentry __s(*this, true); - if (__s) - { - if (__sb) + sentry __s(*this, true); + if (__s) + { + if (__sb) { -#ifndef _LIBCPP_NO_EXCEPTIONS - try +#ifndef _LIBCPP_NO_EXCEPTIONS + try { -#endif // _LIBCPP_NO_EXCEPTIONS - while (true) +#endif // _LIBCPP_NO_EXCEPTIONS + while (true) { - typename traits_type::int_type __i = this->rdbuf()->sgetc(); - if (traits_type::eq_int_type(__i, _Traits::eof())) + typename traits_type::int_type __i = this->rdbuf()->sgetc(); + if (traits_type::eq_int_type(__i, _Traits::eof())) { __state |= ios_base::eofbit; - break; + 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( + __sb->sputc(traits_type::to_char_type(__i)), + traits_type::eof())) + break; + ++__gc_; + this->rdbuf()->sbumpc(); + } + if (__gc_ == 0) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; - if (__gc_ == 0) + if (__gc_ == 0) __state |= ios_base::failbit; this->__setstate_nothrow(__state); @@ -725,11 +725,11 @@ basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_typ { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS - } - else - { + } + else + { __state |= ios_base::failbit; } this->setstate(__state); @@ -744,9 +744,9 @@ basic_istream<_CharT, _Traits>::get() ios_base::iostate __state = ios_base::goodbit; __gc_ = 0; int_type __r = traits_type::eof(); - sentry __s(*this, true); - if (__s) - { + sentry __s(*this, true); + if (__s) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -757,9 +757,9 @@ basic_istream<_CharT, _Traits>::get() else __gc_ = 1; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { this->__setstate_nothrow(this->rdstate() | ios_base::badbit); if (this->exceptions() & ios_base::badbit) { @@ -778,10 +778,10 @@ basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __ { ios_base::iostate __state = ios_base::goodbit; __gc_ = 0; - sentry __sen(*this, true); - if (__sen) - { - if (__n > 0) + sentry __sen(*this, true); + if (__sen) + { + if (__n > 0) { #ifndef _LIBCPP_NO_EXCEPTIONS try @@ -805,22 +805,22 @@ basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __ if (__gc_ == 0) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } + } catch (...) { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { - if (__n > 0) - *__s = char_type(); + if (__n > 0) + *__s = char_type(); throw; - } + } } #endif } else - { + { __state |= ios_base::failbit; } @@ -840,41 +840,41 @@ basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __s { ios_base::iostate __state = ios_base::goodbit; __gc_ = 0; - sentry __sen(*this, true); - if (__sen) - { -#ifndef _LIBCPP_NO_EXCEPTIONS - try + sentry __sen(*this, true); + if (__sen) + { +#ifndef _LIBCPP_NO_EXCEPTIONS + 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(); + if (traits_type::eq_int_type(__i, traits_type::eof())) { __state |= ios_base::eofbit; - break; + 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(); - } + 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 - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; // according to the spec, exceptions here are caught but not rethrown - } + } #endif // _LIBCPP_NO_EXCEPTIONS - if (__gc_ == 0) + if (__gc_ == 0) __state |= ios_base::failbit; this->setstate(__state); - } + } return *this; } @@ -888,8 +888,8 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS while (true) { @@ -916,20 +916,20 @@ basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_typ ++__gc_; } #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { - if (__n > 0) - *__s = char_type(); + if (__n > 0) + *__s = char_type(); if (__gc_ == 0) __state |= ios_base::failbit; throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS } if (__n > 0) @@ -950,8 +950,8 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (__n == numeric_limits<streamsize>::max()) { @@ -984,16 +984,16 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm) } } #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1011,23 +1011,23 @@ basic_istream<_CharT, _Traits>::peek() if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS __r = this->rdbuf()->sgetc(); if (traits_type::eq_int_type(__r, traits_type::eof())) __state |= ios_base::eofbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1044,23 +1044,23 @@ basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS __gc_ = this->rdbuf()->sgetn(__s, __n); if (__gc_ != __n) __state |= ios_base::failbit | ios_base::eofbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS } else @@ -1081,8 +1081,8 @@ basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __n) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS streamsize __c = this->rdbuf()->in_avail(); switch (__c) @@ -1100,16 +1100,16 @@ basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __n) break; } #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS } else @@ -1131,22 +1131,22 @@ basic_istream<_CharT, _Traits>::putback(char_type __c) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (this->rdbuf() == nullptr || this->rdbuf()->sputbackc(__c) == traits_type::eof()) __state |= ios_base::badbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS } else @@ -1168,22 +1168,22 @@ basic_istream<_CharT, _Traits>::unget() if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (this->rdbuf() == nullptr || this->rdbuf()->sungetc() == traits_type::eof()) __state |= ios_base::badbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS } else @@ -1204,8 +1204,8 @@ basic_istream<_CharT, _Traits>::sync() if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (this->rdbuf() == nullptr) return -1; @@ -1215,16 +1215,16 @@ basic_istream<_CharT, _Traits>::sync() return -1; } #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1241,21 +1241,21 @@ basic_istream<_CharT, _Traits>::tellg() if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS - __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in); + __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in); #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1272,22 +1272,22 @@ basic_istream<_CharT, _Traits>::seekg(pos_type __pos) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1)) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1304,22 +1304,22 @@ basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::in) == pos_type(-1)) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; this->__setstate_nothrow(__state); if (this->exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS this->setstate(__state); } @@ -1335,8 +1335,8 @@ ws(basic_istream<_CharT, _Traits>& __is) if (__sen) { #ifndef _LIBCPP_NO_EXCEPTIONS - try - { + try + { #endif // _LIBCPP_NO_EXCEPTIONS const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc()); while (true) @@ -1352,16 +1352,16 @@ ws(basic_istream<_CharT, _Traits>& __is) __is.rdbuf()->sbumpc(); } #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) { throw; } - } + } #endif // _LIBCPP_NO_EXCEPTIONS __is.setstate(__state); } @@ -1445,9 +1445,9 @@ operator>>(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _Allocator>& __str) { ios_base::iostate __state = ios_base::goodbit; - typename basic_istream<_CharT, _Traits>::sentry __sen(__is); - if (__sen) - { + typename basic_istream<_CharT, _Traits>::sentry __sen(__is); + if (__sen) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -1479,9 +1479,9 @@ operator>>(basic_istream<_CharT, _Traits>& __is, if (__c == 0) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) @@ -1501,9 +1501,9 @@ getline(basic_istream<_CharT, _Traits>& __is, basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm) { ios_base::iostate __state = ios_base::goodbit; - typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true); - if (__sen) - { + typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true); + if (__sen) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -1532,9 +1532,9 @@ getline(basic_istream<_CharT, _Traits>& __is, if (__extr == 0) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) @@ -1580,9 +1580,9 @@ basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x) { ios_base::iostate __state = ios_base::goodbit; - typename basic_istream<_CharT, _Traits>::sentry __sen(__is); - if (__sen) - { + typename basic_istream<_CharT, _Traits>::sentry __sen(__is); + if (__sen) + { #ifndef _LIBCPP_NO_EXCEPTIONS try { @@ -1611,9 +1611,9 @@ operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x) if (_Size > 0 && __c == 0) __state |= ios_base::failbit; #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { + } + catch (...) + { __state |= ios_base::badbit; __is.__setstate_nothrow(__state); if (__is.exceptions() & ios_base::badbit) diff --git a/contrib/libs/cxxsupp/libcxx/include/list b/contrib/libs/cxxsupp/libcxx/include/list index 71406c6743..8c6c95a04a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/list +++ b/contrib/libs/cxxsupp/libcxx/include/list @@ -2021,22 +2021,22 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c) __c.__sz() = 0; #if _LIBCPP_DEBUG_LEVEL == 2 if (&__c != this) { - __libcpp_db* __db = __get_db(); - __c_node* __cn1 = __db->__find_c_and_lock(this); - __c_node* __cn2 = __db->__find_c(&__c); - for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;) + __libcpp_db* __db = __get_db(); + __c_node* __cn1 = __db->__find_c_and_lock(this); + __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)->__c_ = __cn1; - if (--__cn2->end_ != __ip) - memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*)); - } + --__ip; + iterator* __i = static_cast<iterator*>((*__ip)->__i_); + if (__i->__ptr_ != __c.__end_as_link()) + { + __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 } @@ -2066,22 +2066,22 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __i) ++base::__sz(); #if _LIBCPP_DEBUG_LEVEL == 2 if (&__c != this) { - __libcpp_db* __db = __get_db(); - __c_node* __cn1 = __db->__find_c_and_lock(this); - __c_node* __cn2 = __db->__find_c(&__c); - for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;) + __libcpp_db* __db = __get_db(); + __c_node* __cn1 = __db->__find_c_and_lock(this); + __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)->__c_ = __cn1; - if (--__cn2->end_ != __ip) - _VSTD::memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*)); - } + --__ip; + iterator* __j = static_cast<iterator*>((*__ip)->__i_); + if (__j->__ptr_ == __f) + { + __cn1->__add(*__ip); + (*__ip)->__c_ = __cn1; + if (--__cn2->end_ != __ip) + _VSTD::memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*)); + } } - __db->unlock(); + __db->unlock(); } #endif } @@ -2125,26 +2125,26 @@ list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __f, con __link_nodes(__p.__ptr_, __first, __last); #if _LIBCPP_DEBUG_LEVEL == 2 if (&__c != this) { - __libcpp_db* __db = __get_db(); - __c_node* __cn1 = __db->__find_c_and_lock(this); - __c_node* __cn2 = __db->__find_c(&__c); - for (__i_node** __ip = __cn2->end_; __ip != __cn2->beg_;) + __libcpp_db* __db = __get_db(); + __c_node* __cn1 = __db->__find_c_and_lock(this); + __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_) + --__ip; + iterator* __j = static_cast<iterator*>((*__ip)->__i_); + for (__link_pointer __k = __f.__ptr_; + __k != __l.__ptr_; __k = __k->__next_) { - if (__j->__ptr_ == __k) - { - __cn1->__add(*__ip); - (*__ip)->__c_ = __cn1; - if (--__cn2->end_ != __ip) - _VSTD::memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*)); - } + if (__j->__ptr_ == __k) + { + __cn1->__add(*__ip); + (*__ip)->__c_ = __cn1; + if (--__cn2->end_ != __ip) + _VSTD::memmove(__ip, __ip+1, (__cn2->end_ - __ip)*sizeof(__i_node*)); + } } } - __db->unlock(); + __db->unlock(); } #endif } diff --git a/contrib/libs/cxxsupp/libcxx/include/locale b/contrib/libs/cxxsupp/libcxx/include/locale index 242790a9d4..29fc1acd27 100644 --- a/contrib/libs/cxxsupp/libcxx/include/locale +++ b/contrib/libs/cxxsupp/libcxx/include/locale @@ -891,7 +891,7 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e, typedef typename numpunct<_CharT>::string_type string_type; const string_type __names[2] = {__np.truename(), __np.falsename()}; const string_type* __i = _VSTD::__scan_keyword(__b, __e, __names, __names+2, - __ct, __err); + __ct, __err); __v = __i == __names; return __b; } diff --git a/contrib/libs/cxxsupp/libcxx/include/locale.h b/contrib/libs/cxxsupp/libcxx/include/locale.h index 52c452001d..f3f0eccacf 100644 --- a/contrib/libs/cxxsupp/libcxx/include/locale.h +++ b/contrib/libs/cxxsupp/libcxx/include/locale.h @@ -40,7 +40,7 @@ Functions: #endif #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header +# pragma GCC system_header #endif #ifdef _LIBCPP_COMPILER_MSVC diff --git a/contrib/libs/cxxsupp/libcxx/include/map b/contrib/libs/cxxsupp/libcxx/include/map index c78a7ee31a..4ecf3954d1 100644 --- a/contrib/libs/cxxsupp/libcxx/include/map +++ b/contrib/libs/cxxsupp/libcxx/include/map @@ -1301,7 +1301,7 @@ public: __r->__get_value().second = _VSTD::forward<_Vp>(__v); return __r; - } + } template <class _Vp> _LIBCPP_INLINE_VISIBILITY iterator insert_or_assign(const_iterator __h, @@ -1314,7 +1314,7 @@ public: __r->__get_value().second = _VSTD::forward<_Vp>(__v); return __r; - } + } #endif // _LIBCPP_STD_VER > 14 diff --git a/contrib/libs/cxxsupp/libcxx/include/memory b/contrib/libs/cxxsupp/libcxx/include/memory index 1975092ba0..0633f1fc3a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/memory +++ b/contrib/libs/cxxsupp/libcxx/include/memory @@ -122,7 +122,7 @@ public: typedef typename add_lvalue_reference<const T>::type const_reference; // deprecated in C++17, removed in C++20 - typedef T value_type; + typedef T value_type; template <class U> struct rebind {typedef allocator<U> other;}; // deprecated in C++17, removed in C++20 @@ -342,7 +342,7 @@ public: pointer release() noexcept; void reset(pointer p = pointer()) noexcept; void reset(nullptr_t) noexcept; - template <class U> void reset(U) = delete; + template <class U> void reset(U) = delete; void swap(unique_ptr& u) noexcept; }; @@ -567,7 +567,7 @@ template<class T> void swap(weak_ptr<T>& a, weak_ptr<T>& b) noexcept; template<class T> struct owner_less; template<class T> -struct owner_less<shared_ptr<T> > +struct owner_less<shared_ptr<T> > : binary_function<shared_ptr<T>, shared_ptr<T>, bool> { typedef bool result_type; @@ -577,7 +577,7 @@ struct owner_less<shared_ptr<T> > }; template<class T> -struct owner_less<weak_ptr<T> > +struct owner_less<weak_ptr<T> > : binary_function<weak_ptr<T>, weak_ptr<T>, bool> { typedef bool result_type; diff --git a/contrib/libs/cxxsupp/libcxx/include/mutex b/contrib/libs/cxxsupp/libcxx/include/mutex index e815dda502..a2edfa4240 100644 --- a/contrib/libs/cxxsupp/libcxx/include/mutex +++ b/contrib/libs/cxxsupp/libcxx/include/mutex @@ -580,14 +580,14 @@ struct _LIBCPP_TEMPLATE_VIS once_flag _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR once_flag() _NOEXCEPT : __state_(0) {} - + #if defined(_LIBCPP_ABI_MICROSOFT) - typedef uintptr_t _State_type; + typedef uintptr_t _State_type; #else - typedef unsigned long _State_type; + typedef unsigned long _State_type; #endif - + private: once_flag(const once_flag&); // = delete; once_flag& operator=(const once_flag&); // = delete; @@ -668,10 +668,10 @@ __call_once_proxy(void* __vp) #ifdef _LIBCPP_ABI_MICROSOFT _LIBCPP_FUNC_VIS void __call_once(volatile atomic<once_flag::_State_type>&, void*, - void (*)(void*)); + void (*)(void*)); #else _LIBCPP_FUNC_VIS void __call_once(volatile once_flag::_State_type&, void*, - void (*)(void*)); + void (*)(void*)); #endif #ifndef _LIBCPP_CXX03_LANG diff --git a/contrib/libs/cxxsupp/libcxx/include/numeric b/contrib/libs/cxxsupp/libcxx/include/numeric index 8ea7ecc375..e4ab8e70f0 100644 --- a/contrib/libs/cxxsupp/libcxx/include/numeric +++ b/contrib/libs/cxxsupp/libcxx/include/numeric @@ -368,7 +368,7 @@ _OutputIterator inclusive_scan(_InputIterator __first, _InputIterator __last, for (; __first != __last; ++__first, (void) ++__result) { __init = __b(__init, *__first); *__result = __init; - } + } return __result; } @@ -382,7 +382,7 @@ _OutputIterator inclusive_scan(_InputIterator __first, _InputIterator __last, *__result++ = __init; if (++__first != __last) return _VSTD::inclusive_scan(__first, __last, __result, __b, __init); - } + } return __result; } @@ -442,7 +442,7 @@ transform_inclusive_scan(_InputIterator __first, _InputIterator __last, *__result++ = __init; if (++__first != __last) return _VSTD::transform_inclusive_scan(__first, __last, __result, __b, __u, __init); - } + } return __result; } @@ -513,9 +513,9 @@ struct __ct_abs<_Result, _Source, true> { _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY _Result operator()(_Source __t) const noexcept { - if (__t >= 0) return __t; - if (__t == numeric_limits<_Source>::min()) return -static_cast<_Result>(__t); - return -__t; + if (__t >= 0) return __t; + if (__t == numeric_limits<_Source>::min()) return -static_cast<_Result>(__t); + return -__t; } }; @@ -614,8 +614,8 @@ _LIBCPP_INLINE_VISIBILITY constexpr enable_if_t<is_floating_point_v<_Fp>, _Fp> midpoint(_Fp __a, _Fp __b) noexcept { - constexpr _Fp __lo = numeric_limits<_Fp>::min()*2; - constexpr _Fp __hi = numeric_limits<_Fp>::max()/2; + constexpr _Fp __lo = numeric_limits<_Fp>::min()*2; + constexpr _Fp __hi = numeric_limits<_Fp>::max()/2; return __fp_abs(__a) <= __hi && __fp_abs(__b) <= __hi ? // typical case: overflow is impossible (__a + __b)/2 : // always correctly rounded __fp_abs(__a) < __lo ? __a + __b/2 : // not safe to halve a diff --git a/contrib/libs/cxxsupp/libcxx/include/optional b/contrib/libs/cxxsupp/libcxx/include/optional index 0f6d233051..a99ccae0e9 100644 --- a/contrib/libs/cxxsupp/libcxx/include/optional +++ b/contrib/libs/cxxsupp/libcxx/include/optional @@ -321,7 +321,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp> #if _LIBCPP_STD_VER > 17 _VSTD::construct_at(_VSTD::addressof(this->__val_), _VSTD::forward<_Args>(__args)...); #else - ::new ((void*)_VSTD::addressof(this->__val_)) value_type(_VSTD::forward<_Args>(__args)...); + ::new ((void*)_VSTD::addressof(this->__val_)) value_type(_VSTD::forward<_Args>(__args)...); #endif this->__engaged_ = true; } diff --git a/contrib/libs/cxxsupp/libcxx/include/queue b/contrib/libs/cxxsupp/libcxx/include/queue index cbd07140a7..834115900e 100644 --- a/contrib/libs/cxxsupp/libcxx/include/queue +++ b/contrib/libs/cxxsupp/libcxx/include/queue @@ -70,8 +70,8 @@ public: template<class Container> queue(Container) -> queue<typename Container::value_type, Container>; // C++17 - -template<class Container, class Allocator> + +template<class Container, class Allocator> queue(Container, Allocator) -> queue<typename Container::value_type, Container>; // C++17 template <class T, class Container> @@ -170,13 +170,13 @@ public: template <class Compare, class Container> priority_queue(Compare, Container) -> priority_queue<typename Container::value_type, Container, Compare>; // C++17 - -template<class InputIterator, + +template<class InputIterator, class Compare = less<iter-value-type<InputIterator>>, class Container = vector<iter-value-type<InputIterator>>> priority_queue(InputIterator, InputIterator, Compare = Compare(), Container = Container()) -> priority_queue<iter-value-type<InputIterator>, 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 @@ -364,7 +364,7 @@ template<class _Container, > queue(_Container) -> queue<typename _Container::value_type, _Container>; - + template<class _Container, class _Alloc, class = enable_if_t<!__is_allocator<_Container>::value>, @@ -592,8 +592,8 @@ template <class _Compare, > priority_queue(_Compare, _Container) -> priority_queue<typename _Container::value_type, _Container, _Compare>; - -template<class _InputIterator, + +template<class _InputIterator, class _Compare = less<__iter_value_type<_InputIterator>>, class _Container = vector<__iter_value_type<_InputIterator>>, class = enable_if_t<__is_cpp17_input_iterator<_InputIterator>::value>, @@ -602,8 +602,8 @@ template<class _InputIterator, > priority_queue(_InputIterator, _InputIterator, _Compare = _Compare(), _Container = _Container()) -> priority_queue<__iter_value_type<_InputIterator>, _Container, _Compare>; - -template<class _Compare, + +template<class _Compare, class _Container, class _Alloc, class = enable_if_t<!__is_allocator<_Compare>::value>, diff --git a/contrib/libs/cxxsupp/libcxx/include/random b/contrib/libs/cxxsupp/libcxx/include/random index 1320250897..e7ca4a9aa8 100644 --- a/contrib/libs/cxxsupp/libcxx/include/random +++ b/contrib/libs/cxxsupp/libcxx/include/random @@ -6701,7 +6701,7 @@ public: template<class _UnaryOperation> param_type(size_t __nw, result_type __xmin, result_type __xmax, _UnaryOperation __fw); - param_type(param_type const&) = default; + param_type(param_type const&) = default; param_type & operator=(const param_type& __rhs); _LIBCPP_INLINE_VISIBILITY diff --git a/contrib/libs/cxxsupp/libcxx/include/regex b/contrib/libs/cxxsupp/libcxx/include/regex index c0d1edac5e..a75e04fea1 100644 --- a/contrib/libs/cxxsupp/libcxx/include/regex +++ b/contrib/libs/cxxsupp/libcxx/include/regex @@ -171,14 +171,14 @@ public: // assign: basic_regex& assign(const basic_regex& that); basic_regex& assign(basic_regex&& that) noexcept; - basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript); + basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript); basic_regex& assign(const charT* p, size_t len, flag_type f = regex_constants::ECMAScript); template <class string_traits, class A> basic_regex& assign(const basic_string<charT, string_traits, A>& s, - flag_type f = regex_constants::ECMAScript); + flag_type f = regex_constants::ECMAScript); template <class InputIterator> basic_regex& assign(InputIterator first, InputIterator last, - flag_type f = regex_constants::ECMAScript); + flag_type f = regex_constants::ECMAScript); basic_regex& assign(initializer_list<charT>, flag_type f = regex_constants::ECMAScript); // const operations: @@ -702,7 +702,7 @@ typedef regex_iterator<string::const_iterator> sregex_iterator; typedef regex_iterator<wstring::const_iterator> wsregex_iterator; template <class BidirectionalIterator, - class charT = typename iterator_traits<BidirectionalIterator>::value_type, + class charT = typename iterator_traits<BidirectionalIterator>::value_type, class traits = regex_traits<charT>> class regex_token_iterator { diff --git a/contrib/libs/cxxsupp/libcxx/include/set b/contrib/libs/cxxsupp/libcxx/include/set index 46b515ba53..6354765c10 100644 --- a/contrib/libs/cxxsupp/libcxx/include/set +++ b/contrib/libs/cxxsupp/libcxx/include/set @@ -156,7 +156,7 @@ 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 K& x) const; // C++14 size_type count(const key_type& k) const; bool contains(const key_type& x) const; // C++20 diff --git a/contrib/libs/cxxsupp/libcxx/include/span b/contrib/libs/cxxsupp/libcxx/include/span index 5d57bd693c..eb1aff44c0 100644 --- a/contrib/libs/cxxsupp/libcxx/include/span +++ b/contrib/libs/cxxsupp/libcxx/include/span @@ -104,7 +104,7 @@ public: constexpr reverse_iterator rend() const noexcept; private: - pointer data_; // exposition only + pointer data_; // exposition only size_type size_; // exposition only }; @@ -321,7 +321,7 @@ public: template <size_t _Count> _LIBCPP_INLINE_VISIBILITY - constexpr span<element_type, _Count> first() const noexcept + constexpr span<element_type, _Count> first() const noexcept { static_assert(_Count <= _Extent, "Count out of range in span::first()"); return span<element_type, _Count>{data(), _Count}; @@ -329,7 +329,7 @@ public: template <size_t _Count> _LIBCPP_INLINE_VISIBILITY - constexpr span<element_type, _Count> last() const noexcept + constexpr span<element_type, _Count> last() const noexcept { static_assert(_Count <= _Extent, "Count out of range in span::last()"); return span<element_type, _Count>{data() + size() - _Count, _Count}; @@ -351,7 +351,7 @@ public: template <size_t _Offset, size_t _Count = dynamic_extent> _LIBCPP_INLINE_VISIBILITY - constexpr auto subspan() const noexcept + constexpr auto subspan() const noexcept -> span<element_type, _Count != dynamic_extent ? _Count : _Extent - _Offset> { static_assert(_Offset <= _Extent, "Offset out of range in span::subspan()"); @@ -376,7 +376,7 @@ public: _LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return _Extent; } _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return _Extent * sizeof(element_type); } - _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return _Extent == 0; } + _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return _Extent == 0; } _LIBCPP_INLINE_VISIBILITY constexpr reference operator[](size_type __idx) const noexcept { @@ -469,17 +469,17 @@ public: template <size_t _Sz> _LIBCPP_INLINE_VISIBILITY - constexpr span(element_type (&__arr)[_Sz]) noexcept : __data{__arr}, __size{_Sz} {} + constexpr span(element_type (&__arr)[_Sz]) noexcept : __data{__arr}, __size{_Sz} {} template <class _OtherElementType, size_t _Sz, enable_if_t<is_convertible_v<_OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr> _LIBCPP_INLINE_VISIBILITY - constexpr span(array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {} + constexpr span(array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {} template <class _OtherElementType, size_t _Sz, enable_if_t<is_convertible_v<const _OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr> _LIBCPP_INLINE_VISIBILITY - constexpr span(const array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {} + constexpr span(const array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {} #if !defined(_LIBCPP_HAS_NO_RANGES) template <__span_compatible_range<element_type> _Range> @@ -562,7 +562,7 @@ public: _LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return __size; } _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return __size * sizeof(element_type); } - _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return __size == 0; } + _LIBCPP_INLINE_VISIBILITY constexpr bool empty() const noexcept { return __size == 0; } _LIBCPP_INLINE_VISIBILITY constexpr reference operator[](size_type __idx) const noexcept { @@ -596,7 +596,7 @@ public: inline _LIBCPP_INLINE_VISIBILITY span<byte, dynamic_extent> __as_writable_bytes() const noexcept; private: - pointer __data; + pointer __data; size_type __size; }; @@ -621,7 +621,7 @@ template <class _Tp, size_t _Extent> _LIBCPP_INLINE_VISIBILITY auto as_bytes(span<_Tp, _Extent> __s) noexcept -> decltype(__s.__as_bytes()) -{ return __s.__as_bytes(); } +{ return __s.__as_bytes(); } template <class _Tp, size_t _Extent> _LIBCPP_INLINE_VISIBILITY diff --git a/contrib/libs/cxxsupp/libcxx/include/sstream b/contrib/libs/cxxsupp/libcxx/include/sstream index fbe5ffcab4..a130aa97d7 100644 --- a/contrib/libs/cxxsupp/libcxx/include/sstream +++ b/contrib/libs/cxxsupp/libcxx/include/sstream @@ -256,7 +256,7 @@ protected: virtual pos_type seekpos(pos_type __sp, ios_base::openmode __wch = ios_base::in | ios_base::out) { return seekoff(__sp, ios_base::beg, __wch); - } + } }; template <class _CharT, class _Traits, class _Allocator> @@ -656,31 +656,31 @@ public: basic_istringstream(basic_istringstream&& __rhs) : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs)) , __sb_(_VSTD::move(__rhs.__sb_)) - { - basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); - } + { + basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); + } // 27.8.2.2 Assign and swap: basic_istringstream& operator=(basic_istringstream&& __rhs) { - basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); - __sb_ = _VSTD::move(__rhs.__sb_); - return *this; - } + basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); + return *this; + } _LIBCPP_INLINE_VISIBILITY void swap(basic_istringstream& __rhs) { - basic_istream<char_type, traits_type>::swap(__rhs); - __sb_.swap(__rhs.__sb_); - } + basic_istream<char_type, traits_type>::swap(__rhs); + __sb_.swap(__rhs.__sb_); + } // 27.8.2.3 Members: _LIBCPP_INLINE_VISIBILITY basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const { - return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); - } + return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); + } _LIBCPP_INLINE_VISIBILITY string_type str() const { - return __sb_.str(); - } + return __sb_.str(); + } _LIBCPP_INLINE_VISIBILITY void str(const string_type& __s) { __sb_.str(__s); @@ -736,32 +736,32 @@ public: basic_ostringstream(basic_ostringstream&& __rhs) : basic_ostream<_CharT, _Traits>(_VSTD::move(__rhs)) , __sb_(_VSTD::move(__rhs.__sb_)) - { - basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_); - } + { + basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_); + } // 27.8.2.2 Assign and swap: basic_ostringstream& operator=(basic_ostringstream&& __rhs) { - basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); - __sb_ = _VSTD::move(__rhs.__sb_); - return *this; - } + basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); + return *this; + } _LIBCPP_INLINE_VISIBILITY void swap(basic_ostringstream& __rhs) { - basic_ostream<char_type, traits_type>::swap(__rhs); - __sb_.swap(__rhs.__sb_); - } + basic_ostream<char_type, traits_type>::swap(__rhs); + __sb_.swap(__rhs.__sb_); + } // 27.8.2.3 Members: _LIBCPP_INLINE_VISIBILITY basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const { - return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); - } + return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); + } _LIBCPP_INLINE_VISIBILITY string_type str() const { - return __sb_.str(); - } + return __sb_.str(); + } _LIBCPP_INLINE_VISIBILITY void str(const string_type& __s) { __sb_.str(__s); @@ -817,31 +817,31 @@ public: basic_stringstream(basic_stringstream&& __rhs) : basic_iostream<_CharT, _Traits>(_VSTD::move(__rhs)) , __sb_(_VSTD::move(__rhs.__sb_)) - { - basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); - } + { + basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_); + } // 27.8.2.2 Assign and swap: basic_stringstream& operator=(basic_stringstream&& __rhs) { - basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); - __sb_ = _VSTD::move(__rhs.__sb_); - return *this; - } + basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs)); + __sb_ = _VSTD::move(__rhs.__sb_); + return *this; + } _LIBCPP_INLINE_VISIBILITY void swap(basic_stringstream& __rhs) { - basic_iostream<char_type, traits_type>::swap(__rhs); - __sb_.swap(__rhs.__sb_); - } + basic_iostream<char_type, traits_type>::swap(__rhs); + __sb_.swap(__rhs.__sb_); + } // 27.8.2.3 Members: _LIBCPP_INLINE_VISIBILITY basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const { - return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); - } + return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_); + } _LIBCPP_INLINE_VISIBILITY string_type str() const { - return __sb_.str(); - } + return __sb_.str(); + } _LIBCPP_INLINE_VISIBILITY void str(const string_type& __s) { __sb_.str(__s); diff --git a/contrib/libs/cxxsupp/libcxx/include/stack b/contrib/libs/cxxsupp/libcxx/include/stack index 436993c6f3..866fbd6b83 100644 --- a/contrib/libs/cxxsupp/libcxx/include/stack +++ b/contrib/libs/cxxsupp/libcxx/include/stack @@ -62,8 +62,8 @@ public: template<class Container> stack(Container) -> stack<typename Container::value_type, Container>; // C++17 - -template<class Container, class Allocator> + +template<class Container, class Allocator> stack(Container, Allocator) -> stack<typename Container::value_type, Container>; // C++17 template <class T, class Container> @@ -120,7 +120,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; @@ -237,12 +237,12 @@ template<class _Container, > stack(_Container) -> stack<typename _Container::value_type, _Container>; - + template<class _Container, class _Alloc, class = enable_if_t<!__is_allocator<_Container>::value>, class = enable_if_t<uses_allocator<_Container, _Alloc>::value> - > + > stack(_Container, _Alloc) -> stack<typename _Container::value_type, _Container>; #endif diff --git a/contrib/libs/cxxsupp/libcxx/include/string b/contrib/libs/cxxsupp/libcxx/include/string index 4f3309fea9..1a951b9d25 100644 --- a/contrib/libs/cxxsupp/libcxx/include/string +++ b/contrib/libs/cxxsupp/libcxx/include/string @@ -880,7 +880,7 @@ public: template<class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value> > _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS basic_string(const _Tp& __t, size_type __pos, size_type __n, - const allocator_type& __a = allocator_type()); + const allocator_type& __a = allocator_type()); template<class _Tp, class = __enable_if_t<__can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value && !__is_same_uncvref<_Tp, basic_string>::value> > @@ -2379,18 +2379,18 @@ template <class _CharT, class _Traits, class _Allocator> basic_string<_CharT, _Traits, _Allocator>& basic_string<_CharT, _Traits, _Allocator>::__assign_external( const value_type* __s, size_type __n) { - size_type __cap = capacity(); + size_type __cap = capacity(); if (__cap >= __n) { - value_type* __p = _VSTD::__to_address(__get_pointer()); - traits_type::move(__p, __s, __n); - traits_type::assign(__p[__n], value_type()); - __set_size(__n); - __invalidate_iterators_past(__n); + value_type* __p = _VSTD::__to_address(__get_pointer()); + traits_type::move(__p, __s, __n); + traits_type::assign(__p[__n], value_type()); + __set_size(__n); + __invalidate_iterators_past(__n); } else { - size_type __sz = size(); - __grow_by_and_replace(__cap, __n - __cap, __sz, 0, __sz, __n, __s); - } - return *this; + size_type __sz = size(); + __grow_by_and_replace(__cap, __n - __cap, __sz, 0, __sz, __n, __s); + } + return *this; } template <class _CharT, class _Traits, class _Allocator> @@ -2495,7 +2495,7 @@ basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, tr } #endif } - __move_assign_alloc(__str); + __move_assign_alloc(__str); __r_.first() = __str.__r_.first(); __str.__set_short_size(0); traits_type::assign(__str.__get_short_pointer()[0], value_type()); @@ -3219,7 +3219,7 @@ basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos, } else { __erase_external_with_move(__pos, __n); } - return *this; + return *this; } template <class _CharT, class _Traits, class _Allocator> @@ -3386,55 +3386,55 @@ basic_string<_CharT, _Traits, _Allocator>::__shrink_or_extend(size_type __target size_type __cap = capacity(); size_type __sz = size(); - pointer __new_data, __p; - bool __was_long, __now_long; + pointer __new_data, __p; + bool __was_long, __now_long; if (__target_capacity == __min_cap - 1) - { - __was_long = true; - __now_long = false; - __new_data = __get_short_pointer(); - __p = __get_long_pointer(); - } - else - { - if (__target_capacity > __cap) - __new_data = __alloc_traits::allocate(__alloc(), __target_capacity+1); + { + __was_long = true; + __now_long = false; + __new_data = __get_short_pointer(); + __p = __get_long_pointer(); + } + else + { + if (__target_capacity > __cap) + __new_data = __alloc_traits::allocate(__alloc(), __target_capacity+1); else { - #ifndef _LIBCPP_NO_EXCEPTIONS - try + #ifndef _LIBCPP_NO_EXCEPTIONS + try { #endif // _LIBCPP_NO_EXCEPTIONS __new_data = __alloc_traits::allocate(__alloc(), __target_capacity+1); - #ifndef _LIBCPP_NO_EXCEPTIONS - } - catch (...) - { - return; + #ifndef _LIBCPP_NO_EXCEPTIONS } - #else // _LIBCPP_NO_EXCEPTIONS - if (__new_data == nullptr) - return; + catch (...) + { + return; + } + #else // _LIBCPP_NO_EXCEPTIONS + if (__new_data == nullptr) + return; #endif // _LIBCPP_NO_EXCEPTIONS } - __now_long = true; - __was_long = __is_long(); - __p = __get_pointer(); - } - traits_type::copy(_VSTD::__to_address(__new_data), - _VSTD::__to_address(__p), size()+1); - if (__was_long) - __alloc_traits::deallocate(__alloc(), __p, __cap+1); - if (__now_long) - { + __now_long = true; + __was_long = __is_long(); + __p = __get_pointer(); + } + traits_type::copy(_VSTD::__to_address(__new_data), + _VSTD::__to_address(__p), size()+1); + if (__was_long) + __alloc_traits::deallocate(__alloc(), __p, __cap+1); + if (__now_long) + { __set_long_cap(__target_capacity+1); - __set_long_size(__sz); - __set_long_pointer(__new_data); + __set_long_size(__sz); + __set_long_pointer(__new_data); } - else - __set_short_size(__sz); - __invalidate_all_iterators(); -} + else + __set_short_size(__sz); + __invalidate_all_iterators(); +} template <class _CharT, class _Traits, class _Allocator> inline @@ -4458,8 +4458,8 @@ _LIBCPP_FUNC_VIS wstring to_wstring(long double __val); template<class _CharT, class _Traits, class _Allocator> _LIBCPP_TEMPLATE_DATA_VIS -const typename basic_string<_CharT, _Traits, _Allocator>::size_type - basic_string<_CharT, _Traits, _Allocator>::npos; +const typename basic_string<_CharT, _Traits, _Allocator>::size_type + basic_string<_CharT, _Traits, _Allocator>::npos; template <class _CharT, class _Allocator> struct _LIBCPP_TEMPLATE_VIS @@ -4507,7 +4507,7 @@ getline(basic_istream<_CharT, _Traits>&& __is, basic_string<_CharT, _Traits, _Allocator>& __str); #if _LIBCPP_STD_VER > 17 -template <class _CharT, class _Traits, class _Allocator, class _Up> +template <class _CharT, class _Traits, class _Allocator, class _Up> inline _LIBCPP_INLINE_VISIBILITY typename basic_string<_CharT, _Traits, _Allocator>::size_type erase(basic_string<_CharT, _Traits, _Allocator>& __str, const _Up& __v) { @@ -4516,7 +4516,7 @@ inline _LIBCPP_INLINE_VISIBILITY return __old_size - __str.size(); } -template <class _CharT, class _Traits, class _Allocator, class _Predicate> +template <class _CharT, class _Traits, class _Allocator, class _Predicate> inline _LIBCPP_INLINE_VISIBILITY typename basic_string<_CharT, _Traits, _Allocator>::size_type erase_if(basic_string<_CharT, _Traits, _Allocator>& __str, diff --git a/contrib/libs/cxxsupp/libcxx/include/tuple b/contrib/libs/cxxsupp/libcxx/include/tuple index 9b127953b3..714d289b84 100644 --- a/contrib/libs/cxxsupp/libcxx/include/tuple +++ b/contrib/libs/cxxsupp/libcxx/include/tuple @@ -308,7 +308,7 @@ public: _And< _IsNotSame<__uncvref_t<_Tp>, __tuple_leaf>, is_constructible<_Hp, _Tp> - >::value + >::value > > _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 @@ -1202,8 +1202,8 @@ template <class _T1, class ..._Args> struct __find_exactly_one_checked { static constexpr bool __matches[sizeof...(_Args)] = {is_same<_T1, _Args>::value...}; static constexpr size_t value = __find_detail::__find_idx(0, __matches); - static_assert(value != __not_found, "type not found in type list" ); - static_assert(value != __ambiguous, "type occurs more than once in type list"); + static_assert(value != __not_found, "type not found in type list" ); + static_assert(value != __ambiguous, "type occurs more than once in type list"); }; template <class _T1> @@ -1489,7 +1489,7 @@ struct __tuple_cat<tuple<_Types...>, __tuple_indices<_I0...>, __tuple_indices<_J { return _VSTD::forward_as_tuple( _VSTD::forward<_Types>(_VSTD::get<_I0>(__t))..., - _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...); + _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...); } template <class _Tuple0, class _Tuple1, class ..._Tuples> @@ -1507,7 +1507,7 @@ struct __tuple_cat<tuple<_Types...>, __tuple_indices<_I0...>, __tuple_indices<_J tuple_size<_T0>::value>::type, typename __make_tuple_indices<tuple_size<_T1>::value>::type>()( _VSTD::forward_as_tuple( - _VSTD::forward<_Types>(_VSTD::get<_I0>(__t))..., + _VSTD::forward<_Types>(_VSTD::get<_I0>(__t))..., _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...), _VSTD::forward<_Tuple1>(__t1), _VSTD::forward<_Tuples>(__tpls)...); } diff --git a/contrib/libs/cxxsupp/libcxx/include/type_traits b/contrib/libs/cxxsupp/libcxx/include/type_traits index 8c91522074..258fdcc667 100644 --- a/contrib/libs/cxxsupp/libcxx/include/type_traits +++ b/contrib/libs/cxxsupp/libcxx/include/type_traits @@ -160,7 +160,7 @@ namespace std template <size_t Len, size_t Align = most_stringent_alignment_requirement> struct aligned_storage; template <size_t Len, class... Types> struct aligned_union; - template <class T> struct remove_cvref; // C++20 + template <class T> struct remove_cvref; // C++20 template <class T> struct decay; template <class... T> struct common_type; @@ -4188,7 +4188,7 @@ struct __can_extract_key __extract_key_fail_tag>::type {}; template <class _Pair, class _Key, class _First, class _Second> -struct __can_extract_key<_Pair, _Key, pair<_First, _Second> > +struct __can_extract_key<_Pair, _Key, pair<_First, _Second> > : conditional<_IsSame<typename remove_const<_First>::type, _Key>::value, __extract_key_first_tag, __extract_key_fail_tag>::type {}; diff --git a/contrib/libs/cxxsupp/libcxx/include/typeinfo b/contrib/libs/cxxsupp/libcxx/include/typeinfo index 80c938646b..e8908cb91d 100644 --- a/contrib/libs/cxxsupp/libcxx/include/typeinfo +++ b/contrib/libs/cxxsupp/libcxx/include/typeinfo @@ -279,7 +279,7 @@ struct __type_info_implementations { static bool __is_type_name_unique(__type_name_t __lhs) _NOEXCEPT { return !(__lhs & __non_unique_rtti_bit::value); } - }; + }; typedef #if _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION == 1 @@ -296,10 +296,10 @@ struct __type_info_implementations { class _LIBCPP_EXCEPTION_ABI type_info { - type_info& operator=(const type_info&); - type_info(const type_info&); + type_info& operator=(const type_info&); + type_info(const type_info&); - protected: + protected: typedef __type_info_implementations::__impl __impl; __impl::__type_name_t __type_name; @@ -354,10 +354,10 @@ public: return "std::bad_cast"; } #else - bad_cast() _NOEXCEPT; - bad_cast(const bad_cast&) _NOEXCEPT = default; - virtual ~bad_cast() _NOEXCEPT; - virtual const char* what() const _NOEXCEPT; + bad_cast() _NOEXCEPT; + bad_cast(const bad_cast&) _NOEXCEPT = default; + virtual ~bad_cast() _NOEXCEPT; + virtual const char* what() const _NOEXCEPT; #endif }; @@ -373,9 +373,9 @@ public: return "std::bad_typeid"; } #else - bad_typeid() _NOEXCEPT; - virtual ~bad_typeid() _NOEXCEPT; - virtual const char* what() const _NOEXCEPT; + bad_typeid() _NOEXCEPT; + virtual ~bad_typeid() _NOEXCEPT; + virtual const char* what() const _NOEXCEPT; #endif }; diff --git a/contrib/libs/cxxsupp/libcxx/include/unordered_map b/contrib/libs/cxxsupp/libcxx/include/unordered_map index 417180a530..8d95bee83d 100644 --- a/contrib/libs/cxxsupp/libcxx/include/unordered_map +++ b/contrib/libs/cxxsupp/libcxx/include/unordered_map @@ -79,12 +79,12 @@ public: unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a) : unordered_map(f, l, n, hasher(), key_equal(), a) {} // C++14 template <class InputIterator> - unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf, + unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf, const allocator_type& a) : unordered_map(f, l, n, hf, key_equal(), a) {} // C++14 unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a) : unordered_map(il, n, hasher(), key_equal(), a) {} // C++14 - unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf, + unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf, const allocator_type& a) : unordered_map(il, n, hf, key_equal(), a) {} // C++14 ~unordered_map(); @@ -290,12 +290,12 @@ public: unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a) : unordered_multimap(f, l, n, hasher(), key_equal(), a) {} // C++14 template <class InputIterator> - unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf, + unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf, const allocator_type& a) : unordered_multimap(f, l, n, hf, key_equal(), a) {} // C++14 unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a) : unordered_multimap(il, n, hasher(), key_equal(), a) {} // C++14 - unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf, + unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf, const allocator_type& a) : unordered_multimap(il, n, hf, key_equal(), a) {} // C++14 ~unordered_multimap(); @@ -937,11 +937,11 @@ public: "Invalid allocator::value_type"); private: - typedef __hash_value_type<key_type, mapped_type> __value_type; + typedef __hash_value_type<key_type, mapped_type> __value_type; typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher; typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal; typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>, - __value_type>::type __allocator_type; + __value_type>::type __allocator_type; typedef __hash_table<__value_type, __hasher, __key_equal, __allocator_type> __table; @@ -1034,14 +1034,14 @@ public: : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) {} template <class _InputIterator> _LIBCPP_INLINE_VISIBILITY - unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, + unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_map(__first, __last, __n, __hf, key_equal(), __a) {} _LIBCPP_INLINE_VISIBILITY unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a) : unordered_map(__il, __n, hasher(), key_equal(), __a) {} _LIBCPP_INLINE_VISIBILITY - unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf, + unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_map(__il, __n, __hf, key_equal(), __a) {} #endif @@ -1871,11 +1871,11 @@ public: "Invalid allocator::value_type"); private: - typedef __hash_value_type<key_type, mapped_type> __value_type; + typedef __hash_value_type<key_type, mapped_type> __value_type; typedef __unordered_map_hasher<key_type, __value_type, hasher, key_equal> __hasher; typedef __unordered_map_equal<key_type, __value_type, key_equal, hasher> __key_equal; typedef typename __rebind_alloc_helper<allocator_traits<allocator_type>, - __value_type>::type __allocator_type; + __value_type>::type __allocator_type; typedef __hash_table<__value_type, __hasher, __key_equal, __allocator_type> __table; @@ -1966,14 +1966,14 @@ public: : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) {} template <class _InputIterator> _LIBCPP_INLINE_VISIBILITY - unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, + unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {} _LIBCPP_INLINE_VISIBILITY unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a) : unordered_multimap(__il, __n, hasher(), key_equal(), __a) {} _LIBCPP_INLINE_VISIBILITY - unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf, + unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_multimap(__il, __n, __hf, key_equal(), __a) {} #endif diff --git a/contrib/libs/cxxsupp/libcxx/include/unordered_set b/contrib/libs/cxxsupp/libcxx/include/unordered_set index 5856e4bc40..25432030bf 100644 --- a/contrib/libs/cxxsupp/libcxx/include/unordered_set +++ b/contrib/libs/cxxsupp/libcxx/include/unordered_set @@ -75,7 +75,7 @@ public: template <class InputIterator> unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14 template <class InputIterator> - unordered_set(InputIterator f, InputIterator l, size_type n, + unordered_set(InputIterator f, InputIterator l, size_type n, const hasher& hf, const allocator_type& a); // C++14 unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14 unordered_set(initializer_list<value_type> il, size_type n, @@ -255,7 +255,7 @@ public: unordered_multiset(InputIterator f, InputIterator l, size_type n, const hasher& hf, const allocator_type& a); // C++14 unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14 - unordered_multiset(initializer_list<value_type> il, size_type n, + unordered_multiset(initializer_list<value_type> il, size_type n, const hasher& hf, const allocator_type& a); // C++14 ~unordered_multiset(); unordered_multiset& operator=(const unordered_multiset&); @@ -481,11 +481,11 @@ public: #if _LIBCPP_STD_VER > 11 template <class _InputIterator> inline _LIBCPP_INLINE_VISIBILITY - unordered_set(_InputIterator __first, _InputIterator __last, + unordered_set(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a) : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) {} template <class _InputIterator> - unordered_set(_InputIterator __first, _InputIterator __last, + unordered_set(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_set(__first, __last, __n, __hf, key_equal(), __a) {} #endif @@ -511,7 +511,7 @@ public: const allocator_type& __a) : unordered_set(__il, __n, hasher(), key_equal(), __a) {} inline _LIBCPP_INLINE_VISIBILITY - unordered_set(initializer_list<value_type> __il, size_type __n, + unordered_set(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a) : unordered_set(__il, __n, __hf, key_equal(), __a) {} #endif @@ -1177,7 +1177,7 @@ public: #if _LIBCPP_STD_VER > 11 template <class _InputIterator> inline _LIBCPP_INLINE_VISIBILITY - unordered_multiset(_InputIterator __first, _InputIterator __last, + unordered_multiset(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a) : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) {} template <class _InputIterator> diff --git a/contrib/libs/cxxsupp/libcxx/include/use_ansi.h b/contrib/libs/cxxsupp/libcxx/include/use_ansi.h index 2b6f36d4ef..5e58ddbf7a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/use_ansi.h +++ b/contrib/libs/cxxsupp/libcxx/include/use_ansi.h @@ -1,3 +1,3 @@ -// Empty header to prevent MSVC one from inclusion. -// This MSVC header adds Microsoft STL to the linker arguments +// Empty header to prevent MSVC one from inclusion. +// This MSVC header adds Microsoft STL to the linker arguments // which causes conflicts with libc++.
\ No newline at end of file diff --git a/contrib/libs/cxxsupp/libcxx/include/variant b/contrib/libs/cxxsupp/libcxx/include/variant index 972c18a811..fb3ca8c220 100644 --- a/contrib/libs/cxxsupp/libcxx/include/variant +++ b/contrib/libs/cxxsupp/libcxx/include/variant @@ -814,7 +814,7 @@ class _LIBCPP_TEMPLATE_VIS __dtor; #define _LIBCPP_VARIANT_DESTRUCTOR(destructible_trait, destructor, destroy) \ template <class... _Types> \ class _LIBCPP_TEMPLATE_VIS __dtor<__traits<_Types...>, \ - destructible_trait> \ + destructible_trait> \ : public __base<destructible_trait, _Types...> { \ using __base_type = __base<destructible_trait, _Types...>; \ using __index_t = typename __base_type::__index_t; \ @@ -902,8 +902,8 @@ class _LIBCPP_TEMPLATE_VIS __move_constructor; #define _LIBCPP_VARIANT_MOVE_CONSTRUCTOR(move_constructible_trait, \ move_constructor) \ template <class... _Types> \ - class _LIBCPP_TEMPLATE_VIS __move_constructor<__traits<_Types...>, \ - move_constructible_trait> \ + class _LIBCPP_TEMPLATE_VIS __move_constructor<__traits<_Types...>, \ + move_constructible_trait> \ : public __ctor<__traits<_Types...>> { \ using __base_type = __ctor<__traits<_Types...>>; \ \ @@ -1247,7 +1247,7 @@ struct __make_overloads_imp<__tuple_indices<_Idx...>, _Types... > { using _Apply _LIBCPP_NODEBUG = __all_overloads<__overload<_Types, _Idx>...>; }; -template <class ..._Types> +template <class ..._Types> using _MakeOverloads _LIBCPP_NODEBUG = typename __make_overloads_imp< __make_indices_imp<_Sizeof<_Types...>::value, 0>, _Types...>::_Apply; diff --git a/contrib/libs/cxxsupp/libcxx/include/vector b/contrib/libs/cxxsupp/libcxx/include/vector index c02253c751..3aa03b949d 100644 --- a/contrib/libs/cxxsupp/libcxx/include/vector +++ b/contrib/libs/cxxsupp/libcxx/include/vector @@ -496,8 +496,8 @@ public: typedef typename __base::pointer iterator; typedef typename __base::const_pointer const_iterator; #else - typedef __wrap_iter<pointer> iterator; - typedef __wrap_iter<const_pointer> const_iterator; + typedef __wrap_iter<pointer> iterator; + typedef __wrap_iter<const_pointer> const_iterator; #endif typedef _VSTD::reverse_iterator<iterator> reverse_iterator; typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator; @@ -921,7 +921,7 @@ private: struct _ConstructTransaction { explicit _ConstructTransaction(vector &__v, size_type __n) - : __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) { + : __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) { #ifndef _LIBCPP_HAS_NO_ASAN __v_.__annotate_increase(__n); #endif @@ -938,7 +938,7 @@ private: vector &__v_; pointer __pos_; const_pointer const __new_end_; - + private: _ConstructTransaction(_ConstructTransaction const&) = delete; _ConstructTransaction& operator=(_ConstructTransaction const&) = delete; @@ -1085,7 +1085,7 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x) _ConstructTransaction __tx(*this, __n); const_pointer __new_end = __tx.__new_end_; for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) { - __alloc_traits::construct(this->__alloc(), _VSTD::__to_address(__pos), __x); + __alloc_traits::construct(this->__alloc(), _VSTD::__to_address(__pos), __x); } } diff --git a/contrib/libs/cxxsupp/libcxx/include/wctype.h b/contrib/libs/cxxsupp/libcxx/include/wctype.h index e6f813b8b1..43a79f203d 100644 --- a/contrib/libs/cxxsupp/libcxx/include/wctype.h +++ b/contrib/libs/cxxsupp/libcxx/include/wctype.h @@ -68,7 +68,7 @@ wctrans_t wctrans(const char* property); // of these declarations (e.g. <wchar.h>), the second `using ::wint_t` with using_if_exists // will fail because it does not refer to the same declaration. #if __has_include_next(<wctype.h>) -# include_next <wctype.h> +# include_next <wctype.h> # define _LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H #endif #endif diff --git a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp index 9ae1fb5199..db7fb0dabe 100644 --- a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp @@ -51,11 +51,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) extern "C" int __ulock_wait(uint32_t operation, void *addr, uint64_t value, - uint32_t timeout); /* timeout is specified in microseconds */ + uint32_t timeout); /* timeout is specified in microseconds */ extern "C" int __ulock_wake(uint32_t operation, void *addr, uint64_t wake_value); -#define UL_COMPARE_AND_WAIT 1 -#define ULF_WAKE_ALL 0x00000100 +#define UL_COMPARE_AND_WAIT 1 +#define ULF_WAKE_ALL 0x00000100 static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) diff --git a/contrib/libs/cxxsupp/libcxx/src/chrono.cpp b/contrib/libs/cxxsupp/libcxx/src/chrono.cpp index b18e4f7cb9..80fbadbab3 100644 --- a/contrib/libs/cxxsupp/libcxx/src/chrono.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/chrono.cpp @@ -244,9 +244,9 @@ static steady_clock::time_point __libcpp_steady_clock_now() { static LARGE_INTEGER __QueryPerformanceFrequency() { - LARGE_INTEGER val; - (void) QueryPerformanceFrequency(&val); - return val; + LARGE_INTEGER val; + (void) QueryPerformanceFrequency(&val); + return val; } static steady_clock::time_point __libcpp_steady_clock_now() { diff --git a/contrib/libs/cxxsupp/libcxx/src/debug.cpp b/contrib/libs/cxxsupp/libcxx/src/debug.cpp index dd5963fcce..307030eb77 100644 --- a/contrib/libs/cxxsupp/libcxx/src/debug.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/debug.cpp @@ -200,7 +200,7 @@ __libcpp_db::__insert_c(void* __c, __libcpp_db::_InsertConstruct *__fn) __c_node* p = __cbeg_[hc]; void *buf = malloc(sizeof(__c_node)); if (buf == nullptr) - __throw_bad_alloc(); + __throw_bad_alloc(); __cbeg_[hc] = __fn(buf, __c, p); ++__csz_; diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/directory_iterator.cpp b/contrib/libs/cxxsupp/libcxx/src/filesystem/directory_iterator.cpp index a098dd163b..8ae51419dd 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/directory_iterator.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/directory_iterator.cpp @@ -153,16 +153,16 @@ public: bool assign() { if (!wcscmp(__data_.cFileName, L".") || !wcscmp(__data_.cFileName, L"..")) return false; - // FIXME: Cache more of this - //directory_entry::__cached_data cdata; - //cdata.__type_ = get_file_type(__data_); - //cdata.__size_ = get_file_size(__data_); - //cdata.__write_time_ = get_write_time(__data_); - __entry_.__assign_iter_entry( - __root_ / __data_.cFileName, + // FIXME: Cache more of this + //directory_entry::__cached_data cdata; + //cdata.__type_ = get_file_type(__data_); + //cdata.__size_ = get_file_size(__data_); + //cdata.__write_time_ = get_write_time(__data_); + __entry_.__assign_iter_entry( + __root_ / __data_.cFileName, directory_entry::__create_iter_result(detail::get_file_type(__data_))); - return true; - } + return true; + } private: error_code close() noexcept { diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h index a5f5749783..4068f285c7 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h @@ -19,11 +19,11 @@ #include "filesystem" #if !defined(_LIBCPP_WIN32API) -# include <unistd.h> -# include <sys/stat.h> -# include <sys/statvfs.h> -# include <sys/time.h> // for ::utimes as used in __last_write_time -# include <fcntl.h> /* values for fchmodat */ +# include <unistd.h> +# include <sys/stat.h> +# include <sys/statvfs.h> +# include <sys/time.h> // for ::utimes as used in __last_write_time +# include <fcntl.h> /* values for fchmodat */ #endif #include "../include/apple_availability.h" diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp index 63593be223..ee1e7c55e3 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp @@ -24,18 +24,18 @@ # define NOMINMAX # include <windows.h> #else -# include <unistd.h> -# include <sys/stat.h> -# include <sys/statvfs.h> +# include <unistd.h> +# include <sys/stat.h> +# include <sys/statvfs.h> #endif #include <time.h> #include <fcntl.h> /* values for fchmodat */ #if __has_include(<sys/sendfile.h>) -# include <sys/sendfile.h> +# include <sys/sendfile.h> # define _LIBCPP_FILESYSTEM_USE_SENDFILE #elif defined(__APPLE__) || __has_include(<copyfile.h>) -# include <copyfile.h> +# include <copyfile.h> # define _LIBCPP_FILESYSTEM_USE_COPYFILE #else # include "fstream" @@ -43,11 +43,11 @@ #endif #if !defined(CLOCK_REALTIME) && !defined(_LIBCPP_WIN32API) -# include <sys/time.h> // for gettimeofday and timeval +# include <sys/time.h> // for gettimeofday and timeval #endif #if defined(__ELF__) && defined(_LIBCPP_LINK_RT_LIB) -# pragma comment(lib, "rt") +# pragma comment(lib, "rt") #endif _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM diff --git a/contrib/libs/cxxsupp/libcxx/src/include/refstring.h b/contrib/libs/cxxsupp/libcxx/src/include/refstring.h index 3edd240a5d..f2ce0b6508 100644 --- a/contrib/libs/cxxsupp/libcxx/src/include/refstring.h +++ b/contrib/libs/cxxsupp/libcxx/src/include/refstring.h @@ -34,8 +34,8 @@ #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) || \ defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) # define _LIBCPP_CHECK_FOR_GCC_EMPTY_STRING_STORAGE -# include <dlfcn.h> -# include <mach-o/dyld.h> +# include <dlfcn.h> +# include <mach-o/dyld.h> #endif _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/contrib/libs/cxxsupp/libcxx/src/ios.cpp b/contrib/libs/cxxsupp/libcxx/src/ios.cpp index a8a99015a9..fd2cefc61e 100644 --- a/contrib/libs/cxxsupp/libcxx/src/ios.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/ios.cpp @@ -145,11 +145,11 @@ int ios_base::__xindex_ = 0; template <typename _Tp> static size_t __ios_new_cap(size_t __req_size, size_t __current_cap) { // Precondition: __req_size > __current_cap - const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp); - if (__req_size < mx/2) - return _VSTD::max(2 * __current_cap, __req_size); - else - return mx; + const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp); + if (__req_size < mx/2) + return _VSTD::max(2 * __current_cap, __req_size); + else + return mx; } int diff --git a/contrib/libs/cxxsupp/libcxx/src/iostream.cpp b/contrib/libs/cxxsupp/libcxx/src/iostream.cpp index 5c1f5ed9ee..05f2efe54c 100644 --- a/contrib/libs/cxxsupp/libcxx/src/iostream.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/iostream.cpp @@ -156,8 +156,8 @@ static void force_locale_initialization() { class DoIOSInit { public: - DoIOSInit(); - ~DoIOSInit(); + DoIOSInit(); + ~DoIOSInit(); }; DoIOSInit::DoIOSInit() diff --git a/contrib/libs/cxxsupp/libcxx/src/locale.cpp b/contrib/libs/cxxsupp/libcxx/src/locale.cpp index 42b5641b43..a989b5e716 100644 --- a/contrib/libs/cxxsupp/libcxx/src/locale.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/locale.cpp @@ -4761,7 +4761,7 @@ __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end, { // if the grouping pattern is empty _or_ there are no grouping bits, then do nothing // we always have at least a single entry in [__g, __g_end); the end of the input sequence - if (__grouping.size() != 0 && __g_end - __g > 1) + if (__grouping.size() != 0 && __g_end - __g > 1) { reverse(__g, __g_end); const char* __ig = __grouping.data(); diff --git a/contrib/libs/cxxsupp/libcxx/src/mutex.cpp b/contrib/libs/cxxsupp/libcxx/src/mutex.cpp index 124d59bc64..2701f5b33f 100644 --- a/contrib/libs/cxxsupp/libcxx/src/mutex.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/mutex.cpp @@ -204,10 +204,10 @@ _LIBCPP_SAFE_STATIC static __libcpp_condvar_t cv = _LIBCPP_CONDVAR_INITIALIZER; #ifdef _LIBCPP_ABI_MICROSOFT void __call_once(volatile std::atomic<once_flag::_State_type>& flag, void* arg, - void (*func)(void*)) + void (*func)(void*)) #else void __call_once(volatile once_flag::_State_type& flag, void* arg, - void (*func)(void*)) + void (*func)(void*)) #endif { #if defined(_LIBCPP_HAS_NO_THREADS) diff --git a/contrib/libs/cxxsupp/libcxx/src/new.cpp b/contrib/libs/cxxsupp/libcxx/src/new.cpp index 85afe3039e..2cc06b9e9a 100644 --- a/contrib/libs/cxxsupp/libcxx/src/new.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/new.cpp @@ -12,15 +12,15 @@ #if defined(_LIBCPP_ABI_MICROSOFT) # if !defined(_LIBCPP_ABI_VCRUNTIME) -# include "support/runtime/new_handler_fallback.ipp" -# endif +# include "support/runtime/new_handler_fallback.ipp" +# endif #elif defined(LIBCXX_BUILDING_LIBCXXABI) -# include <cxxabi.h> +# include <cxxabi.h> #elif defined(LIBCXX_BUILDING_LIBCXXRT) -# include <cxxabi.h> -# include "support/runtime/new_handler_fallback.ipp" +# include <cxxabi.h> +# include "support/runtime/new_handler_fallback.ipp" #elif defined(__GLIBCXX__) - // nothing to do + // nothing to do #else # include "support/runtime/new_handler_fallback.ipp" #endif @@ -129,7 +129,7 @@ _LIBCPP_WEAK void operator delete(void* ptr) noexcept { - ::free(ptr); + ::free(ptr); } _LIBCPP_WEAK diff --git a/contrib/libs/cxxsupp/libcxx/src/optional.cpp b/contrib/libs/cxxsupp/libcxx/src/optional.cpp index 39405bec12..81660f9f4b 100644 --- a/contrib/libs/cxxsupp/libcxx/src/optional.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/optional.cpp @@ -31,9 +31,9 @@ class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optiona : public std::logic_error { public: - bad_optional_access() : std::logic_error("Bad optional Access") {} + bad_optional_access() : std::logic_error("Bad optional Access") {} -// Get the key function ~bad_optional_access() into the dylib +// Get the key function ~bad_optional_access() into the dylib virtual ~bad_optional_access() noexcept; }; diff --git a/contrib/libs/cxxsupp/libcxx/src/stdexcept.cpp b/contrib/libs/cxxsupp/libcxx/src/stdexcept.cpp index f8f335f34a..71f3c98886 100644 --- a/contrib/libs/cxxsupp/libcxx/src/stdexcept.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/stdexcept.cpp @@ -11,7 +11,7 @@ #include "string" #include "system_error" - + #ifdef _LIBCPP_ABI_VCRUNTIME #include "support/runtime/stdexcept_vcruntime.ipp" #else diff --git a/contrib/libs/cxxsupp/libcxx/src/string.cpp b/contrib/libs/cxxsupp/libcxx/src/string.cpp index c8dae34272..083b828df4 100644 --- a/contrib/libs/cxxsupp/libcxx/src/string.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/string.cpp @@ -193,7 +193,7 @@ as_integer( const string& func, const wstring& s, size_t* idx, int base ) // as_float -template<typename V, typename S, typename F> +template<typename V, typename S, typename F> inline V as_float_helper(const string& func, const S& str, size_t* idx, F f ) diff --git a/contrib/libs/cxxsupp/libcxx/src/support/solaris/xlocale.cpp b/contrib/libs/cxxsupp/libcxx/src/support/solaris/xlocale.cpp index d25adcd21d..e570201954 100644 --- a/contrib/libs/cxxsupp/libcxx/src/support/solaris/xlocale.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/support/solaris/xlocale.cpp @@ -25,7 +25,7 @@ int iswxdigit_l(wint_t __c, locale_t __l) { // FIXME: This disregards the locale, which is Very Wrong #define vsnprintf_l(__s, __n, __l, __format, __va) \ - vsnprintf(__s, __n, __format, __va) + vsnprintf(__s, __n, __format, __va) int snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) { diff --git a/contrib/libs/cxxsupp/libcxx/src/support/win32/support.cpp b/contrib/libs/cxxsupp/libcxx/src/support/win32/support.cpp index 11702a788b..5c2f19fd84 100644 --- a/contrib/libs/cxxsupp/libcxx/src/support/win32/support.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/support/win32/support.cpp @@ -42,13 +42,13 @@ int __libcpp_vasprintf( char **sptr, const char *__restrict format, va_list ap ) return count; } -// Returns >= 0: the number of wide characters found in the -// multi byte sequence src (of src_size_bytes), that fit in the buffer dst +// Returns >= 0: the number of wide characters found in the +// multi byte sequence src (of src_size_bytes), that fit in the buffer dst // (of max_dest_chars elements size). The count returned excludes the -// null terminator. When dst is NULL, no characters are copied +// null terminator. When dst is NULL, no characters are copied // and no "out" parameters are updated. // Returns (size_t) -1: an incomplete sequence encountered. -// Leaves *src pointing the next character to convert or NULL +// Leaves *src pointing the next character to convert or NULL // if a null character was converted from *src. size_t mbsnrtowcs( wchar_t *__restrict dst, const char **__restrict src, size_t src_size_bytes, size_t max_dest_chars, mbstate_t *__restrict ps ) @@ -105,7 +105,7 @@ size_t mbsnrtowcs( wchar_t *__restrict dst, const char **__restrict src, // Returns >= 0: the number of bytes in the sequence // converted from *src, excluding the null terminator. // Returns size_t(-1) if an error occurs, also sets errno. -// If dst is NULL dst_size_bytes is ignored and no bytes are copied to dst +// If dst is NULL dst_size_bytes is ignored and no bytes are copied to dst // and no "out" parameters are updated. size_t wcsnrtombs( char *__restrict dst, const wchar_t **__restrict src, size_t max_source_chars, size_t dst_size_bytes, mbstate_t *__restrict ps ) @@ -134,7 +134,7 @@ size_t wcsnrtombs( char *__restrict dst, const wchar_t **__restrict src, result = wcrtomb_s( &char_size, dst + dest_converted, dest_remaining, c, ps); else result = wcrtomb_s( &char_size, NULL, 0, c, ps); - // If result is zero there is no error and char_size contains the + // If result is zero there is no error and char_size contains the // size of the multi-byte-sequence converted. // Otherwise result indicates an errno type error. if ( result == no_error ) { diff --git a/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp b/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp index baace5643c..9da74c9e3b 100644 --- a/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp @@ -49,7 +49,7 @@ size_t std::type_info::hash_code() const noexcept { #if (!defined(LIBCXX_BUILDING_LIBCXXABI) && \ !defined(LIBCXX_BUILDING_LIBCXXRT) && \ !defined(__GLIBCXX__) && \ - !defined(_LIBCPP_ABI_VCRUNTIME)) || \ + !defined(_LIBCPP_ABI_VCRUNTIME)) || \ defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) std::type_info::~type_info() { diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make index 15403fe6d5..961b31241d 100644 --- a/contrib/libs/cxxsupp/libcxx/ya.make +++ b/contrib/libs/cxxsupp/libcxx/ya.make @@ -56,16 +56,16 @@ ELSEIF (OS_IOS) contrib/libs/cxxsupp/builtins ) ELSEIF (CLANG OR MUSL OR OS_DARWIN OR USE_LTO) - IF (ARCH_ARM7) - # XXX: libcxxrt support for ARM is currently broken - DEFAULT(CXX_RT "glibcxx_static") + IF (ARCH_ARM7) + # XXX: libcxxrt support for ARM is currently broken + DEFAULT(CXX_RT "glibcxx_static") # ARM7 OS_SDK has old libstdc++ without aligned allocation support CFLAGS( GLOBAL -fno-aligned-new ) - ELSE() - DEFAULT(CXX_RT "libcxxrt") - ENDIF() + ELSE() + DEFAULT(CXX_RT "libcxxrt") + ENDIF() IF (MUSL) PEERDIR( contrib/libs/musl/include @@ -118,8 +118,8 @@ ENDIF() DEFAULT(CXX_RT "default") -DISABLE(NEED_GLIBCXX_CXX17_SHIMS) - +DISABLE(NEED_GLIBCXX_CXX17_SHIMS) + IF (CXX_RT == "libcxxrt") PEERDIR( contrib/libs/cxxsupp/libcxxabi-parts @@ -132,9 +132,9 @@ IF (CXX_RT == "libcxxrt") CFLAGS( GLOBAL -DLIBCXX_BUILDING_LIBCXXRT ) - # These builtins are equivalent to clang -rtlib=compiler_rt and - # are needed by potentially any code generated by clang. - # With glibcxx runtime, builtins are provided by libgcc + # These builtins are equivalent to clang -rtlib=compiler_rt and + # are needed by potentially any code generated by clang. + # With glibcxx runtime, builtins are provided by libgcc ELSEIF (CXX_RT == "glibcxx" OR CXX_RT == "glibcxx_static") LDFLAGS( -Wl,-Bstatic @@ -142,9 +142,9 @@ ELSEIF (CXX_RT == "glibcxx" OR CXX_RT == "glibcxx_static") -lgcc -lgcc_eh -Wl,-Bdynamic - ) + ) CXXFLAGS(-D__GLIBCXX__=1) - ENABLE(NEED_GLIBCXX_CXX17_SHIMS) + ENABLE(NEED_GLIBCXX_CXX17_SHIMS) CFLAGS( GLOBAL -DLIBCXX_BUILDING_LIBGCC ) @@ -157,7 +157,7 @@ ELSEIF (CXX_RT == "glibcxx_dynamic") CFLAGS( GLOBAL -DLIBCXX_BUILDING_LIBGCC ) - ENABLE(NEED_GLIBCXX_CXX17_SHIMS) + ENABLE(NEED_GLIBCXX_CXX17_SHIMS) ELSEIF (CXX_RT == "glibcxx_driver") CXXFLAGS(-D__GLIBCXX__=1) ELSEIF (CXX_RT == "default") @@ -166,17 +166,17 @@ ELSE() MESSAGE(FATAL_ERROR "Unexpected CXX_RT value: ${CXX_RT}") ENDIF() -IF (NEED_GLIBCXX_CXX17_SHIMS) - IF (GCC) - # Assume GCC is bundled with a modern enough version of C++ runtime +IF (NEED_GLIBCXX_CXX17_SHIMS) + IF (GCC) + # Assume GCC is bundled with a modern enough version of C++ runtime ELSEIF (OS_SDK == "ubuntu-12" OR OS_SDK == "ubuntu-14" OR OS_SDK == "ubuntu-16") - # Prior to ubuntu-18, system C++ runtime for C++17 is incomplete + # Prior to ubuntu-18, system C++ runtime for C++17 is incomplete SRCS( glibcxx_eh_cxx17.cpp ) - ENDIF() -ENDIF() - + ENDIF() +ENDIF() + NO_UTIL() NO_RUNTIME() |