From a30d71d873f8f91dca230c204a6757c7a4cbaed7 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 21 Sep 2023 20:43:38 +0000 Subject: [PATCH] Auto-generate files after cl/567400017 --- src/google/protobuf/any.pb.h | 12 +++-- src/google/protobuf/api.pb.h | 36 +++++++------ src/google/protobuf/duration.pb.h | 8 +-- src/google/protobuf/empty.pb.h | 8 +-- src/google/protobuf/field_mask.pb.h | 8 +-- src/google/protobuf/source_context.pb.h | 10 ++-- src/google/protobuf/struct.pb.h | 68 ++++++++++++++----------- src/google/protobuf/timestamp.pb.h | 8 +-- src/google/protobuf/type.pb.h | 56 +++++++++++--------- src/google/protobuf/wrappers.pb.h | 68 ++++++++++++++----------- 10 files changed, 161 insertions(+), 121 deletions(-) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 9c7abf86e8..0edecd5d8d 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -247,7 +248,7 @@ class PROTOBUF_EXPORT Any final : void set_type_url(Arg_&& arg, Args_... args); std::string* mutable_type_url(); PROTOBUF_NODISCARD std::string* release_type_url(); - void set_allocated_type_url(std::string* ptr); + void set_allocated_type_url(std::string* value); private: const std::string& _internal_type_url() const; @@ -263,7 +264,7 @@ class PROTOBUF_EXPORT Any final : void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); PROTOBUF_NODISCARD std::string* release_value(); - void set_allocated_value(std::string* ptr); + void set_allocated_value(std::string* value); private: const std::string& _internal_value() const; @@ -283,9 +284,10 @@ class PROTOBUF_EXPORT Any final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 5e10355a03..15129bb498 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -220,7 +221,7 @@ class PROTOBUF_EXPORT Mixin final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -236,7 +237,7 @@ class PROTOBUF_EXPORT Mixin final : void set_root(Arg_&& arg, Args_... args); std::string* mutable_root(); PROTOBUF_NODISCARD std::string* release_root(); - void set_allocated_root(std::string* ptr); + void set_allocated_root(std::string* value); private: const std::string& _internal_root() const; @@ -256,9 +257,10 @@ class PROTOBUF_EXPORT Mixin final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -441,7 +443,7 @@ class PROTOBUF_EXPORT Method final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -457,7 +459,7 @@ class PROTOBUF_EXPORT Method final : void set_request_type_url(Arg_&& arg, Args_... args); std::string* mutable_request_type_url(); PROTOBUF_NODISCARD std::string* release_request_type_url(); - void set_allocated_request_type_url(std::string* ptr); + void set_allocated_request_type_url(std::string* value); private: const std::string& _internal_request_type_url() const; @@ -473,7 +475,7 @@ class PROTOBUF_EXPORT Method final : void set_response_type_url(Arg_&& arg, Args_... args); std::string* mutable_response_type_url(); PROTOBUF_NODISCARD std::string* release_response_type_url(); - void set_allocated_response_type_url(std::string* ptr); + void set_allocated_response_type_url(std::string* value); private: const std::string& _internal_response_type_url() const; @@ -523,9 +525,10 @@ class PROTOBUF_EXPORT Method final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -749,7 +752,7 @@ class PROTOBUF_EXPORT Api final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -765,7 +768,7 @@ class PROTOBUF_EXPORT Api final : void set_version(Arg_&& arg, Args_... args); std::string* mutable_version(); PROTOBUF_NODISCARD std::string* release_version(); - void set_allocated_version(std::string* ptr); + void set_allocated_version(std::string* value); private: const std::string& _internal_version() const; @@ -810,9 +813,10 @@ class PROTOBUF_EXPORT Api final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index cd02368eaf..bd6592a4ba 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -236,9 +237,10 @@ class PROTOBUF_EXPORT Duration final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 4b0eefd261..e295e09d2a 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -190,9 +191,10 @@ class PROTOBUF_EXPORT Empty final : friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 23046e876d..279cb6f6b3 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -243,9 +244,10 @@ class PROTOBUF_EXPORT FieldMask final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 9a749cff71..2f692ece70 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -211,7 +212,7 @@ class PROTOBUF_EXPORT SourceContext final : void set_file_name(Arg_&& arg, Args_... args); std::string* mutable_file_name(); PROTOBUF_NODISCARD std::string* release_file_name(); - void set_allocated_file_name(std::string* ptr); + void set_allocated_file_name(std::string* value); private: const std::string& _internal_file_name() const; @@ -231,9 +232,10 @@ class PROTOBUF_EXPORT SourceContext final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 8714351338..2ab5a18657 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -278,9 +279,10 @@ class PROTOBUF_EXPORT ListValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -458,9 +460,10 @@ class PROTOBUF_EXPORT Struct final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -480,22 +483,26 @@ class PROTOBUF_EXPORT Struct final : friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto; };// ------------------------------------------------------------------- -class Struct_FieldsEntry_DoNotUse final : public ::google::protobuf::internal::MapEntry { -public: - typedef ::google::protobuf::internal::MapEntry SuperType; +class Struct_FieldsEntry_DoNotUse final + : public ::google::protobuf::internal::MapEntry< + Struct_FieldsEntry_DoNotUse, std::string, ::google::protobuf::Value, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> { + public: + using SuperType = ::google::protobuf::internal::MapEntry< + Struct_FieldsEntry_DoNotUse, std::string, ::google::protobuf::Value, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>; Struct_FieldsEntry_DoNotUse(); template explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse( ::google::protobuf::internal::ConstantInitialized); explicit Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena); void MergeFrom(const Struct_FieldsEntry_DoNotUse& other); - static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_Struct_FieldsEntry_DoNotUse_default_instance_); } + static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { + return reinterpret_cast( + &_Struct_FieldsEntry_DoNotUse_default_instance_); + } static bool ValidateKey(std::string* s) { return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key"); } @@ -685,7 +692,7 @@ class PROTOBUF_EXPORT Value final : void set_string_value(Arg_&& arg, Args_... args); std::string* mutable_string_value(); PROTOBUF_NODISCARD std::string* release_string_value(); - void set_allocated_string_value(std::string* ptr); + void set_allocated_string_value(std::string* value); private: const std::string& _internal_string_value() const; @@ -765,9 +772,10 @@ class PROTOBUF_EXPORT Value final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1061,7 +1069,7 @@ inline ::google::protobuf::Struct* Value::release_struct_value() { // @@protoc_insertion_point(field_release:google.protobuf.Value.struct_value) if (kind_case() == kStructValue) { clear_has_kind(); - ::google::protobuf::Struct* temp = _impl_.kind_.struct_value_; + auto* temp = _impl_.kind_.struct_value_; if (GetArenaForAllocation() != nullptr) { temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } @@ -1082,21 +1090,21 @@ inline ::google::protobuf::Struct* Value::unsafe_arena_release_struct_value() { // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.struct_value) if (kind_case() == kStructValue) { clear_has_kind(); - ::google::protobuf::Struct* temp = _impl_.kind_.struct_value_; + auto* temp = _impl_.kind_.struct_value_; _impl_.kind_.struct_value_ = nullptr; return temp; } else { return nullptr; } } -inline void Value::unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* struct_value) { +inline void Value::unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* value) { // We rely on the oneof clear method to free the earlier contents // of this oneof. We can directly use the pointer we're given to // set the new value. clear_kind(); - if (struct_value) { + if (value) { set_has_struct_value(); - _impl_.kind_.struct_value_ = struct_value; + _impl_.kind_.struct_value_ = value; } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.struct_value) } @@ -1138,7 +1146,7 @@ inline ::google::protobuf::ListValue* Value::release_list_value() { // @@protoc_insertion_point(field_release:google.protobuf.Value.list_value) if (kind_case() == kListValue) { clear_has_kind(); - ::google::protobuf::ListValue* temp = _impl_.kind_.list_value_; + auto* temp = _impl_.kind_.list_value_; if (GetArenaForAllocation() != nullptr) { temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } @@ -1159,21 +1167,21 @@ inline ::google::protobuf::ListValue* Value::unsafe_arena_release_list_value() { // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.list_value) if (kind_case() == kListValue) { clear_has_kind(); - ::google::protobuf::ListValue* temp = _impl_.kind_.list_value_; + auto* temp = _impl_.kind_.list_value_; _impl_.kind_.list_value_ = nullptr; return temp; } else { return nullptr; } } -inline void Value::unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* list_value) { +inline void Value::unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* value) { // We rely on the oneof clear method to free the earlier contents // of this oneof. We can directly use the pointer we're given to // set the new value. clear_kind(); - if (list_value) { + if (value) { set_has_list_value(); - _impl_.kind_.list_value_ = list_value; + _impl_.kind_.list_value_ = value; } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.list_value) } diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 48a1f46825..a32b8bf393 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -236,9 +237,10 @@ class PROTOBUF_EXPORT Timestamp final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 360144b2ae..4f01bb3276 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -346,7 +347,7 @@ class PROTOBUF_EXPORT Option final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -381,9 +382,10 @@ class PROTOBUF_EXPORT Option final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -629,7 +631,7 @@ class PROTOBUF_EXPORT Field final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -645,7 +647,7 @@ class PROTOBUF_EXPORT Field final : void set_type_url(Arg_&& arg, Args_... args); std::string* mutable_type_url(); PROTOBUF_NODISCARD std::string* release_type_url(); - void set_allocated_type_url(std::string* ptr); + void set_allocated_type_url(std::string* value); private: const std::string& _internal_type_url() const; @@ -661,7 +663,7 @@ class PROTOBUF_EXPORT Field final : void set_json_name(Arg_&& arg, Args_... args); std::string* mutable_json_name(); PROTOBUF_NODISCARD std::string* release_json_name(); - void set_allocated_json_name(std::string* ptr); + void set_allocated_json_name(std::string* value); private: const std::string& _internal_json_name() const; @@ -677,7 +679,7 @@ class PROTOBUF_EXPORT Field final : void set_default_value(Arg_&& arg, Args_... args); std::string* mutable_default_value(); PROTOBUF_NODISCARD std::string* release_default_value(); - void set_allocated_default_value(std::string* ptr); + void set_allocated_default_value(std::string* value); private: const std::string& _internal_default_value() const; @@ -747,9 +749,10 @@ class PROTOBUF_EXPORT Field final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -936,7 +939,7 @@ class PROTOBUF_EXPORT EnumValue final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -966,9 +969,10 @@ class PROTOBUF_EXPORT EnumValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1198,7 +1202,7 @@ class PROTOBUF_EXPORT Type final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -1214,7 +1218,7 @@ class PROTOBUF_EXPORT Type final : void set_edition(Arg_&& arg, Args_... args); std::string* mutable_edition(); PROTOBUF_NODISCARD std::string* release_edition(); - void set_allocated_edition(std::string* ptr); + void set_allocated_edition(std::string* value); private: const std::string& _internal_edition() const; @@ -1259,9 +1263,10 @@ class PROTOBUF_EXPORT Type final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1467,7 +1472,7 @@ class PROTOBUF_EXPORT Enum final : void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* ptr); + void set_allocated_name(std::string* value); private: const std::string& _internal_name() const; @@ -1483,7 +1488,7 @@ class PROTOBUF_EXPORT Enum final : void set_edition(Arg_&& arg, Args_... args); std::string* mutable_edition(); PROTOBUF_NODISCARD std::string* release_edition(); - void set_allocated_edition(std::string* ptr); + void set_allocated_edition(std::string* value); private: const std::string& _internal_edition() const; @@ -1528,9 +1533,10 @@ class PROTOBUF_EXPORT Enum final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index c2c8af1fd5..4af566741e 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "google/protobuf/port_def.inc" #if PROTOBUF_VERSION < 4024000 @@ -249,9 +250,10 @@ class PROTOBUF_EXPORT UInt64Value final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -423,9 +425,10 @@ class PROTOBUF_EXPORT UInt32Value final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -583,7 +586,7 @@ class PROTOBUF_EXPORT StringValue final : void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); PROTOBUF_NODISCARD std::string* release_value(); - void set_allocated_value(std::string* ptr); + void set_allocated_value(std::string* value); private: const std::string& _internal_value() const; @@ -603,9 +606,10 @@ class PROTOBUF_EXPORT StringValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -777,9 +781,10 @@ class PROTOBUF_EXPORT Int64Value final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -951,9 +956,10 @@ class PROTOBUF_EXPORT Int32Value final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1125,9 +1131,10 @@ class PROTOBUF_EXPORT FloatValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1299,9 +1306,10 @@ class PROTOBUF_EXPORT DoubleValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1459,7 +1467,7 @@ class PROTOBUF_EXPORT BytesValue final : void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); PROTOBUF_NODISCARD std::string* release_value(); - void set_allocated_value(std::string* ptr); + void set_allocated_value(std::string* value); private: const std::string& _internal_value() const; @@ -1479,9 +1487,10 @@ class PROTOBUF_EXPORT BytesValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_( @@ -1653,9 +1662,10 @@ class PROTOBUF_EXPORT BoolValue final : _table_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; - template friend class ::google::protobuf::Arena::InternalHelper; - typedef void InternalArenaConstructable_; - typedef void DestructorSkippable_; + template + friend class ::google::protobuf::Arena::InternalHelper; + using InternalArenaConstructable_ = void; + using DestructorSkippable_ = void; struct PROTOBUF_EXPORT Impl_ { inline explicit constexpr Impl_(