diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index ba4ede8a9f..9fb68f3d5a 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -136,7 +136,7 @@ Any::Any(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Any::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Any& from_msg) : type_url_(arena, from.type_url_), value_(arena, from.value_), _cached_size_{0}, @@ -150,7 +150,7 @@ Any::Any( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.Any) } diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 0176c73f1d..afa000a549 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -296,7 +296,8 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Any& from_msg); ::google::protobuf::internal::ArenaStringPtr type_url_; ::google::protobuf::internal::ArenaStringPtr value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index dfe778b7d3..976f09bbca 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -249,7 +249,7 @@ Api::Api(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Api::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Api& from_msg) : _has_bits_{from._has_bits_}, _cached_size_{0}, methods_{visibility, arena, from.methods_}, @@ -266,7 +266,7 @@ Api::Api( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::uint32_t cached_has_bits = _impl_._has_bits_[0]; _impl_.source_context_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::SourceContext>( arena, *from._impl_.source_context_) @@ -649,7 +649,7 @@ Method::Method(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Method::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Method& from_msg) : options_{visibility, arena, from.options_}, name_(arena, from.name_), request_type_url_(arena, from.request_type_url_), @@ -664,7 +664,7 @@ Method::Method( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::memcpy(reinterpret_cast(&_impl_) + offsetof(Impl_, request_streaming_), reinterpret_cast(&from._impl_) + @@ -1020,7 +1020,7 @@ Mixin::Mixin(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Mixin::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Mixin& from_msg) : name_(arena, from.name_), root_(arena, from.root_), _cached_size_{0} {} @@ -1033,7 +1033,7 @@ Mixin::Mixin( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.Mixin) } diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 7e55dea31d..47d6a3cfa5 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -256,7 +256,8 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Mixin& from_msg); ::google::protobuf::internal::ArenaStringPtr name_; ::google::protobuf::internal::ArenaStringPtr root_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -518,7 +519,8 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Method& from_msg); ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; ::google::protobuf::internal::ArenaStringPtr name_; ::google::protobuf::internal::ArenaStringPtr request_type_url_; @@ -798,7 +800,8 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Api& from_msg); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method > methods_; diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index c25f473b25..35e0b3be00 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -236,7 +236,8 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Duration& from_msg); ::int64_t seconds_; ::int32_t nanos_; mutable ::google::protobuf::internal::CachedSize _cached_size_; diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index b1c231ec30..5327dfef80 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -197,7 +197,8 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Empty& from_msg); PROTOBUF_TSAN_DECLARE_MEMBER }; friend struct ::TableStruct_google_2fprotobuf_2fempty_2eproto; diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 39840ba0c0..7c6ee30b52 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -112,7 +112,7 @@ FieldMask::FieldMask(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE FieldMask::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::FieldMask& from_msg) : paths_{visibility, arena, from.paths_}, _cached_size_{0} {} @@ -124,7 +124,7 @@ FieldMask::FieldMask( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldMask) } diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 25b3828a4d..ae92a36b06 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -243,7 +243,8 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const FieldMask& from_msg); ::google::protobuf::RepeatedPtrField paths_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 8a5b799484..0b7eead6a6 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -114,7 +114,7 @@ SourceContext::SourceContext(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE SourceContext::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::SourceContext& from_msg) : file_name_(arena, from.file_name_), _cached_size_{0} {} @@ -126,7 +126,7 @@ SourceContext::SourceContext( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceContext) } diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 3621b1e4fd..3ab2b46c45 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -231,7 +231,8 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const SourceContext& from_msg); ::google::protobuf::internal::ArenaStringPtr file_name_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 4286dc5434..aa7929b11f 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -245,7 +245,7 @@ Struct::Struct(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Struct::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Struct& from_msg) : fields_{visibility, arena, from.fields_}, _cached_size_{0} {} @@ -257,7 +257,7 @@ Struct::Struct( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.Struct) } @@ -488,7 +488,7 @@ Value::Value(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Value::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Value& from_msg) : kind_{}, _cached_size_{0}, _oneof_case_{from._oneof_case_[0]} {} @@ -501,7 +501,7 @@ Value::Value( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); switch (kind_case()) { case KIND_NOT_SET: break; @@ -886,7 +886,7 @@ ListValue::ListValue(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE ListValue::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::ListValue& from_msg) : values_{visibility, arena, from.values_}, _cached_size_{0} {} @@ -898,7 +898,7 @@ ListValue::ListValue( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.ListValue) } diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index ad1b79f8c1..173cb66e9d 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -277,7 +277,8 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const ListValue& from_msg); ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value > values_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -452,7 +453,8 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Struct& from_msg); ::google::protobuf::internal::MapField @@ -751,7 +753,8 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Value& from_msg); union KindUnion { constexpr KindUnion() : _constinit_{} {} ::google::protobuf::internal::ConstantInitialized _constinit_; diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 71a474843a..d23ccccf4a 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -236,7 +236,8 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Timestamp& from_msg); ::int64_t seconds_; ::int32_t nanos_; mutable ::google::protobuf::internal::CachedSize _cached_size_; diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index dfb47487d7..259acbc9c2 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -429,7 +429,7 @@ Type::Type(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Type::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Type& from_msg) : _has_bits_{from._has_bits_}, _cached_size_{0}, fields_{visibility, arena, from.fields_}, @@ -446,7 +446,7 @@ Type::Type( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::uint32_t cached_has_bits = _impl_._has_bits_[0]; _impl_.source_context_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::SourceContext>( arena, *from._impl_.source_context_) @@ -822,7 +822,7 @@ Field::Field(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Field::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Field& from_msg) : options_{visibility, arena, from.options_}, name_(arena, from.name_), type_url_(arena, from.type_url_), @@ -838,7 +838,7 @@ Field::Field( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::memcpy(reinterpret_cast(&_impl_) + offsetof(Impl_, kind_), reinterpret_cast(&from._impl_) + @@ -1280,7 +1280,7 @@ Enum::Enum(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Enum::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Enum& from_msg) : _has_bits_{from._has_bits_}, _cached_size_{0}, enumvalue_{visibility, arena, from.enumvalue_}, @@ -1296,7 +1296,7 @@ Enum::Enum( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::uint32_t cached_has_bits = _impl_._has_bits_[0]; _impl_.source_context_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::SourceContext>( arena, *from._impl_.source_context_) @@ -1648,7 +1648,7 @@ EnumValue::EnumValue(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE EnumValue::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::EnumValue& from_msg) : options_{visibility, arena, from.options_}, name_(arena, from.name_), _cached_size_{0} {} @@ -1661,7 +1661,7 @@ EnumValue::EnumValue( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); _impl_.number_ = from._impl_.number_; // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValue) @@ -1909,7 +1909,7 @@ Option::Option(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE Option::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::Option& from_msg) : _has_bits_{from._has_bits_}, _cached_size_{0}, name_(arena, from.name_) {} @@ -1922,7 +1922,7 @@ Option::Option( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); ::uint32_t cached_has_bits = _impl_._has_bits_[0]; _impl_.value_ = (cached_has_bits & 0x00000001u) ? ::google::protobuf::Message::CopyConstruct<::google::protobuf::Any>( arena, *from._impl_.value_) diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 802f93859f..e334e1e77b 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -381,7 +381,8 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Option& from_msg); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::internal::ArenaStringPtr name_; @@ -740,7 +741,8 @@ class PROTOBUF_EXPORT Field final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Field& from_msg); ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; ::google::protobuf::internal::ArenaStringPtr name_; ::google::protobuf::internal::ArenaStringPtr type_url_; @@ -954,7 +956,8 @@ class PROTOBUF_EXPORT EnumValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const EnumValue& from_msg); ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; ::google::protobuf::internal::ArenaStringPtr name_; ::int32_t number_; @@ -1241,7 +1244,8 @@ class PROTOBUF_EXPORT Type final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Type& from_msg); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field > fields_; @@ -1504,7 +1508,8 @@ class PROTOBUF_EXPORT Enum final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Enum& from_msg); ::google::protobuf::internal::HasBits<1> _has_bits_; mutable ::google::protobuf::internal::CachedSize _cached_size_; ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue > enumvalue_; diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index 4bfd901c6d..a25c04e8d9 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1628,7 +1628,7 @@ StringValue::StringValue(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE StringValue::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::StringValue& from_msg) : value_(arena, from.value_), _cached_size_{0} {} @@ -1640,7 +1640,7 @@ StringValue::StringValue( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.StringValue) } @@ -1825,7 +1825,7 @@ BytesValue::BytesValue(::google::protobuf::Arena* arena) } inline PROTOBUF_NDEBUG_INLINE BytesValue::Impl_::Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena, - const Impl_& from) + const Impl_& from, const ::google::protobuf::BytesValue& from_msg) : value_(arena, from.value_), _cached_size_{0} {} @@ -1837,7 +1837,7 @@ BytesValue::BytesValue( (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); - new (&_impl_) Impl_(internal_visibility(), arena, from._impl_); + new (&_impl_) Impl_(internal_visibility(), arena, from._impl_, from); // @@protoc_insertion_point(copy_constructor:google.protobuf.BytesValue) } diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 245839cacd..fbedab258c 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -249,7 +249,8 @@ class PROTOBUF_EXPORT UInt64Value final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const UInt64Value& from_msg); ::uint64_t value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -419,7 +420,8 @@ class PROTOBUF_EXPORT UInt32Value final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const UInt32Value& from_msg); ::uint32_t value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -595,7 +597,8 @@ class PROTOBUF_EXPORT StringValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const StringValue& from_msg); ::google::protobuf::internal::ArenaStringPtr value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -765,7 +768,8 @@ class PROTOBUF_EXPORT Int64Value final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Int64Value& from_msg); ::int64_t value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -935,7 +939,8 @@ class PROTOBUF_EXPORT Int32Value final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const Int32Value& from_msg); ::int32_t value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -1105,7 +1110,8 @@ class PROTOBUF_EXPORT FloatValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const FloatValue& from_msg); float value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -1275,7 +1281,8 @@ class PROTOBUF_EXPORT DoubleValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const DoubleValue& from_msg); double value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -1451,7 +1458,8 @@ class PROTOBUF_EXPORT BytesValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const BytesValue& from_msg); ::google::protobuf::internal::ArenaStringPtr value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER @@ -1621,7 +1629,8 @@ class PROTOBUF_EXPORT BoolValue final : public ::google::protobuf::Message inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena); inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility, - ::google::protobuf::Arena* arena, const Impl_& from); + ::google::protobuf::Arena* arena, const Impl_& from, + const BoolValue& from_msg); bool value_; mutable ::google::protobuf::internal::CachedSize _cached_size_; PROTOBUF_TSAN_DECLARE_MEMBER