Auto-generate files after cl/718025165

pull/20058/head
Protobuf Team Bot 1 month ago
parent 8e6b7276ed
commit 27bc619eb6
  1. 2
      src/google/protobuf/api.pb.h
  2. 4
      src/google/protobuf/struct.pb.cc
  3. 6
      src/google/protobuf/type.pb.h

@ -1197,7 +1197,7 @@ inline void Api::set_allocated_source_context(::google::protobuf::SourceContext*
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}

@ -1038,7 +1038,7 @@ void Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::p
if (oneof_needs_init) {
_this->_impl_.kind_.struct_value_ = ::google::protobuf::Message::CopyConstruct(arena, *from._impl_.kind_.struct_value_);
} else {
_this->_impl_.kind_.struct_value_->MergeFrom(from._internal_struct_value());
_this->_impl_.kind_.struct_value_->MergeFrom(*from._impl_.kind_.struct_value_);
}
break;
}
@ -1046,7 +1046,7 @@ void Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::p
if (oneof_needs_init) {
_this->_impl_.kind_.list_value_ = ::google::protobuf::Message::CopyConstruct(arena, *from._impl_.kind_.list_value_);
} else {
_this->_impl_.kind_.list_value_->MergeFrom(from._internal_list_value());
_this->_impl_.kind_.list_value_->MergeFrom(*from._impl_.kind_.list_value_);
}
break;
}

@ -1964,7 +1964,7 @@ inline void Type::set_allocated_source_context(::google::protobuf::SourceContext
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -2749,7 +2749,7 @@ inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}
@ -3143,7 +3143,7 @@ inline void Option::set_allocated_value(::google::protobuf::Any* PROTOBUF_NULLAB
}
if (value != nullptr) {
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::Message*>(value)->GetArena();
if (message_arena != submessage_arena) {
value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
}

Loading…
Cancel
Save