Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor cleanup of codegen: remove parens when cast is not begin applied.

Browse Source 
PiperOrigin-RevId: 712549572
pull/19872/head
Protobuf Team Bot 2 months ago committed by Copybara-Service
parent 1c0b664b90
commit 584e47e7fb
3 changed files with 52 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/google/protobuf/compiler/cpp/field_generators/message_field.cc
  2. 4
      src/google/protobuf/compiler/plugin.pb.h
  3. 92
      src/google/protobuf/descriptor.pb.h

7
src/google/protobuf/compiler/cpp/field_generators/message_field.cc
Unescape View File

@ -57,9 +57,10 @@ std::vector<Sub> Vars(const FieldDescriptor* field, const Options& opts,
? default_ptr
: absl::Substitute("reinterpret_cast<const $0*>($1)",
base, default_ptr)},
{"base_cast", !is_foreign && !weak
? ""
: absl::Substitute("reinterpret_cast<$0*>", base)},
Sub{"base_cast", !is_foreign && !weak
? ""
: absl::Substitute("reinterpret_cast<$0*>", base)}
.ConditionalFunctionCall(),
Sub{"weak_cast",
!weak ? "" : absl::Substitute("reinterpret_cast<$0*>", base)}
.ConditionalFunctionCall(),

4
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -1647,11 +1647,11 @@ inline void CodeGeneratorRequest::set_allocated_compiler_version(::google::proto
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.compiler_version_);
delete _impl_.compiler_version_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}

92
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -12782,11 +12782,11 @@ inline void FileDescriptorProto::set_allocated_options(::google::protobuf::FileO
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -12878,11 +12878,11 @@ inline void FileDescriptorProto::set_allocated_source_code_info(::google::protob
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.source_code_info_);
delete _impl_.source_code_info_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -13132,11 +13132,11 @@ inline void DescriptorProto_ExtensionRange::set_allocated_options(::google::prot
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -13655,11 +13655,11 @@ inline void DescriptorProto::set_allocated_options(::google::protobuf::MessageOp
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -14191,11 +14191,11 @@ inline void ExtensionRangeOptions::set_allocated_features(::google::protobuf::Fe
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -14779,11 +14779,11 @@ inline void FieldDescriptorProto::set_allocated_options(::google::protobuf::Fiel
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -14976,11 +14976,11 @@ inline void OneofDescriptorProto::set_allocated_options(::google::protobuf::Oneo
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -15254,11 +15254,11 @@ inline void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumO
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -15563,11 +15563,11 @@ inline void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -15781,11 +15781,11 @@ inline void ServiceDescriptorProto::set_allocated_options(::google::protobuf::Se
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -16088,11 +16088,11 @@ inline void MethodDescriptorProto::set_allocated_options(::google::protobuf::Met
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.options_);
delete _impl_.options_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -17187,11 +17187,11 @@ inline void FileOptions::set_allocated_features(::google::protobuf::FeatureSet*
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -17476,11 +17476,11 @@ inline void MessageOptions::set_allocated_features(::google::protobuf::FeatureSe
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -18238,11 +18238,11 @@ inline void FieldOptions::set_allocated_features(::google::protobuf::FeatureSet*
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -18334,11 +18334,11 @@ inline void FieldOptions::set_allocated_feature_support(::google::protobuf::Fiel
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.feature_support_);
delete _impl_.feature_support_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -18483,11 +18483,11 @@ inline void OneofOptions::set_allocated_features(::google::protobuf::FeatureSet*
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -18716,11 +18716,11 @@ inline void EnumOptions::set_allocated_features(::google::protobuf::FeatureSet*
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -18893,11 +18893,11 @@ inline void EnumValueOptions::set_allocated_features(::google::protobuf::Feature
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -19017,11 +19017,11 @@ inline void EnumValueOptions::set_allocated_feature_support(::google::protobuf::
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.feature_support_);
delete _impl_.feature_support_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -19166,11 +19166,11 @@ inline void ServiceOptions::set_allocated_features(::google::protobuf::FeatureSe
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -19400,11 +19400,11 @@ inline void MethodOptions::set_allocated_features(::google::protobuf::FeatureSet
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.features_);
delete _impl_.features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -20201,11 +20201,11 @@ inline void FeatureSetDefaults_FeatureSetEditionDefault::set_allocated_overridab
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.overridable_features_);
delete _impl_.overridable_features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -20297,11 +20297,11 @@ inline void FeatureSetDefaults_FeatureSetEditionDefault::set_allocated_fixed_fea
::google::protobuf::Arena* message_arena = GetArena();
::google::protobuf::internal::TSanWrite(&_impl_);
if (message_arena == nullptr) {
delete (_impl_.fixed_features_);
delete _impl_.fixed_features_;
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = (value)->GetArena();
::google::protobuf::Arena* submessage_arena = value->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}

Write Preview
Loading…
Cancel
Save