diff options
author | mikhnenko <mikhnenko@yandex-team.com> | 2023-09-20 00:17:28 +0300 |
---|---|---|
committer | mikhnenko <mikhnenko@yandex-team.com> | 2023-09-20 00:37:19 +0300 |
commit | 38d353cb704b884242efe1e8f0d34d2420de4488 (patch) | |
tree | 03f4e032f028b493a384b8c9b75f160f81ce6a77 /contrib/libs/cxxsupp/libcxx/src | |
parent | 9fe06a35ce2c80f49c89bebe61b09ab4f4213ecf (diff) | |
download | ydb-38d353cb704b884242efe1e8f0d34d2420de4488.tar.gz |
Put libc++ under ym2
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/src')
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/atomic.cpp | 6 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h | 12 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/ios.cpp | 10 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/iostream.cpp | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/iostream_init.h | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/locale.cpp | 9 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/memory.cpp | 2 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/new.cpp | 6 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/optional.cpp | 4 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/random.cpp | 2 |
14 files changed, 33 insertions, 34 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp index 250d33e98b0..5968aafb537 100644 --- a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp @@ -52,11 +52,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_system_time_init.h b/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h index 3c5a0c33a56..b1bdc691b38 100644 --- a/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h +++ b/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h @@ -1,2 +1,2 @@ #pragma GCC system_header -GetSystemTimeInit GetSystemTimeAsFileTimeFunc _LIBCPP_INIT_PRIORITY_MAX;
\ No newline at end of file +GetSystemTimeInit GetSystemTimeAsFileTimeFunc _LIBCPP_INIT_PRIORITY_MAX; diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h index dffce1895cd..f6ba686b417 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h @@ -83,14 +83,14 @@ format_string_impl(const char* msg, va_list ap) { if (static_cast<size_t>(ret) < buf.size()) { result.assign(buf.data(), static_cast<size_t>(ret)); } else { - // we did not provide a long enough buffer on our first attempt. The - // return value is the number of bytes (excluding the null byte) that are - // needed for formatting. + // we did not provide a long enough buffer on our first attempt. The + // return value is the number of bytes (excluding the null byte) that are + // needed for formatting. size_t size_with_null = static_cast<size_t>(ret) + 1; - result.__resize_default_init(size_with_null - 1); + result.__resize_default_init(size_with_null - 1); ret = ::vsnprintf(&result[0], size_with_null, msg, ap); - _LIBCPP_ASSERT(static_cast<size_t>(ret) == (size_with_null - 1), "TODO"); -} + _LIBCPP_ASSERT(static_cast<size_t>(ret) == (size_with_null - 1), "TODO"); + } return result; } diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp index e19d042f878..9e0abc83b10 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp @@ -999,7 +999,7 @@ void __copy_symlink(const path& existing_symlink, const path& new_symlink, __create_directory_symlink(real_path, new_symlink, ec); else #endif - __create_symlink(real_path, new_symlink, ec); + __create_symlink(real_path, new_symlink, ec); } bool __create_directories(const path& p, error_code* ec) { @@ -1070,7 +1070,7 @@ bool __create_directory(path const& p, path const& attributes, error_code* ec) { return err.report(capture_errno()); mec = capture_errno(); - error_code ignored_ec; + error_code ignored_ec; st = status(p, ignored_ec); if (!is_directory(st)) return err.report(mec); diff --git a/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h b/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h index 96e8fb7957f..762763f9b92 100644 --- a/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h +++ b/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h @@ -47,8 +47,6 @@ #include "include/ryu/ryu.h" -#include "include/ryu/ryu.h" - _LIBCPP_BEGIN_NAMESPACE_STD #if defined(_M_X64) && defined(_MSC_VER) diff --git a/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h b/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h index aa2be6d0880..cb44bd3fef0 100644 --- a/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h +++ b/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h @@ -58,7 +58,7 @@ #include "include/ryu/d2fixed.h" #if defined(_MSC_VER) -#include <intrin.h> // for _umul128() and __shiftright128() +#include <intrin.h> // for _umul128(), __shiftright128(), _BitScanForward{,64} #endif // defined(_MSC_VER) #if defined(_WIN64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__aarch64__) diff --git a/contrib/libs/cxxsupp/libcxx/src/ios.cpp b/contrib/libs/cxxsupp/libcxx/src/ios.cpp index 218b27f1a6b..870406b554d 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 5a95eb7aefe..79dbd9a52b7 100644 --- a/contrib/libs/cxxsupp/libcxx/src/iostream.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/iostream.cpp @@ -149,8 +149,8 @@ static void force_locale_initialization() { class DoIOSInit { public: - DoIOSInit(); - ~DoIOSInit(); + DoIOSInit(); + ~DoIOSInit(); }; DoIOSInit::DoIOSInit() diff --git a/contrib/libs/cxxsupp/libcxx/src/iostream_init.h b/contrib/libs/cxxsupp/libcxx/src/iostream_init.h index b0a60f42a67..7d1bb5c2d7d 100644 --- a/contrib/libs/cxxsupp/libcxx/src/iostream_init.h +++ b/contrib/libs/cxxsupp/libcxx/src/iostream_init.h @@ -1,2 +1,2 @@ #pragma GCC system_header -_LIBCPP_HIDDEN ios_base::Init __start_std_streams _LIBCPP_INIT_PRIORITY_MAX;
\ No newline at end of file +_LIBCPP_HIDDEN ios_base::Init __start_std_streams _LIBCPP_INIT_PRIORITY_MAX; diff --git a/contrib/libs/cxxsupp/libcxx/src/locale.cpp b/contrib/libs/cxxsupp/libcxx/src/locale.cpp index 3f1bbd0730e..fc95dad6006 100644 --- a/contrib/libs/cxxsupp/libcxx/src/locale.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/locale.cpp @@ -34,12 +34,13 @@ #endif #if defined(_LIBCPP_MSVCRT) -# define _CTYPE_DISABLE_MACROS +# define _CTYPE_DISABLE_MACROS #endif + #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__) -# include "__support/win32/locale_win32.h" +# include "__support/win32/locale_win32.h" #elif !defined(__BIONIC__) && !defined(__NuttX__) -# include <langinfo.h> +# include <langinfo.h> #endif #include "atomic" @@ -4804,7 +4805,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/memory.cpp b/contrib/libs/cxxsupp/libcxx/src/memory.cpp index c836533949c..e4933881bf5 100644 --- a/contrib/libs/cxxsupp/libcxx/src/memory.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/memory.cpp @@ -12,7 +12,7 @@ # include <mutex> # include <thread> # if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB) -# pragma comment(lib, "pthread") +# pragma comment(lib, "pthread") # endif #endif diff --git a/contrib/libs/cxxsupp/libcxx/src/new.cpp b/contrib/libs/cxxsupp/libcxx/src/new.cpp index 136084809de..937e8603373 100644 --- a/contrib/libs/cxxsupp/libcxx/src/new.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/new.cpp @@ -137,7 +137,7 @@ _LIBCPP_WEAK void operator delete(void* ptr) noexcept { - ::free(ptr); + ::free(ptr); } _LIBCPP_WEAK @@ -258,8 +258,8 @@ _LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t) noexcept { - std::__libcpp_aligned_free(ptr); - } + std::__libcpp_aligned_free(ptr); +} _LIBCPP_WEAK void diff --git a/contrib/libs/cxxsupp/libcxx/src/optional.cpp b/contrib/libs/cxxsupp/libcxx/src/optional.cpp index ac1a0a5b5e8..e9573bfa30d 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/random.cpp b/contrib/libs/cxxsupp/libcxx/src/random.cpp index 17aaeedfebe..466b0157722 100644 --- a/contrib/libs/cxxsupp/libcxx/src/random.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/random.cpp @@ -213,7 +213,7 @@ random_device::entropy() const noexcept #elif defined(__OpenBSD__) || defined(_LIBCPP_USING_FUCHSIA_CPRNG) return std::numeric_limits<result_type>::digits; #else - return 0; + return 0; #endif } |