diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-02-19 14:12:31 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.ru> | 2022-02-19 14:12:31 +0300 |
| commit | 52a1ac58104ca032e718abb079dedc9600e85e34 (patch) | |
| tree | a8aab7be7dbcd5238c302bdab77d0b11b6cc7f5f | |
| parent | 7d7953cb46099a2517822b5832d49351eeecbde1 (diff) | |
| download | ydb-52a1ac58104ca032e718abb079dedc9600e85e34.tar.gz | |
protoc: restore enum inheritance from int
ref:2f2cb47fee757f0cf03f965cbc74b94b10258032
3 files changed, 5 insertions, 5 deletions
diff --git a/build/prebuilt/contrib/tools/protoc/ya.make.resource b/build/prebuilt/contrib/tools/protoc/ya.make.resource index dea93b0d306..3cf81d0aefd 100644 --- a/build/prebuilt/contrib/tools/protoc/ya.make.resource +++ b/build/prebuilt/contrib/tools/protoc/ya.make.resource @@ -1,9 +1,9 @@ IF (OS_DARWIN AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318808466) + SET(SANDBOX_RESOURCE_ID 2805494445) ELSEIF (OS_LINUX AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318809046) + SET(SANDBOX_RESOURCE_ID 2805494892) ELSEIF (OS_WINDOWS AND ARCH_X86_64) - SET(SANDBOX_RESOURCE_ID 2318807898) + SET(SANDBOX_RESOURCE_ID 2805493979) ELSE() SET(SANDBOX_RESOURCE_ID) ENDIF() diff --git a/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_enum.cc b/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_enum.cc index e0c80fc1c62..0d3da321581 100644 --- a/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_enum.cc +++ b/contrib/libs/protoc/src/google/protobuf/compiler/cpp/cpp_enum.cc @@ -95,7 +95,7 @@ EnumGenerator::~EnumGenerator() {} void EnumGenerator::GenerateDefinition(io::Printer* printer) { Formatter format(printer, variables_); - format("enum ${1$$classname$$}$ {\n", descriptor_); + format("enum ${1$$classname$$}$ : int {\n", descriptor_); format.Indent(); const EnumValueDescriptor* min_value = descriptor_->value(0); diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.h index 27fd851338d..d57061f638c 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_checkpoints.h @@ -15,7 +15,7 @@ #include <type_traits> namespace NYql::NDqProto { -enum ECheckpointingMode; +enum ECheckpointingMode : int; } // namespace NYql::NDqProto namespace NYql::NDq { |