From 874e291c007150ec4be93a69726e288bb9dc818d Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 2 May 2023 01:19:17 +0000 Subject: [PATCH] Auto-generate files after cl/528628217 --- src/google/protobuf/any.pb.h | 12 -- src/google/protobuf/api.pb.cc | 3 +- src/google/protobuf/api.pb.h | 97 ++++------- src/google/protobuf/source_context.pb.h | 6 - src/google/protobuf/struct.pb.cc | 6 +- src/google/protobuf/struct.pb.h | 24 ++- src/google/protobuf/type.pb.cc | 12 +- src/google/protobuf/type.pb.h | 221 +++++++++--------------- src/google/protobuf/wrappers.pb.cc | 21 +-- src/google/protobuf/wrappers.pb.h | 12 -- 10 files changed, 138 insertions(+), 276 deletions(-) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 7cfd9a3db0..8cc711f626 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -233,10 +233,6 @@ class PROTOBUF_EXPORT Any final : // string type_url = 1; void clear_type_url() ; const std::string& type_url() const; - - - - template void set_type_url(Arg_&& arg, Args_... args); std::string* mutable_type_url(); @@ -253,10 +249,6 @@ class PROTOBUF_EXPORT Any final : // bytes value = 2; void clear_value() ; const std::string& value() const; - - - - template void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); @@ -328,8 +320,6 @@ inline const std::string& Any::_internal_type_url() const { } inline void Any::_internal_set_type_url(const std::string& value) { ; - - _impl_.type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Any::_internal_mutable_type_url() { @@ -375,8 +365,6 @@ inline const std::string& Any::_internal_value() const { } inline void Any::_internal_set_value(const std::string& value) { ; - - _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* Any::_internal_mutable_value() { diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index a9198e8252..2ede77c011 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -245,8 +245,7 @@ class Api::_Internal { } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& -Api::_Internal::source_context(const Api* msg) { +const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::_Internal::source_context(const Api* msg) { return *msg->_impl_.source_context_; } void Api::clear_options() { diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 491dfa0b52..4a6a46142e 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -269,10 +269,6 @@ class PROTOBUF_EXPORT Api final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -289,10 +285,6 @@ class PROTOBUF_EXPORT Api final : // string version = 4; void clear_version() ; const std::string& version() const; - - - - template void set_version(Arg_&& arg, Args_... args); std::string* mutable_version(); @@ -312,14 +304,15 @@ class PROTOBUF_EXPORT Api final : const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const; PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context(); ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context(); - void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); + void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + void unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); + private: const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const; ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context(); + public: - void unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); - ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); // .google.protobuf.Syntax syntax = 7; void clear_syntax() ; ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const; @@ -508,10 +501,6 @@ class PROTOBUF_EXPORT Method final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -528,10 +517,6 @@ class PROTOBUF_EXPORT Method final : // string request_type_url = 2; void clear_request_type_url() ; const std::string& request_type_url() const; - - - - template void set_request_type_url(Arg_&& arg, Args_... args); std::string* mutable_request_type_url(); @@ -548,10 +533,6 @@ class PROTOBUF_EXPORT Method final : // string response_type_url = 4; void clear_response_type_url() ; const std::string& response_type_url() const; - - - - template void set_response_type_url(Arg_&& arg, Args_... args); std::string* mutable_response_type_url(); @@ -749,10 +730,6 @@ class PROTOBUF_EXPORT Mixin final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -769,10 +746,6 @@ class PROTOBUF_EXPORT Mixin final : // string root = 2; void clear_root() ; const std::string& root() const; - - - - template void set_root(Arg_&& arg, Args_... args); std::string* mutable_root(); @@ -843,8 +816,6 @@ inline const std::string& Api::_internal_name() const { } inline void Api::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Api::_internal_mutable_name() { @@ -971,8 +942,6 @@ inline const std::string& Api::_internal_version() const { } inline void Api::_internal_set_version(const std::string& value) { ; - - _impl_.version_.Set(value, GetArenaForAllocation()); } inline std::string* Api::_internal_mutable_version() { @@ -1001,20 +970,18 @@ inline bool Api::has_source_context() const { } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::_internal_source_context() const { const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_; - return p != nullptr ? *p : reinterpret_cast( - ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); + return p != nullptr ? *p : reinterpret_cast(::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Api.source_context) return _internal_source_context(); } -inline void Api::unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Api::unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - _impl_.source_context_ = source_context; - if (source_context) { + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); + if (value != nullptr) { _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; @@ -1022,22 +989,26 @@ inline void Api::unsafe_arena_set_allocated_source_context( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Api.source_context) } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::release_source_context() { + _impl_._has_bits_[0] &= ~0x00000001u; - ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; + ::PROTOBUF_NAMESPACE_ID::SourceContext* released = _impl_.source_context_; _impl_.source_context_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(released); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + if (GetArenaForAllocation() == nullptr) { + delete old; + } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; + return released; } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::unsafe_arena_release_source_context() { // @@protoc_insertion_point(field_release:google.protobuf.Api.source_context) + _impl_._has_bits_[0] &= ~0x00000001u; ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; _impl_.source_context_ = nullptr; @@ -1047,7 +1018,7 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::_internal_mutable_source_con _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation()); - _impl_.source_context_ = p; + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(p); } return _impl_.source_context_; } @@ -1056,24 +1027,24 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::mutable_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.source_context) return _msg; } -inline void Api::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Api::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - if (source_context) { + + if (value != nullptr) { ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( - reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context)); + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); if (message_arena != submessage_arena) { - source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, source_context, submessage_arena); + value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(message_arena, value, submessage_arena); } _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.source_context_ = source_context; + + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.source_context) } @@ -1168,8 +1139,6 @@ inline const std::string& Method::_internal_name() const { } inline void Method::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_name() { @@ -1215,8 +1184,6 @@ inline const std::string& Method::_internal_request_type_url() const { } inline void Method::_internal_set_request_type_url(const std::string& value) { ; - - _impl_.request_type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_request_type_url() { @@ -1282,8 +1249,6 @@ inline const std::string& Method::_internal_response_type_url() const { } inline void Method::_internal_set_response_type_url(const std::string& value) { ; - - _impl_.response_type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_response_type_url() { @@ -1412,8 +1377,6 @@ inline const std::string& Mixin::_internal_name() const { } inline void Mixin::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Mixin::_internal_mutable_name() { @@ -1459,8 +1422,6 @@ inline const std::string& Mixin::_internal_root() const { } inline void Mixin::_internal_set_root(const std::string& value) { ; - - _impl_.root_.Set(value, GetArenaForAllocation()); } inline std::string* Mixin::_internal_mutable_root() { diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index c285756395..acd5e2e6f7 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -197,10 +197,6 @@ class PROTOBUF_EXPORT SourceContext final : // string file_name = 1; void clear_file_name() ; const std::string& file_name() const; - - - - template void set_file_name(Arg_&& arg, Args_... args); std::string* mutable_file_name(); @@ -270,8 +266,6 @@ inline const std::string& SourceContext::_internal_file_name() const { } inline void SourceContext::_internal_set_file_name(const std::string& value) { ; - - _impl_.file_name_.Set(value, GetArenaForAllocation()); } inline std::string* SourceContext::_internal_mutable_file_name() { diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 1494a57f5d..cad7d972a8 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -434,12 +434,10 @@ class Value::_Internal { static const ::PROTOBUF_NAMESPACE_ID::ListValue& list_value(const Value* msg); }; -const ::PROTOBUF_NAMESPACE_ID::Struct& -Value::_Internal::struct_value(const Value* msg) { +const ::PROTOBUF_NAMESPACE_ID::Struct& Value::_Internal::struct_value(const Value* msg) { return *msg->_impl_.kind_.struct_value_; } -const ::PROTOBUF_NAMESPACE_ID::ListValue& -Value::_Internal::list_value(const Value* msg) { +const ::PROTOBUF_NAMESPACE_ID::ListValue& Value::_Internal::list_value(const Value* msg) { return *msg->_impl_.kind_.list_value_; } void Value::set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value) { diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 889417c17f..e6448e0abd 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -476,10 +476,6 @@ class PROTOBUF_EXPORT Value final : bool has_string_value() const; void clear_string_value() ; const std::string& string_value() const; - - - - template void set_string_value(Arg_&& arg, Args_... args); std::string* mutable_string_value(); @@ -514,14 +510,15 @@ class PROTOBUF_EXPORT Value final : const ::PROTOBUF_NAMESPACE_ID::Struct& struct_value() const; PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Struct* release_struct_value(); ::PROTOBUF_NAMESPACE_ID::Struct* mutable_struct_value(); - void set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value); + void set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* value); + void unsafe_arena_set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* value); + ::PROTOBUF_NAMESPACE_ID::Struct* unsafe_arena_release_struct_value(); + private: const ::PROTOBUF_NAMESPACE_ID::Struct& _internal_struct_value() const; ::PROTOBUF_NAMESPACE_ID::Struct* _internal_mutable_struct_value(); + public: - void unsafe_arena_set_allocated_struct_value( - ::PROTOBUF_NAMESPACE_ID::Struct* struct_value); - ::PROTOBUF_NAMESPACE_ID::Struct* unsafe_arena_release_struct_value(); // .google.protobuf.ListValue list_value = 6; bool has_list_value() const; private: @@ -532,14 +529,15 @@ class PROTOBUF_EXPORT Value final : const ::PROTOBUF_NAMESPACE_ID::ListValue& list_value() const; PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::ListValue* release_list_value(); ::PROTOBUF_NAMESPACE_ID::ListValue* mutable_list_value(); - void set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value); + void set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* value); + void unsafe_arena_set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* value); + ::PROTOBUF_NAMESPACE_ID::ListValue* unsafe_arena_release_list_value(); + private: const ::PROTOBUF_NAMESPACE_ID::ListValue& _internal_list_value() const; ::PROTOBUF_NAMESPACE_ID::ListValue* _internal_mutable_list_value(); + public: - void unsafe_arena_set_allocated_list_value( - ::PROTOBUF_NAMESPACE_ID::ListValue* list_value); - ::PROTOBUF_NAMESPACE_ID::ListValue* unsafe_arena_release_list_value(); void clear_kind(); KindCase kind_case() const; // @@protoc_insertion_point(class_scope:google.protobuf.Value) @@ -907,8 +905,6 @@ inline void Value::_internal_set_string_value(const std::string& value) { set_has_string_value(); _impl_.kind_.string_value_.InitDefault(); } - - _impl_.kind_.string_value_.Set(value, GetArenaForAllocation()); } inline std::string* Value::_internal_mutable_string_value() { diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 08ad8c2d33..8a8e9a10c7 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -460,8 +460,7 @@ class Type::_Internal { } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& -Type::_Internal::source_context(const Type* msg) { +const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::_Internal::source_context(const Type* msg) { return *msg->_impl_.source_context_; } void Type::clear_source_context() { @@ -1440,8 +1439,7 @@ class Enum::_Internal { } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& -Enum::_Internal::source_context(const Enum* msg) { +const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::_Internal::source_context(const Enum* msg) { return *msg->_impl_.source_context_; } void Enum::clear_source_context() { @@ -2094,8 +2092,7 @@ void EnumValue::InternalSwap(EnumValue* other) { _internal_mutable_options()->InternalSwap(other->_internal_mutable_options()); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, lhs_arena, &other->_impl_.name_, rhs_arena); - - swap(_impl_.number_, other->_impl_.number_); + swap(_impl_.number_, other->_impl_.number_); } ::PROTOBUF_NAMESPACE_ID::Metadata EnumValue::GetMetadata() const { @@ -2116,8 +2113,7 @@ class Option::_Internal { } }; -const ::PROTOBUF_NAMESPACE_ID::Any& -Option::_Internal::value(const Option* msg) { +const ::PROTOBUF_NAMESPACE_ID::Any& Option::_Internal::value(const Option* msg) { return *msg->_impl_.value_; } void Option::clear_value() { diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 7ad5ae3495..ea776e5e98 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -406,10 +406,6 @@ class PROTOBUF_EXPORT Type final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -426,10 +422,6 @@ class PROTOBUF_EXPORT Type final : // string edition = 7; void clear_edition() ; const std::string& edition() const; - - - - template void set_edition(Arg_&& arg, Args_... args); std::string* mutable_edition(); @@ -449,14 +441,15 @@ class PROTOBUF_EXPORT Type final : const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const; PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context(); ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context(); - void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); + void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + void unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); + private: const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const; ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context(); + public: - void unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); - ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); // .google.protobuf.Syntax syntax = 6; void clear_syntax() ; ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const; @@ -707,10 +700,6 @@ class PROTOBUF_EXPORT Field final : // string name = 4; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -727,10 +716,6 @@ class PROTOBUF_EXPORT Field final : // string type_url = 6; void clear_type_url() ; const std::string& type_url() const; - - - - template void set_type_url(Arg_&& arg, Args_... args); std::string* mutable_type_url(); @@ -747,10 +732,6 @@ class PROTOBUF_EXPORT Field final : // string json_name = 10; void clear_json_name() ; const std::string& json_name() const; - - - - template void set_json_name(Arg_&& arg, Args_... args); std::string* mutable_json_name(); @@ -767,10 +748,6 @@ class PROTOBUF_EXPORT Field final : // string default_value = 11; void clear_default_value() ; const std::string& default_value() const; - - - - template void set_default_value(Arg_&& arg, Args_... args); std::string* mutable_default_value(); @@ -1031,10 +1008,6 @@ class PROTOBUF_EXPORT Enum final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -1051,10 +1024,6 @@ class PROTOBUF_EXPORT Enum final : // string edition = 6; void clear_edition() ; const std::string& edition() const; - - - - template void set_edition(Arg_&& arg, Args_... args); std::string* mutable_edition(); @@ -1074,14 +1043,15 @@ class PROTOBUF_EXPORT Enum final : const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const; PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context(); ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context(); - void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); + void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + void unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); + ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); + private: const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const; ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context(); + public: - void unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context); - ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); // .google.protobuf.Syntax syntax = 5; void clear_syntax() ; ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const; @@ -1265,10 +1235,6 @@ class PROTOBUF_EXPORT EnumValue final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -1442,10 +1408,6 @@ class PROTOBUF_EXPORT Option final : // string name = 1; void clear_name() ; const std::string& name() const; - - - - template void set_name(Arg_&& arg, Args_... args); std::string* mutable_name(); @@ -1466,13 +1428,14 @@ class PROTOBUF_EXPORT Option final : PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Any* release_value(); ::PROTOBUF_NAMESPACE_ID::Any* mutable_value(); void set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value); + void unsafe_arena_set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value); + ::PROTOBUF_NAMESPACE_ID::Any* unsafe_arena_release_value(); + private: const ::PROTOBUF_NAMESPACE_ID::Any& _internal_value() const; ::PROTOBUF_NAMESPACE_ID::Any* _internal_mutable_value(); + public: - void unsafe_arena_set_allocated_value( - ::PROTOBUF_NAMESPACE_ID::Any* value); - ::PROTOBUF_NAMESPACE_ID::Any* unsafe_arena_release_value(); // @@protoc_insertion_point(class_scope:google.protobuf.Option) private: class _Internal; @@ -1531,8 +1494,6 @@ inline const std::string& Type::_internal_name() const { } inline void Type::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Type::_internal_mutable_name() { @@ -1732,20 +1693,18 @@ inline bool Type::has_source_context() const { } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::_internal_source_context() const { const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_; - return p != nullptr ? *p : reinterpret_cast( - ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); + return p != nullptr ? *p : reinterpret_cast(::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Type.source_context) return _internal_source_context(); } -inline void Type::unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Type::unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - _impl_.source_context_ = source_context; - if (source_context) { + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); + if (value != nullptr) { _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; @@ -1753,22 +1712,26 @@ inline void Type::unsafe_arena_set_allocated_source_context( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.source_context) } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::release_source_context() { + _impl_._has_bits_[0] &= ~0x00000001u; - ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; + ::PROTOBUF_NAMESPACE_ID::SourceContext* released = _impl_.source_context_; _impl_.source_context_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(released); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + if (GetArenaForAllocation() == nullptr) { + delete old; + } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; + return released; } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::unsafe_arena_release_source_context() { // @@protoc_insertion_point(field_release:google.protobuf.Type.source_context) + _impl_._has_bits_[0] &= ~0x00000001u; ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; _impl_.source_context_ = nullptr; @@ -1778,7 +1741,7 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::_internal_mutable_source_co _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation()); - _impl_.source_context_ = p; + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(p); } return _impl_.source_context_; } @@ -1787,24 +1750,24 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::mutable_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Type.source_context) return _msg; } -inline void Type::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Type::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - if (source_context) { + + if (value != nullptr) { ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( - reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context)); + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); if (message_arena != submessage_arena) { - source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, source_context, submessage_arena); + value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(message_arena, value, submessage_arena); } _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.source_context_ = source_context; + + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); // @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.source_context) } @@ -1853,8 +1816,6 @@ inline const std::string& Type::_internal_edition() const { } inline void Type::_internal_set_edition(const std::string& value) { ; - - _impl_.edition_.Set(value, GetArenaForAllocation()); } inline std::string* Type::_internal_mutable_edition() { @@ -1964,8 +1925,6 @@ inline const std::string& Field::_internal_name() const { } inline void Field::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_name() { @@ -2011,8 +1970,6 @@ inline const std::string& Field::_internal_type_url() const { } inline void Field::_internal_set_type_url(const std::string& value) { ; - - _impl_.type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_type_url() { @@ -2140,8 +2097,6 @@ inline const std::string& Field::_internal_json_name() const { } inline void Field::_internal_set_json_name(const std::string& value) { ; - - _impl_.json_name_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_json_name() { @@ -2187,8 +2142,6 @@ inline const std::string& Field::_internal_default_value() const { } inline void Field::_internal_set_default_value(const std::string& value) { ; - - _impl_.default_value_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_default_value() { @@ -2238,8 +2191,6 @@ inline const std::string& Enum::_internal_name() const { } inline void Enum::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Enum::_internal_mutable_name() { @@ -2352,20 +2303,18 @@ inline bool Enum::has_source_context() const { } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::_internal_source_context() const { const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_; - return p != nullptr ? *p : reinterpret_cast( - ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); + return p != nullptr ? *p : reinterpret_cast(::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_); } inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Enum.source_context) return _internal_source_context(); } -inline void Enum::unsafe_arena_set_allocated_source_context( - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Enum::unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - _impl_.source_context_ = source_context; - if (source_context) { + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); + if (value != nullptr) { _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; @@ -2373,22 +2322,26 @@ inline void Enum::unsafe_arena_set_allocated_source_context( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.source_context) } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::release_source_context() { + _impl_._has_bits_[0] &= ~0x00000001u; - ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; + ::PROTOBUF_NAMESPACE_ID::SourceContext* released = _impl_.source_context_; _impl_.source_context_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(released); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + if (GetArenaForAllocation() == nullptr) { + delete old; + } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; + return released; } inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::unsafe_arena_release_source_context() { // @@protoc_insertion_point(field_release:google.protobuf.Enum.source_context) + _impl_._has_bits_[0] &= ~0x00000001u; ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_; _impl_.source_context_ = nullptr; @@ -2398,7 +2351,7 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::_internal_mutable_source_co _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation()); - _impl_.source_context_ = p; + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(p); } return _impl_.source_context_; } @@ -2407,24 +2360,24 @@ inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::mutable_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.source_context) return _msg; } -inline void Enum::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) { +inline void Enum::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value) { ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); } - if (source_context) { + + if (value != nullptr) { ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( - reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context)); + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); if (message_arena != submessage_arena) { - source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, source_context, submessage_arena); + value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(message_arena, value, submessage_arena); } _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.source_context_ = source_context; + + _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); // @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.source_context) } @@ -2473,8 +2426,6 @@ inline const std::string& Enum::_internal_edition() const { } inline void Enum::_internal_set_edition(const std::string& value) { ; - - _impl_.edition_.Set(value, GetArenaForAllocation()); } inline std::string* Enum::_internal_mutable_edition() { @@ -2524,8 +2475,6 @@ inline const std::string& EnumValue::_internal_name() const { } inline void EnumValue::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* EnumValue::_internal_mutable_name() { @@ -2637,8 +2586,6 @@ inline const std::string& Option::_internal_name() const { } inline void Option::_internal_set_name(const std::string& value) { ; - - _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Option::_internal_mutable_name() { @@ -2667,20 +2614,18 @@ inline bool Option::has_value() const { } inline const ::PROTOBUF_NAMESPACE_ID::Any& Option::_internal_value() const { const ::PROTOBUF_NAMESPACE_ID::Any* p = _impl_.value_; - return p != nullptr ? *p : reinterpret_cast( - ::PROTOBUF_NAMESPACE_ID::_Any_default_instance_); + return p != nullptr ? *p : reinterpret_cast(::PROTOBUF_NAMESPACE_ID::_Any_default_instance_); } inline const ::PROTOBUF_NAMESPACE_ID::Any& Option::value() const { // @@protoc_insertion_point(field_get:google.protobuf.Option.value) return _internal_value(); } -inline void Option::unsafe_arena_set_allocated_value( - ::PROTOBUF_NAMESPACE_ID::Any* value) { +inline void Option::unsafe_arena_set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value) { if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.value_); } - _impl_.value_ = value; - if (value) { + _impl_.value_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::Any*>(value); + if (value != nullptr) { _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; @@ -2688,22 +2633,26 @@ inline void Option::unsafe_arena_set_allocated_value( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.value) } inline ::PROTOBUF_NAMESPACE_ID::Any* Option::release_value() { + _impl_._has_bits_[0] &= ~0x00000001u; - ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.value_; + ::PROTOBUF_NAMESPACE_ID::Any* released = _impl_.value_; _impl_.value_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp); - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); - if (GetArenaForAllocation() == nullptr) { delete old; } -#else // PROTOBUF_FORCE_COPY_IN_RELEASE + auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(released); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + if (GetArenaForAllocation() == nullptr) { + delete old; + } +#else // PROTOBUF_FORCE_COPY_IN_RELEASE if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE - return temp; + return released; } inline ::PROTOBUF_NAMESPACE_ID::Any* Option::unsafe_arena_release_value() { // @@protoc_insertion_point(field_release:google.protobuf.Option.value) + _impl_._has_bits_[0] &= ~0x00000001u; ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.value_; _impl_.value_ = nullptr; @@ -2713,7 +2662,7 @@ inline ::PROTOBUF_NAMESPACE_ID::Any* Option::_internal_mutable_value() { _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.value_ == nullptr) { auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(GetArenaForAllocation()); - _impl_.value_ = p; + _impl_.value_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::Any*>(p); } return _impl_.value_; } @@ -2725,21 +2674,21 @@ inline ::PROTOBUF_NAMESPACE_ID::Any* Option::mutable_value() { inline void Option::set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value) { ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.value_); + delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.value_); } - if (value) { + + if (value != nullptr) { ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena( - reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); + ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); if (message_arena != submessage_arena) { - value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( - message_arena, value, submessage_arena); + value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(message_arena, value, submessage_arena); } _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.value_ = value; + + _impl_.value_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::Any*>(value); // @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.value) } diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index 3910879937..ab9a1acf09 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -500,8 +500,7 @@ bool DoubleValue::IsInitialized() const { void DoubleValue::InternalSwap(DoubleValue* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata DoubleValue::GetMetadata() const { @@ -685,8 +684,7 @@ bool FloatValue::IsInitialized() const { void FloatValue::InternalSwap(FloatValue* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata FloatValue::GetMetadata() const { @@ -859,8 +857,7 @@ bool Int64Value::IsInitialized() const { void Int64Value::InternalSwap(Int64Value* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata Int64Value::GetMetadata() const { @@ -1033,8 +1030,7 @@ bool UInt64Value::IsInitialized() const { void UInt64Value::InternalSwap(UInt64Value* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata UInt64Value::GetMetadata() const { @@ -1207,8 +1203,7 @@ bool Int32Value::IsInitialized() const { void Int32Value::InternalSwap(Int32Value* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata Int32Value::GetMetadata() const { @@ -1381,8 +1376,7 @@ bool UInt32Value::IsInitialized() const { void UInt32Value::InternalSwap(UInt32Value* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata UInt32Value::GetMetadata() const { @@ -1554,8 +1548,7 @@ bool BoolValue::IsInitialized() const { void BoolValue::InternalSwap(BoolValue* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - - swap(_impl_.value_, other->_impl_.value_); + swap(_impl_.value_, other->_impl_.value_); } ::PROTOBUF_NAMESPACE_ID::Metadata BoolValue::GetMetadata() const { diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index e4d75441d4..a5c4d0aab7 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1315,10 +1315,6 @@ class PROTOBUF_EXPORT StringValue final : // string value = 1; void clear_value() ; const std::string& value() const; - - - - template void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); @@ -1479,10 +1475,6 @@ class PROTOBUF_EXPORT BytesValue final : // bytes value = 1; void clear_value() ; const std::string& value() const; - - - - template void set_value(Arg_&& arg, Args_... args); std::string* mutable_value(); @@ -1720,8 +1712,6 @@ inline const std::string& StringValue::_internal_value() const { } inline void StringValue::_internal_set_value(const std::string& value) { ; - - _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* StringValue::_internal_mutable_value() { @@ -1771,8 +1761,6 @@ inline const std::string& BytesValue::_internal_value() const { } inline void BytesValue::_internal_set_value(const std::string& value) { ; - - _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* BytesValue::_internal_mutable_value() {