diff options
| author | nechda <nechda@yandex-team.com> | 2024-08-29 23:50:27 +0300 |
|---|---|---|
| committer | nechda <nechda@yandex-team.com> | 2024-08-30 00:05:25 +0300 |
| commit | e10d6638f07a82edae3ea8197b9f5c0affcc07ea (patch) | |
| tree | 571c38cec05813766a1ad290c9d51ce7ace52919 /contrib/restricted/abseil-cpp-tstring/y_absl/strings | |
| parent | e79b38f2bbbf78d295d1901d2a79f898022d5224 (diff) | |
| download | ydb-e10d6638f07a82edae3ea8197b9f5c0affcc07ea.tar.gz | |
Update cpp-protobuf to 22.5
Привет!\
Этот PR переключат cpp & python библиотеки protobuf на версию 22.5
Если у вас возникли проблемы после влития этого PR:
1. Если начали падать канон тесты, то проведите их переканонизацию
2. Прочитайте <https://wiki.yandex-team.ru/users/nechda/obnovlenie-cpp-protobuf-22.5/> страничку с основными изменениями
3. Если страничка в вики не помогла, то пишите в [DEVTOOLSSUPPORT](https://st.yandex-team.ru/DEVTOOLSSUPPORT)
7fecade616c20a841b9e9af7b7998bdfc8d2807d
Diffstat (limited to 'contrib/restricted/abseil-cpp-tstring/y_absl/strings')
4 files changed, 13 insertions, 2 deletions
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc index 320a01edd4..200c2bc2fc 100644 --- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc +++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc @@ -307,9 +307,14 @@ CordzInfo::CordzInfo(CordRep* rep, const CordzInfo* src, MethodIdentifier method, int64_t sampling_stride) : rep_(rep), stack_depth_( +#ifdef Y_ABSL_DONT_USE_DEBUG_LIBRARY + 0 +#else static_cast<size_t>(y_absl::GetStackTrace(stack_, /*max_depth=*/kMaxStackDepth, - /*skip_count=*/1))), + /*skip_count=*/1)) +#endif + ), parent_stack_depth_(FillParentStack(src, parent_stack_)), method_(method), parent_method_(GetParentMethod(src)), diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/bind.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/bind.h index 39058de487..efc0d8f3a2 100644 --- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/bind.h +++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/bind.h @@ -172,8 +172,10 @@ class FormatSpecTemplate template <FormatConversionCharSet... C> FormatSpecTemplate(const ExtendedParsedFormat<C...>& pc) // NOLINT : Base(&pc) { +#ifndef __NVCC__ CheckArity<sizeof...(C), sizeof...(Args)>(); CheckMatches<C...>(y_absl::make_index_sequence<sizeof...(C)>{}); +#endif } }; diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/checker.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/checker.h index 2aafe0016a..61d52d4d5d 100644 --- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/checker.h +++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_format/checker.h @@ -30,7 +30,7 @@ // more details. #if Y_ABSL_HAVE_ATTRIBUTE(enable_if) && !defined(__native_client__) && \ !defined(__INTELLISENSE__) -#define Y_ABSL_INTERNAL_ENABLE_FORMAT_CHECKER 1 +//#define Y_ABSL_INTERNAL_ENABLE_FORMAT_CHECKER 1 #endif // Y_ABSL_HAVE_ATTRIBUTE(enable_if) && !defined(__native_client__) && // !defined(__INTELLISENSE__) #endif // Y_ABSL_INTERNAL_ENABLE_FORMAT_CHECKER diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make index 26ff4370a6..74d25c05f5 100644 --- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make +++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ya.make @@ -21,6 +21,10 @@ NO_COMPILER_WARNINGS() SRCDIR(contrib/restricted/abseil-cpp-tstring/y_absl) +IF(Y_ABSL_DONT_USE_DEBUG) + CFLAGS(-DY_ABSL_DONT_USE_DEBUG_LIBRARY=1) +ENDIF() + SRCS( crc/crc32c.cc crc/internal/cpu_detect.cc |