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/tools | |
| 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/tools')
| -rw-r--r-- | contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp | 4 | ||||
| -rw-r--r-- | contrib/tools/protoc/ya.make.induced_deps | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp index a307cf6074..c6a633a811 100644 --- a/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp +++ b/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp @@ -4,8 +4,6 @@ #include <google/protobuf/descriptor.pb.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> -#include <google/protobuf/stubs/common.h> -#include <google/protobuf/stubs/strutil.h> #include "cpp_styleguide.h" #include <util/stream/output.h> @@ -494,7 +492,7 @@ namespace NPlugins { vars["extendee" ] = ClassName(Descriptor_->containing_type(), true); vars["type_traits" ] = type_traits_; vars["name" ] = Descriptor_->name(); - vars["field_type" ] = SimpleItoa(static_cast<int>(Descriptor_->type())); + vars["field_type" ] = std::to_string(static_cast<int>(Descriptor_->type())); vars["packed" ] = Descriptor_->options().packed() ? "true" : "false"; printer->Print(vars, diff --git a/contrib/tools/protoc/ya.make.induced_deps b/contrib/tools/protoc/ya.make.induced_deps index 3d70a8bf3f..bc73a807a2 100644 --- a/contrib/tools/protoc/ya.make.induced_deps +++ b/contrib/tools/protoc/ya.make.induced_deps @@ -3,9 +3,6 @@ INDUCED_DEPS(cpp ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/generated_message_reflection.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/io/coded_stream.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/reflection_ops.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/common.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/once.h - ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/stubs/port.h ${ARCADIA_ROOT}/contrib/libs/protobuf/src/google/protobuf/wire_format.h ) INDUCED_DEPS(h+cpp |