From f8a4a6880ec6453c5a9427a240169e917eacd3a3 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Mon, 20 May 2024 20:54:19 -0700 Subject: [PATCH] Fix whitespace merge issue in gencode --- src/google/protobuf/descriptor.pb.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index f38f118a2d..fd2c1f24e4 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -10447,11 +10447,13 @@ PROTOBUF_NOINLINE void EnumValueOptions::Clear() { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.features_); } + // optional .google.protobuf.FieldOptions.FeatureSupport feature_support = 4; if (cached_has_bits & 0x00000002u) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.feature_support_); } + // optional bool deprecated = 1 [default = false]; if (cached_has_bits & 0x00000004u) { total_size += 2;