From 23e2e6fe02fdd9bcc762b9d92788890406eb53b4 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 4 May 2023 15:25:03 +0000 Subject: [PATCH] Auto-generate files after cl/529413361 --- src/google/protobuf/any.pb.cc | 82 +-- src/google/protobuf/any.pb.h | 92 +-- src/google/protobuf/api.pb.cc | 276 ++++---- src/google/protobuf/api.pb.h | 414 ++++++------ src/google/protobuf/duration.pb.cc | 78 ++- src/google/protobuf/duration.pb.h | 68 +- src/google/protobuf/empty.pb.cc | 52 +- src/google/protobuf/empty.pb.h | 62 +- src/google/protobuf/field_mask.pb.cc | 76 ++- src/google/protobuf/field_mask.pb.h | 86 +-- src/google/protobuf/source_context.pb.cc | 72 +- src/google/protobuf/source_context.pb.h | 70 +- src/google/protobuf/struct.pb.cc | 266 ++++---- src/google/protobuf/struct.pb.h | 378 ++++++----- src/google/protobuf/timestamp.pb.cc | 78 ++- src/google/protobuf/timestamp.pb.h | 68 +- src/google/protobuf/type.pb.cc | 494 +++++++------- src/google/protobuf/type.pb.h | 824 ++++++++++++----------- src/google/protobuf/wrappers.pb.cc | 462 ++++++------- src/google/protobuf/wrappers.pb.h | 456 ++++++------- 20 files changed, 2289 insertions(+), 2165 deletions(-) diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 55d8c7b6726d4..026894eb64b03 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -16,13 +16,14 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; #if defined(__llvm__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wuninitialized" #endif // __llvm__ -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Any::Any( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.type_url_)*/ { @@ -45,7 +46,8 @@ struct AnyDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AnyDefaultTypeInternal _Any_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fany_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2fany_2eproto = nullptr; @@ -54,24 +56,24 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2fany_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Any, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _impl_.type_url_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _impl_.value_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Any, _impl_.type_url_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Any, _impl_.value_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Any)}, + { 0, -1, -1, sizeof(::google::protobuf::Any)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Any_default_instance_._instance, + &::google::protobuf::_Any_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fany_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\031google/protobuf/any.proto\022\017google.prot" @@ -117,13 +119,14 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fany_2eproto(&descriptor_table_google_2fprotobuf_2fany_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== bool Any::GetAnyFieldDescriptors( - const ::PROTOBUF_NAMESPACE_ID::Message& message, - const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** type_url_field, - const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** value_field) { + const ::google::protobuf::Message& message, + const ::google::protobuf::FieldDescriptor** type_url_field, + const ::google::protobuf::FieldDescriptor** value_field) { return ::_pbi::GetAnyFieldDescriptors( message, type_url_field, value_field); } @@ -137,13 +140,13 @@ class Any::_Internal { public: }; -Any::Any(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Any::Any(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Any) } Any::Any(const Any& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Any* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.type_url_) {} @@ -153,7 +156,7 @@ Any::Any(const Any& from) , /*decltype(_impl_._cached_size_)*/{} , /*decltype(_impl_._any_metadata_)*/{&_impl_.type_url_, &_impl_.value_}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.type_url_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.type_url_.Set("", GetArenaForAllocation()); @@ -193,7 +196,7 @@ inline void Any::SharedCtor(::_pb::Arena* arena) { Any::~Any() { // @@protoc_insertion_point(destructor:google.protobuf.Any) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -219,7 +222,7 @@ PROTOBUF_NOINLINE void Any::Clear() { _impl_.type_url_.ClearToEmpty(); _impl_.value_.ClearToEmpty(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Any::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -260,7 +263,7 @@ const char* Any::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -273,7 +276,7 @@ const char* Any::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Any::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -281,8 +284,8 @@ ::uint8_t* Any::_InternalSerialize( // string type_url = 1; if (!this->_internal_type_url().empty()) { const std::string& _s = this->_internal_type_url(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Any.type_url"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Any.type_url"); target = stream->WriteStringMaybeAliased(1, _s, target); } @@ -294,7 +297,7 @@ ::uint8_t* Any::_InternalSerialize( if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Any) return target; @@ -310,27 +313,27 @@ ::size_t Any::ByteSizeLong() const { // string type_url = 1; if (!this->_internal_type_url().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_type_url()); } // bytes value = 2; if (!this->_internal_value().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize( this->_internal_value()); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Any::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Any::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Any::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Any::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Any::GetClassData() const { return &_class_data_; } -void Any::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Any::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Any) @@ -344,7 +347,7 @@ void Any::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_N if (!from._internal_value().empty()) { _this->_internal_set_value(from._internal_value()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Any::CopyFrom(const Any& from) { @@ -369,19 +372,22 @@ void Any::InternalSwap(Any* other) { &other->_impl_.value_, rhs_arena); } -::PROTOBUF_NAMESPACE_ID::Metadata Any::GetMetadata() const { +::google::protobuf::Metadata Any::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fany_2eproto_getter, &descriptor_table_google_2fprotobuf_2fany_2eproto_once, file_level_metadata_google_2fprotobuf_2fany_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Any* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Any >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Any >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Any* +Arena::CreateMaybeMessage< ::google::protobuf::Any >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Any >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #if defined(__llvm__) #pragma clang diagnostic pop diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 8cc711f626fa5..9944bb01d18b5 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -38,27 +38,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fany_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fany_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fany_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class Any; struct AnyDefaultTypeInternal; PROTOBUF_EXPORT extern AnyDefaultTypeInternal _Any_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Any* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Any* Arena::CreateMaybeMessage<::google::protobuf::Any>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -66,11 +71,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT Any final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Any) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Any) */ { public: inline Any() : Any(nullptr) {} ~Any() override; - explicit PROTOBUF_CONSTEXPR Any(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Any(::google::protobuf::internal::ConstantInitialized); Any(const Any& from); Any(Any&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT Any final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Any& default_instance() { @@ -124,31 +129,31 @@ class PROTOBUF_EXPORT Any final : // implements Any ----------------------------------------------- - bool PackFrom(const ::PROTOBUF_NAMESPACE_ID::Message& message) { + bool PackFrom(const ::google::protobuf::Message& message) { ABSL_DCHECK_NE(&message, this); return _impl_._any_metadata_.PackFrom(GetArena(), message); } - bool PackFrom(const ::PROTOBUF_NAMESPACE_ID::Message& message, + bool PackFrom(const ::google::protobuf::Message& message, ::absl::string_view type_url_prefix) { ABSL_DCHECK_NE(&message, this); return _impl_._any_metadata_.PackFrom(GetArena(), message, type_url_prefix); } - bool UnpackTo(::PROTOBUF_NAMESPACE_ID::Message* message) const { + bool UnpackTo(::google::protobuf::Message* message) const { return _impl_._any_metadata_.UnpackTo(message); } static bool GetAnyFieldDescriptors( - const ::PROTOBUF_NAMESPACE_ID::Message& message, - const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** type_url_field, - const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** value_field); - template ::value>::type> + const ::google::protobuf::Message& message, + const ::google::protobuf::FieldDescriptor** type_url_field, + const ::google::protobuf::FieldDescriptor** value_field); + template ::value>::type> bool PackFrom(const T& message) { return _impl_._any_metadata_.PackFrom(GetArena(), message); } - template ::value>::type> + template ::value>::type> bool PackFrom(const T& message, ::absl::string_view type_url_prefix) { return _impl_._any_metadata_.PackFrom(GetArena(), message, type_url_prefix);} - template ::value>::type> + template ::value>::type> bool UnpackTo(T* message) const { return _impl_._any_metadata_.UnpackTo(message); } @@ -170,7 +175,7 @@ class PROTOBUF_EXPORT Any final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Any* other) { @@ -181,46 +186,46 @@ class PROTOBUF_EXPORT Any final : // implements Message ---------------------------------------------- - Any* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Any* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Any& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Any& from) { Any::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Any* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Any"; } protected: - explicit Any(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Any(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -266,14 +271,14 @@ class PROTOBUF_EXPORT Any final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr type_url_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata _any_metadata_; + ::google::protobuf::internal::ArenaStringPtr type_url_; + ::google::protobuf::internal::ArenaStringPtr value_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::internal::AnyMetadata _any_metadata_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fany_2eproto; @@ -390,7 +395,8 @@ inline void Any::set_allocated_value(std::string* value) { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 808c19745d31b..b80adb3e43043 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Api::Api( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_._has_bits_)*/{} @@ -100,7 +101,8 @@ struct MixinDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MixinDefaultTypeInternal _Mixin_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fapi_2eproto[3]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr; @@ -108,21 +110,21 @@ static constexpr const ::_pb::ServiceDescriptor** file_level_service_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fapi_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.methods_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.version_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.source_context_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.mixins_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.syntax_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.methods_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.version_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.source_context_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.mixins_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Api, _impl_.syntax_), ~0u, ~0u, ~0u, @@ -131,43 +133,43 @@ const ::uint32_t TableStruct_google_2fprotobuf_2fapi_2eproto::offsets[] PROTOBUF ~0u, ~0u, ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.request_type_url_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.request_streaming_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.response_type_url_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.response_streaming_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.syntax_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.request_type_url_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.request_streaming_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.response_type_url_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.response_streaming_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Method, _impl_.syntax_), ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Mixin, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _impl_.root_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Mixin, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Mixin, _impl_.root_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, 15, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Api)}, - { 22, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Method)}, - { 37, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Mixin)}, + { 0, 15, -1, sizeof(::google::protobuf::Api)}, + { 22, -1, -1, sizeof(::google::protobuf::Method)}, + { 37, -1, -1, sizeof(::google::protobuf::Mixin)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Api_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Method_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Mixin_default_instance_._instance, + &::google::protobuf::_Api_default_instance_._instance, + &::google::protobuf::_Method_default_instance_._instance, + &::google::protobuf::_Mixin_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\031google/protobuf/api.proto\022\017google.prot" @@ -231,7 +233,8 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fapi_2eproto(&descriptor_table_google_2fprotobuf_2fapi_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class Api::_Internal { @@ -239,13 +242,13 @@ class Api::_Internal { using HasBits = decltype(std::declval()._impl_._has_bits_); static constexpr ::int32_t kHasBitsOffset = 8 * PROTOBUF_FIELD_OFFSET(Api, _impl_._has_bits_); - static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Api* msg); + static const ::google::protobuf::SourceContext& source_context(const Api* msg); static void set_has_source_context(HasBits* has_bits) { (*has_bits)[0] |= 1u; } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::_Internal::source_context(const Api* msg) { +const ::google::protobuf::SourceContext& Api::_Internal::source_context(const Api* msg) { return *msg->_impl_.source_context_; } void Api::clear_options() { @@ -255,13 +258,13 @@ void Api::clear_source_context() { if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; } -Api::Api(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Api::Api(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Api) } Api::Api(const Api& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Api* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_._has_bits_){from._impl_._has_bits_} @@ -277,7 +280,7 @@ Api::Api(const Api& from) , decltype(_impl_.syntax_) {} }; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -293,7 +296,7 @@ Api::Api(const Api& from) _this->_impl_.version_.Set(from._internal_version(), _this->GetArenaForAllocation()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_); + _this->_impl_.source_context_ = new ::google::protobuf::SourceContext(*from._impl_.source_context_); } _this->_impl_.syntax_ = from._impl_.syntax_; // @@protoc_insertion_point(copy_constructor:google.protobuf.Api) @@ -327,7 +330,7 @@ inline void Api::SharedCtor(::_pb::Arena* arena) { Api::~Api() { // @@protoc_insertion_point(destructor:google.protobuf.Api) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -366,7 +369,7 @@ PROTOBUF_NOINLINE void Api::Clear() { } _impl_.syntax_ = 0; _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -396,7 +399,7 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_methods()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr)); + } while (::google::protobuf::internal::ExpectTag<18>(ptr)); } else { goto handle_unusual; } @@ -410,7 +413,7 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); + } while (::google::protobuf::internal::ExpectTag<26>(ptr)); } else { goto handle_unusual; } @@ -444,7 +447,7 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_mixins()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr)); + } while (::google::protobuf::internal::ExpectTag<50>(ptr)); } else { goto handle_unusual; } @@ -452,9 +455,9 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Syntax syntax = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 56)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val)); + _internal_set_syntax(static_cast<::google::protobuf::Syntax>(val)); } else { goto handle_unusual; } @@ -470,7 +473,7 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -484,7 +487,7 @@ const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Api::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Api) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -492,8 +495,8 @@ ::uint8_t* Api::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } @@ -501,7 +504,7 @@ ::uint8_t* Api::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_methods_size()); i < n; i++) { const auto& repfield = this->_internal_methods().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } @@ -509,22 +512,22 @@ ::uint8_t* Api::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream); } // string version = 4; if (!this->_internal_version().empty()) { const std::string& _s = this->_internal_version(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.version"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.version"); target = stream->WriteStringMaybeAliased(4, _s, target); } cached_has_bits = _impl_._has_bits_[0]; // .google.protobuf.SourceContext source_context = 5; if (cached_has_bits & 0x00000001u) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(5, _Internal::source_context(this), _Internal::source_context(this).GetCachedSize(), target, stream); } @@ -533,7 +536,7 @@ ::uint8_t* Api::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_mixins_size()); i < n; i++) { const auto& repfield = this->_internal_mixins().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream); } @@ -546,7 +549,7 @@ ::uint8_t* Api::_InternalSerialize( if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Api) return target; @@ -564,32 +567,32 @@ ::size_t Api::ByteSizeLong() const { total_size += 1UL * this->_internal_methods_size(); for (const auto& msg : this->_internal_methods()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // repeated .google.protobuf.Option options = 3; total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // repeated .google.protobuf.Mixin mixins = 6; total_size += 1UL * this->_internal_mixins_size(); for (const auto& msg : this->_internal_mixins()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string version = 4; if (!this->_internal_version().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_version()); } @@ -597,7 +600,7 @@ ::size_t Api::ByteSizeLong() const { cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *_impl_.source_context_); } @@ -610,14 +613,14 @@ ::size_t Api::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Api::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Api::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Api::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Api::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Api::GetClassData() const { return &_class_data_; } -void Api::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Api::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Api) @@ -635,13 +638,13 @@ void Api::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_N _this->_internal_set_version(from._internal_version()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom( + _this->_internal_mutable_source_context()->::google::protobuf::SourceContext::MergeFrom( from._internal_source_context()); } if (from._internal_syntax() != 0) { _this->_internal_set_syntax(from._internal_syntax()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Api::CopyFrom(const Api& from) { @@ -668,7 +671,7 @@ void Api::InternalSwap(Api* other) { &other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.version_, lhs_arena, &other->_impl_.version_, rhs_arena); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Api, _impl_.syntax_) + sizeof(Api::_impl_.syntax_) - PROTOBUF_FIELD_OFFSET(Api, _impl_.source_context_)>( @@ -676,7 +679,7 @@ void Api::InternalSwap(Api* other) { reinterpret_cast(&other->_impl_.source_context_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Api::GetMetadata() const { +::google::protobuf::Metadata Api::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once, file_level_metadata_google_2fprotobuf_2fapi_2eproto[0]); @@ -690,13 +693,13 @@ class Method::_Internal { void Method::clear_options() { _internal_mutable_options()->Clear(); } -Method::Method(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Method::Method(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Method) } Method::Method(const Method& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Method* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.options_){from._impl_.options_} @@ -714,7 +717,7 @@ Method::Method(const Method& from) , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -776,7 +779,7 @@ inline void Method::SharedCtor(::_pb::Arena* arena) { Method::~Method() { // @@protoc_insertion_point(destructor:google.protobuf.Method) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -808,7 +811,7 @@ PROTOBUF_NOINLINE void Method::Clear() { ::memset(&_impl_.request_streaming_, 0, static_cast<::size_t>( reinterpret_cast(&_impl_.syntax_) - reinterpret_cast(&_impl_.request_streaming_)) + sizeof(_impl_.syntax_)); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -842,7 +845,7 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // bool request_streaming = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 24)) { - _impl_.request_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.request_streaming_ = ::google::protobuf::internal::ReadVarint64(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -862,7 +865,7 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // bool response_streaming = 5; case 5: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 40)) { - _impl_.response_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.response_streaming_ = ::google::protobuf::internal::ReadVarint64(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -877,7 +880,7 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr)); + } while (::google::protobuf::internal::ExpectTag<50>(ptr)); } else { goto handle_unusual; } @@ -885,9 +888,9 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Syntax syntax = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 56)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val)); + _internal_set_syntax(static_cast<::google::protobuf::Syntax>(val)); } else { goto handle_unusual; } @@ -903,7 +906,7 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -916,7 +919,7 @@ const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Method::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Method) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -924,16 +927,16 @@ ::uint8_t* Method::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } // string request_type_url = 2; if (!this->_internal_request_type_url().empty()) { const std::string& _s = this->_internal_request_type_url(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.request_type_url"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.request_type_url"); target = stream->WriteStringMaybeAliased(2, _s, target); } @@ -947,8 +950,8 @@ ::uint8_t* Method::_InternalSerialize( // string response_type_url = 4; if (!this->_internal_response_type_url().empty()) { const std::string& _s = this->_internal_response_type_url(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.response_type_url"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.response_type_url"); target = stream->WriteStringMaybeAliased(4, _s, target); } @@ -963,7 +966,7 @@ ::uint8_t* Method::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream); } @@ -976,7 +979,7 @@ ::uint8_t* Method::_InternalSerialize( if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Method) return target; @@ -994,24 +997,24 @@ ::size_t Method::ByteSizeLong() const { total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string request_type_url = 2; if (!this->_internal_request_type_url().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_request_type_url()); } // string response_type_url = 4; if (!this->_internal_response_type_url().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_response_type_url()); } @@ -1034,14 +1037,14 @@ ::size_t Method::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Method::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Method::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Method::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Method::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Method::GetClassData() const { return &_class_data_; } -void Method::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Method::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Method) @@ -1068,7 +1071,7 @@ void Method::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU if (from._internal_syntax() != 0) { _this->_internal_set_syntax(from._internal_syntax()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Method::CopyFrom(const Method& from) { @@ -1094,7 +1097,7 @@ void Method::InternalSwap(Method* other) { &other->_impl_.request_type_url_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.response_type_url_, lhs_arena, &other->_impl_.response_type_url_, rhs_arena); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_) + sizeof(Method::_impl_.syntax_) - PROTOBUF_FIELD_OFFSET(Method, _impl_.request_streaming_)>( @@ -1102,7 +1105,7 @@ void Method::InternalSwap(Method* other) { reinterpret_cast(&other->_impl_.request_streaming_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Method::GetMetadata() const { +::google::protobuf::Metadata Method::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once, file_level_metadata_google_2fprotobuf_2fapi_2eproto[1]); @@ -1113,13 +1116,13 @@ class Mixin::_Internal { public: }; -Mixin::Mixin(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Mixin::Mixin(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Mixin) } Mixin::Mixin(const Mixin& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Mixin* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.name_) {} @@ -1128,7 +1131,7 @@ Mixin::Mixin(const Mixin& from) , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1167,7 +1170,7 @@ inline void Mixin::SharedCtor(::_pb::Arena* arena) { Mixin::~Mixin() { // @@protoc_insertion_point(destructor:google.protobuf.Mixin) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -1192,7 +1195,7 @@ PROTOBUF_NOINLINE void Mixin::Clear() { _impl_.name_.ClearToEmpty(); _impl_.root_.ClearToEmpty(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Mixin::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1234,7 +1237,7 @@ const char* Mixin::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1247,7 +1250,7 @@ const char* Mixin::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Mixin::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Mixin) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1255,22 +1258,22 @@ ::uint8_t* Mixin::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } // string root = 2; if (!this->_internal_root().empty()) { const std::string& _s = this->_internal_root(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.root"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.root"); target = stream->WriteStringMaybeAliased(2, _s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Mixin) return target; @@ -1286,27 +1289,27 @@ ::size_t Mixin::ByteSizeLong() const { // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string root = 2; if (!this->_internal_root().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_root()); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Mixin::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Mixin::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Mixin::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Mixin::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Mixin::GetClassData() const { return &_class_data_; } -void Mixin::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Mixin::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Mixin) @@ -1320,7 +1323,7 @@ void Mixin::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF if (!from._internal_root().empty()) { _this->_internal_set_root(from._internal_root()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Mixin::CopyFrom(const Mixin& from) { @@ -1345,26 +1348,29 @@ void Mixin::InternalSwap(Mixin* other) { &other->_impl_.root_, rhs_arena); } -::PROTOBUF_NAMESPACE_ID::Metadata Mixin::GetMetadata() const { +::google::protobuf::Metadata Mixin::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once, file_level_metadata_google_2fprotobuf_2fapi_2eproto[2]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Api* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Api >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Api >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Api* +Arena::CreateMaybeMessage< ::google::protobuf::Api >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Api >(arena); } -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Method* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Method >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Method >(arena); +template<> PROTOBUF_NOINLINE ::google::protobuf::Method* +Arena::CreateMaybeMessage< ::google::protobuf::Method >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Method >(arena); } -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Mixin* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Mixin >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Mixin >(arena); +template<> PROTOBUF_NOINLINE ::google::protobuf::Mixin* +Arena::CreateMaybeMessage< ::google::protobuf::Mixin >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Mixin >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 4a6a46142e4b8..9d6813651dc05 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -40,19 +40,22 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fapi_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fapi_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fapi_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class Api; struct ApiDefaultTypeInternal; PROTOBUF_EXPORT extern ApiDefaultTypeInternal _Api_default_instance_; @@ -63,14 +66,16 @@ class Mixin; struct MixinDefaultTypeInternal; PROTOBUF_EXPORT extern MixinDefaultTypeInternal _Mixin_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Api* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Api>(Arena*); +PROTOBUF_EXPORT ::google::protobuf::Api* Arena::CreateMaybeMessage<::google::protobuf::Api>(Arena*); template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Method* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Method>(Arena*); +PROTOBUF_EXPORT ::google::protobuf::Method* Arena::CreateMaybeMessage<::google::protobuf::Method>(Arena*); template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Mixin* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Mixin>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Mixin* Arena::CreateMaybeMessage<::google::protobuf::Mixin>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -78,11 +83,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT Api final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ { public: inline Api() : Api(nullptr) {} ~Api() override; - explicit PROTOBUF_CONSTEXPR Api(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Api(::google::protobuf::internal::ConstantInitialized); Api(const Api& from); Api(Api&& from) noexcept @@ -108,20 +113,20 @@ class PROTOBUF_EXPORT Api final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Api& default_instance() { @@ -147,7 +152,7 @@ class PROTOBUF_EXPORT Api final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Api* other) { @@ -158,46 +163,46 @@ class PROTOBUF_EXPORT Api final : // implements Message ---------------------------------------------- - Api* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Api* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Api& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Api& from) { Api::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Api* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Api"; } protected: - explicit Api(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Api(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -219,16 +224,16 @@ class PROTOBUF_EXPORT Api final : public: void clear_methods() ; - ::PROTOBUF_NAMESPACE_ID::Method* mutable_methods(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >* + ::google::protobuf::Method* mutable_methods(int index); + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* mutable_methods(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Method>& _internal_methods() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Method>* _internal_mutable_methods(); + const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& _internal_methods() const; + ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* _internal_mutable_methods(); public: - const ::PROTOBUF_NAMESPACE_ID::Method& methods(int index) const; - ::PROTOBUF_NAMESPACE_ID::Method* add_methods(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >& + const ::google::protobuf::Method& methods(int index) const; + ::google::protobuf::Method* add_methods(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& methods() const; // repeated .google.protobuf.Option options = 3; int options_size() const; @@ -237,16 +242,16 @@ class PROTOBUF_EXPORT Api final : public: void clear_options() ; - ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >* + ::google::protobuf::Option* mutable_options(int index); + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>& _internal_options() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>* _internal_mutable_options(); + const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const; + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options(); public: - const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const; - ::PROTOBUF_NAMESPACE_ID::Option* add_options(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >& + const ::google::protobuf::Option& options(int index) const; + ::google::protobuf::Option* add_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& options() const; // repeated .google.protobuf.Mixin mixins = 6; int mixins_size() const; @@ -255,16 +260,16 @@ class PROTOBUF_EXPORT Api final : public: void clear_mixins() ; - ::PROTOBUF_NAMESPACE_ID::Mixin* mutable_mixins(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >* + ::google::protobuf::Mixin* mutable_mixins(int index); + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* mutable_mixins(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Mixin>& _internal_mixins() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Mixin>* _internal_mutable_mixins(); + const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& _internal_mixins() const; + ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* _internal_mutable_mixins(); public: - const ::PROTOBUF_NAMESPACE_ID::Mixin& mixins(int index) const; - ::PROTOBUF_NAMESPACE_ID::Mixin* add_mixins(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >& + const ::google::protobuf::Mixin& mixins(int index) const; + ::google::protobuf::Mixin* add_mixins(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& mixins() const; // string name = 1; void clear_name() ; @@ -301,44 +306,44 @@ class PROTOBUF_EXPORT Api final : // .google.protobuf.SourceContext source_context = 5; bool has_source_context() const; void clear_source_context() ; - 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* value); - void unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* value); - ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context(); + const ::google::protobuf::SourceContext& source_context() const; + PROTOBUF_NODISCARD ::google::protobuf::SourceContext* release_source_context(); + ::google::protobuf::SourceContext* mutable_source_context(); + void set_allocated_source_context(::google::protobuf::SourceContext* value); + void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value); + ::google::protobuf::SourceContext* unsafe_arena_release_source_context(); private: - const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const; - ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context(); + const ::google::protobuf::SourceContext& _internal_source_context() const; + ::google::protobuf::SourceContext* _internal_mutable_source_context(); public: // .google.protobuf.Syntax syntax = 7; void clear_syntax() ; - ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const; - void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value); + ::google::protobuf::Syntax syntax() const; + void set_syntax(::google::protobuf::Syntax value); private: - ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const; - void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value); + ::google::protobuf::Syntax _internal_syntax() const; + void _internal_set_syntax(::google::protobuf::Syntax value); public: // @@protoc_insertion_point(class_scope:google.protobuf.Api) private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method > methods_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin > mixins_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr version_; - ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context_; + ::google::protobuf::internal::HasBits<1> _has_bits_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method > methods_; + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin > mixins_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::internal::ArenaStringPtr version_; + ::google::protobuf::SourceContext* source_context_; int syntax_; }; union { Impl_ _impl_; }; @@ -346,11 +351,11 @@ class PROTOBUF_EXPORT Api final : };// ------------------------------------------------------------------- class PROTOBUF_EXPORT Method final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Method) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Method) */ { public: inline Method() : Method(nullptr) {} ~Method() override; - explicit PROTOBUF_CONSTEXPR Method(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Method(::google::protobuf::internal::ConstantInitialized); Method(const Method& from); Method(Method&& from) noexcept @@ -376,20 +381,20 @@ class PROTOBUF_EXPORT Method final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Method& default_instance() { @@ -415,7 +420,7 @@ class PROTOBUF_EXPORT Method final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Method* other) { @@ -426,46 +431,46 @@ class PROTOBUF_EXPORT Method final : // implements Message ---------------------------------------------- - Method* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Method* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Method& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Method& from) { Method::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Method* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Method"; } protected: - explicit Method(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Method(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -487,16 +492,16 @@ class PROTOBUF_EXPORT Method final : public: void clear_options() ; - ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >* + ::google::protobuf::Option* mutable_options(int index); + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>& _internal_options() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>* _internal_mutable_options(); + const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const; + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options(); public: - const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const; - ::PROTOBUF_NAMESPACE_ID::Option* add_options(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >& + const ::google::protobuf::Option& options(int index) const; + ::google::protobuf::Option* add_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& options() const; // string name = 1; void clear_name() ; @@ -568,41 +573,41 @@ class PROTOBUF_EXPORT Method final : public: // .google.protobuf.Syntax syntax = 7; void clear_syntax() ; - ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const; - void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value); + ::google::protobuf::Syntax syntax() const; + void set_syntax(::google::protobuf::Syntax value); private: - ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const; - void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value); + ::google::protobuf::Syntax _internal_syntax() const; + void _internal_set_syntax(::google::protobuf::Syntax value); public: // @@protoc_insertion_point(class_scope:google.protobuf.Method) private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr request_type_url_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr response_type_url_; + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option > options_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::internal::ArenaStringPtr request_type_url_; + ::google::protobuf::internal::ArenaStringPtr response_type_url_; bool request_streaming_; bool response_streaming_; int syntax_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto; };// ------------------------------------------------------------------- class PROTOBUF_EXPORT Mixin final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ { public: inline Mixin() : Mixin(nullptr) {} ~Mixin() override; - explicit PROTOBUF_CONSTEXPR Mixin(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Mixin(::google::protobuf::internal::ConstantInitialized); Mixin(const Mixin& from); Mixin(Mixin&& from) noexcept @@ -628,20 +633,20 @@ class PROTOBUF_EXPORT Mixin final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Mixin& default_instance() { @@ -667,7 +672,7 @@ class PROTOBUF_EXPORT Mixin final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Mixin* other) { @@ -678,46 +683,46 @@ class PROTOBUF_EXPORT Mixin final : // implements Message ---------------------------------------------- - Mixin* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Mixin* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Mixin& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Mixin& from) { Mixin::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Mixin* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Mixin"; } protected: - explicit Mixin(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Mixin(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -763,13 +768,13 @@ class PROTOBUF_EXPORT Mixin final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr root_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::ArenaStringPtr name_; + ::google::protobuf::internal::ArenaStringPtr root_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto; @@ -846,34 +851,34 @@ inline int Api::methods_size() const { inline void Api::clear_methods() { _internal_mutable_methods()->Clear(); } -inline ::PROTOBUF_NAMESPACE_ID::Method* Api::mutable_methods(int index) { +inline ::google::protobuf::Method* Api::mutable_methods(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.methods) return _internal_mutable_methods()->Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >* +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* Api::mutable_methods() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods) return _internal_mutable_methods(); } -inline const ::PROTOBUF_NAMESPACE_ID::Method& Api::methods(int index) const { +inline const ::google::protobuf::Method& Api::methods(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.methods) return _internal_methods().Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::Method* Api::add_methods() { - ::PROTOBUF_NAMESPACE_ID::Method* _add = _internal_mutable_methods()->Add(); +inline ::google::protobuf::Method* Api::add_methods() { + ::google::protobuf::Method* _add = _internal_mutable_methods()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.methods) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >& +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& Api::methods() const { // @@protoc_insertion_point(field_list:google.protobuf.Api.methods) return _internal_methods(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Method>& +inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& Api::_internal_methods() const { return _impl_.methods_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Method>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* Api::_internal_mutable_methods() { return &_impl_.methods_; } @@ -885,34 +890,34 @@ inline int Api::_internal_options_size() const { inline int Api::options_size() const { return _internal_options_size(); } -inline ::PROTOBUF_NAMESPACE_ID::Option* Api::mutable_options(int index) { +inline ::google::protobuf::Option* Api::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.options) return _internal_mutable_options()->Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >* +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Api::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options) return _internal_mutable_options(); } -inline const ::PROTOBUF_NAMESPACE_ID::Option& Api::options(int index) const { +inline const ::google::protobuf::Option& Api::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.options) return _internal_options().Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::Option* Api::add_options() { - ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_mutable_options()->Add(); +inline ::google::protobuf::Option* Api::add_options() { + ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.options) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >& +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& Api::options() const { // @@protoc_insertion_point(field_list:google.protobuf.Api.options) return _internal_options(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>& +inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Api::_internal_options() const { return _impl_.options_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Api::_internal_mutable_options() { return &_impl_.options_; } @@ -968,19 +973,19 @@ inline bool Api::has_source_context() const { PROTOBUF_ASSUME(!value || _impl_.source_context_ != nullptr); return value; } -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_); +inline const ::google::protobuf::SourceContext& Api::_internal_source_context() const { + const ::google::protobuf::SourceContext* p = _impl_.source_context_; + return p != nullptr ? *p : reinterpret_cast(::google::protobuf::_SourceContext_default_instance_); } -inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::source_context() const { +inline const ::google::protobuf::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* value) { +inline void Api::unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value) { if (GetArenaForAllocation() == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); + delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } - _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); + _impl_.source_context_ = reinterpret_cast<::google::protobuf::SourceContext*>(value); if (value != nullptr) { _impl_._has_bits_[0] |= 0x00000001u; } else { @@ -988,63 +993,63 @@ inline void Api::unsafe_arena_set_allocated_source_context(::PROTOBUF_NAMESPACE_ } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Api.source_context) } -inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::release_source_context() { +inline ::google::protobuf::SourceContext* Api::release_source_context() { _impl_._has_bits_[0] &= ~0x00000001u; - ::PROTOBUF_NAMESPACE_ID::SourceContext* released = _impl_.source_context_; + ::google::protobuf::SourceContext* released = _impl_.source_context_; _impl_.source_context_ = nullptr; #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(released); - released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); + released = ::google::protobuf::internal::DuplicateIfNonNull(released); if (GetArenaForAllocation() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE if (GetArenaForAllocation() != nullptr) { - released = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(released); + released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE return released; } -inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::unsafe_arena_release_source_context() { +inline ::google::protobuf::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_; + ::google::protobuf::SourceContext* temp = _impl_.source_context_; _impl_.source_context_ = nullptr; return temp; } -inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::_internal_mutable_source_context() { +inline ::google::protobuf::SourceContext* Api::_internal_mutable_source_context() { _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { - auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation()); - _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(p); + auto* p = CreateMaybeMessage<::google::protobuf::SourceContext>(GetArenaForAllocation()); + _impl_.source_context_ = reinterpret_cast<::google::protobuf::SourceContext*>(p); } return _impl_.source_context_; } -inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::mutable_source_context() { - ::PROTOBUF_NAMESPACE_ID::SourceContext* _msg = _internal_mutable_source_context(); +inline ::google::protobuf::SourceContext* Api::mutable_source_context() { + ::google::protobuf::SourceContext* _msg = _internal_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* value) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); +inline void Api::set_allocated_source_context(::google::protobuf::SourceContext* value) { + ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); if (message_arena == nullptr) { - delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_); + delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } if (value != nullptr) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value)); + ::google::protobuf::Arena* submessage_arena = + ::google::protobuf::Arena::InternalGetOwningArena(reinterpret_cast<::google::protobuf::MessageLite*>(value)); if (message_arena != submessage_arena) { - value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(message_arena, value, submessage_arena); + value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena); } _impl_._has_bits_[0] |= 0x00000001u; } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.source_context_ = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::SourceContext*>(value); + _impl_.source_context_ = reinterpret_cast<::google::protobuf::SourceContext*>(value); // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.source_context) } @@ -1058,34 +1063,34 @@ inline int Api::mixins_size() const { inline void Api::clear_mixins() { _internal_mutable_mixins()->Clear(); } -inline ::PROTOBUF_NAMESPACE_ID::Mixin* Api::mutable_mixins(int index) { +inline ::google::protobuf::Mixin* Api::mutable_mixins(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.mixins) return _internal_mutable_mixins()->Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >* +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* Api::mutable_mixins() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins) return _internal_mutable_mixins(); } -inline const ::PROTOBUF_NAMESPACE_ID::Mixin& Api::mixins(int index) const { +inline const ::google::protobuf::Mixin& Api::mixins(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.mixins) return _internal_mixins().Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::Mixin* Api::add_mixins() { - ::PROTOBUF_NAMESPACE_ID::Mixin* _add = _internal_mutable_mixins()->Add(); +inline ::google::protobuf::Mixin* Api::add_mixins() { + ::google::protobuf::Mixin* _add = _internal_mutable_mixins()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >& +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& Api::mixins() const { // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins) return _internal_mixins(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Mixin>& +inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& Api::_internal_mixins() const { return _impl_.mixins_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Mixin>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* Api::_internal_mutable_mixins() { return &_impl_.mixins_; } @@ -1094,18 +1099,18 @@ Api::_internal_mutable_mixins() { inline void Api::clear_syntax() { _impl_.syntax_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::Syntax Api::syntax() const { +inline ::google::protobuf::Syntax Api::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.Api.syntax) return _internal_syntax(); } -inline void Api::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) { +inline void Api::set_syntax(::google::protobuf::Syntax value) { _internal_set_syntax(value); // @@protoc_insertion_point(field_set:google.protobuf.Api.syntax) } -inline ::PROTOBUF_NAMESPACE_ID::Syntax Api::_internal_syntax() const { - return static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(_impl_.syntax_); +inline ::google::protobuf::Syntax Api::_internal_syntax() const { + return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } -inline void Api::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) { +inline void Api::_internal_set_syntax(::google::protobuf::Syntax value) { ; _impl_.syntax_ = value; } @@ -1296,34 +1301,34 @@ inline int Method::_internal_options_size() const { inline int Method::options_size() const { return _internal_options_size(); } -inline ::PROTOBUF_NAMESPACE_ID::Option* Method::mutable_options(int index) { +inline ::google::protobuf::Option* Method::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Method.options) return _internal_mutable_options()->Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >* +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Method::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options) return _internal_mutable_options(); } -inline const ::PROTOBUF_NAMESPACE_ID::Option& Method::options(int index) const { +inline const ::google::protobuf::Option& Method::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Method.options) return _internal_options().Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::Option* Method::add_options() { - ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_mutable_options()->Add(); +inline ::google::protobuf::Option* Method::add_options() { + ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Method.options) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >& +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& Method::options() const { // @@protoc_insertion_point(field_list:google.protobuf.Method.options) return _internal_options(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>& +inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Method::_internal_options() const { return _impl_.options_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Option>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Method::_internal_mutable_options() { return &_impl_.options_; } @@ -1332,18 +1337,18 @@ Method::_internal_mutable_options() { inline void Method::clear_syntax() { _impl_.syntax_ = 0; } -inline ::PROTOBUF_NAMESPACE_ID::Syntax Method::syntax() const { +inline ::google::protobuf::Syntax Method::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.Method.syntax) return _internal_syntax(); } -inline void Method::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) { +inline void Method::set_syntax(::google::protobuf::Syntax value) { _internal_set_syntax(value); // @@protoc_insertion_point(field_set:google.protobuf.Method.syntax) } -inline ::PROTOBUF_NAMESPACE_ID::Syntax Method::_internal_syntax() const { - return static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(_impl_.syntax_); +inline ::google::protobuf::Syntax Method::_internal_syntax() const { + return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } -inline void Method::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) { +inline void Method::_internal_set_syntax(::google::protobuf::Syntax value) { ; _impl_.syntax_ = value; } @@ -1447,7 +1452,8 @@ inline void Mixin::set_allocated_root(std::string* value) { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 15cef3f0e89e4..3cfee5a0a2ee9 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Duration::Duration( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.seconds_)*/ ::int64_t{0} @@ -36,7 +37,8 @@ struct DurationDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DurationDefaultTypeInternal _Duration_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fduration_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2fduration_2eproto = nullptr; @@ -45,24 +47,24 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2fduration_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Duration, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _impl_.seconds_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _impl_.nanos_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Duration, _impl_.seconds_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Duration, _impl_.nanos_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Duration)}, + { 0, -1, -1, sizeof(::google::protobuf::Duration)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Duration_default_instance_._instance, + &::google::protobuf::_Duration_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fduration_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\036google/protobuf/duration.proto\022\017google" @@ -108,21 +110,22 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fduration_2eproto(&descriptor_table_google_2fprotobuf_2fduration_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class Duration::_Internal { public: }; -Duration::Duration(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Duration::Duration(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Duration) } Duration::Duration(const Duration& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), _impl_(from._impl_) { - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>( + : ::google::protobuf::Message(), _impl_(from._impl_) { + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.Duration) } @@ -140,7 +143,7 @@ inline void Duration::SharedCtor(::_pb::Arena* arena) { Duration::~Duration() { // @@protoc_insertion_point(destructor:google.protobuf.Duration) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -164,7 +167,7 @@ PROTOBUF_NOINLINE void Duration::Clear() { ::memset(&_impl_.seconds_, 0, static_cast<::size_t>( reinterpret_cast(&_impl_.nanos_) - reinterpret_cast(&_impl_.seconds_)) + sizeof(_impl_.nanos_)); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -176,7 +179,7 @@ const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) // int64 seconds = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) { - _impl_.seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.seconds_ = ::google::protobuf::internal::ReadVarint64(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -185,7 +188,7 @@ const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) // int32 nanos = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 16)) { - _impl_.nanos_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.nanos_ = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -202,7 +205,7 @@ const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -215,28 +218,28 @@ const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) } ::uint8_t* Duration::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Duration) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; // int64 seconds = 1; if (this->_internal_seconds() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt64ToArrayWithField<1>( stream, this->_internal_seconds(), target); } // int32 nanos = 2; if (this->_internal_nanos() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt32ToArrayWithField<2>( stream, this->_internal_nanos(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Duration) return target; @@ -265,14 +268,14 @@ ::size_t Duration::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Duration::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Duration::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Duration::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Duration::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Duration::GetClassData() const { return &_class_data_; } -void Duration::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Duration::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Duration) @@ -286,7 +289,7 @@ void Duration::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTO if (from._internal_nanos() != 0) { _this->_internal_set_nanos(from._internal_nanos()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Duration::CopyFrom(const Duration& from) { @@ -303,7 +306,7 @@ PROTOBUF_NOINLINE bool Duration::IsInitialized() const { void Duration::InternalSwap(Duration* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Duration, _impl_.nanos_) + sizeof(Duration::_impl_.nanos_) - PROTOBUF_FIELD_OFFSET(Duration, _impl_.seconds_)>( @@ -311,18 +314,21 @@ void Duration::InternalSwap(Duration* other) { reinterpret_cast(&other->_impl_.seconds_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Duration::GetMetadata() const { +::google::protobuf::Metadata Duration::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fduration_2eproto_getter, &descriptor_table_google_2fprotobuf_2fduration_2eproto_once, file_level_metadata_google_2fprotobuf_2fduration_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Duration* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Duration >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Duration >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Duration* +Arena::CreateMaybeMessage< ::google::protobuf::Duration >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Duration >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 9dc53e7895721..b07fc33d0b35b 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -38,27 +38,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fduration_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fduration_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fduration_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class Duration; struct DurationDefaultTypeInternal; PROTOBUF_EXPORT extern DurationDefaultTypeInternal _Duration_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Duration* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Duration>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Duration* Arena::CreateMaybeMessage<::google::protobuf::Duration>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -66,11 +71,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT Duration final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Duration) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Duration) */ { public: inline Duration() : Duration(nullptr) {} ~Duration() override; - explicit PROTOBUF_CONSTEXPR Duration(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Duration(::google::protobuf::internal::ConstantInitialized); Duration(const Duration& from); Duration(Duration&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT Duration final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Duration& default_instance() { @@ -135,7 +140,7 @@ class PROTOBUF_EXPORT Duration final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Duration* other) { @@ -146,46 +151,46 @@ class PROTOBUF_EXPORT Duration final : // implements Message ---------------------------------------------- - Duration* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Duration* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Duration& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Duration& from) { Duration::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Duration* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Duration"; } protected: - explicit Duration(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Duration(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -219,13 +224,13 @@ class PROTOBUF_EXPORT Duration final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { ::int64_t seconds_; ::int32_t nanos_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fduration_2eproto; @@ -292,7 +297,8 @@ inline void Duration::_internal_set_nanos(::int32_t value) { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 287bc630aa618..285e4f963b159 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Empty::Empty( ::_pbi::ConstantInitialized) {} struct EmptyDefaultTypeInternal { @@ -31,7 +32,8 @@ struct EmptyDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EmptyDefaultTypeInternal _Empty_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fempty_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2fempty_2eproto = nullptr; @@ -40,7 +42,7 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2fempty_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Empty, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Empty, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ @@ -51,11 +53,11 @@ const ::uint32_t TableStruct_google_2fprotobuf_2fempty_2eproto::offsets[] PROTOB static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Empty)}, + { 0, -1, -1, sizeof(::google::protobuf::Empty)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Empty_default_instance_._instance, + &::google::protobuf::_Empty_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fempty_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\033google/protobuf/empty.proto\022\017google.pr" @@ -100,21 +102,22 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fempty_2eproto(&descriptor_table_google_2fprotobuf_2fempty_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class Empty::_Internal { public: }; -Empty::Empty(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase(arena) { +Empty::Empty(::google::protobuf::Arena* arena) + : ::google::protobuf::internal::ZeroFieldsBase(arena) { // @@protoc_insertion_point(arena_constructor:google.protobuf.Empty) } Empty::Empty(const Empty& from) - : ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase() { + : ::google::protobuf::internal::ZeroFieldsBase() { Empty* const _this = this; (void)_this; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.Empty) } @@ -122,11 +125,11 @@ Empty::Empty(const Empty& from) -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Empty::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyImpl, - ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeImpl, +const ::google::protobuf::Message::ClassData Empty::_class_data_ = { + ::google::protobuf::internal::ZeroFieldsBase::CopyImpl, + ::google::protobuf::internal::ZeroFieldsBase::MergeImpl, }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Empty::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Empty::GetClassData() const { return &_class_data_; } @@ -134,18 +137,21 @@ const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Empty::GetClassData() const { -::PROTOBUF_NAMESPACE_ID::Metadata Empty::GetMetadata() const { +::google::protobuf::Metadata Empty::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fempty_2eproto_getter, &descriptor_table_google_2fprotobuf_2fempty_2eproto_once, file_level_metadata_google_2fprotobuf_2fempty_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Empty* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Empty >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Empty >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Empty* +Arena::CreateMaybeMessage< ::google::protobuf::Empty >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Empty >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 9316dfb0b73c9..5d4857d243907 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -39,27 +39,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fempty_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fempty_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fempty_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class Empty; struct EmptyDefaultTypeInternal; PROTOBUF_EXPORT extern EmptyDefaultTypeInternal _Empty_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Empty* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Empty>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Empty* Arena::CreateMaybeMessage<::google::protobuf::Empty>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -67,10 +72,10 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT Empty final : - public ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:google.protobuf.Empty) */ { + public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:google.protobuf.Empty) */ { public: inline Empty() : Empty(nullptr) {} - explicit PROTOBUF_CONSTEXPR Empty(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Empty(::google::protobuf::internal::ConstantInitialized); Empty(const Empty& from); Empty(Empty&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT Empty final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Empty& default_instance() { @@ -135,7 +140,7 @@ class PROTOBUF_EXPORT Empty final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Empty* other) { @@ -146,32 +151,32 @@ class PROTOBUF_EXPORT Empty final : // implements Message ---------------------------------------------- - Empty* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Empty* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyFrom; + using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom; inline void CopyFrom(const Empty& from) { - ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyImpl(*this, from); + ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from); } - using ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeFrom; + using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom; void MergeFrom(const Empty& from) { - ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeImpl(*this, from); + ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from); } public: private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Empty"; } protected: - explicit Empty(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Empty(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -181,7 +186,7 @@ class PROTOBUF_EXPORT Empty final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { @@ -210,7 +215,8 @@ class PROTOBUF_EXPORT Empty final : #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index dd96cb109b106..bc40b5d9f1d1c 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR FieldMask::FieldMask( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.paths_)*/{} @@ -33,7 +34,8 @@ struct FieldMaskDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldMaskDefaultTypeInternal _FieldMask_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto = nullptr; @@ -42,23 +44,23 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldMask, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::FieldMask, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldMask, _impl_.paths_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::FieldMask, _impl_.paths_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FieldMask)}, + { 0, -1, -1, sizeof(::google::protobuf::FieldMask)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_FieldMask_default_instance_._instance, + &::google::protobuf::_FieldMask_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2ffield_5fmask_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n google/protobuf/field_mask.proto\022\017goog" @@ -104,26 +106,27 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ffield_5fmask_2eproto(&descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class FieldMask::_Internal { public: }; -FieldMask::FieldMask(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +FieldMask::FieldMask(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldMask) } FieldMask::FieldMask(const FieldMask& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { FieldMask* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.paths_){from._impl_.paths_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldMask) } @@ -137,7 +140,7 @@ inline void FieldMask::SharedCtor(::_pb::Arena* arena) { FieldMask::~FieldMask() { // @@protoc_insertion_point(destructor:google.protobuf.FieldMask) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -160,7 +163,7 @@ PROTOBUF_NOINLINE void FieldMask::Clear() { (void) cached_has_bits; _internal_mutable_paths()->Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* FieldMask::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -180,7 +183,7 @@ const char* FieldMask::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx CHK_(ptr); CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.FieldMask.paths")); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } while (::google::protobuf::internal::ExpectTag<10>(ptr)); } else { goto handle_unusual; } @@ -196,7 +199,7 @@ const char* FieldMask::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -209,7 +212,7 @@ const char* FieldMask::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ::uint8_t* FieldMask::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldMask) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -217,14 +220,14 @@ ::uint8_t* FieldMask::_InternalSerialize( // repeated string paths = 1; for (int i = 0, n = this->_internal_paths_size(); i < n; ++i) { const auto& s = this->_internal_paths().Get(i); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - s.data(), static_cast(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.FieldMask.paths"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + s.data(), static_cast(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.FieldMask.paths"); target = stream->WriteString(1, s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldMask) return target; @@ -239,23 +242,23 @@ ::size_t FieldMask::ByteSizeLong() const { (void) cached_has_bits; // repeated string paths = 1; - total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_internal_paths().size()); + total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_paths().size()); for (int i = 0, n = _internal_paths().size(); i < n; ++i) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( _internal_paths().Get(i)); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FieldMask::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData FieldMask::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, FieldMask::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FieldMask::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*FieldMask::GetClassData() const { return &_class_data_; } -void FieldMask::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void FieldMask::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldMask) @@ -264,7 +267,7 @@ void FieldMask::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROT (void) cached_has_bits; _this->_internal_mutable_paths()->MergeFrom(from._internal_paths()); - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void FieldMask::CopyFrom(const FieldMask& from) { @@ -285,18 +288,21 @@ void FieldMask::InternalSwap(FieldMask* other) { other->_internal_mutable_paths()); } -::PROTOBUF_NAMESPACE_ID::Metadata FieldMask::GetMetadata() const { +::google::protobuf::Metadata FieldMask::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_getter, &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_once, file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FieldMask* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FieldMask >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FieldMask >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::FieldMask* +Arena::CreateMaybeMessage< ::google::protobuf::FieldMask >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::FieldMask >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index d01c23d3ac080..1db9f84925f86 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -38,27 +38,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2ffield_5fmask_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class FieldMask; struct FieldMaskDefaultTypeInternal; PROTOBUF_EXPORT extern FieldMaskDefaultTypeInternal _FieldMask_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FieldMask* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FieldMask>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::FieldMask* Arena::CreateMaybeMessage<::google::protobuf::FieldMask>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -66,11 +71,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT FieldMask final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldMask) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldMask) */ { public: inline FieldMask() : FieldMask(nullptr) {} ~FieldMask() override; - explicit PROTOBUF_CONSTEXPR FieldMask(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldMask(::google::protobuf::internal::ConstantInitialized); FieldMask(const FieldMask& from); FieldMask(FieldMask&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT FieldMask final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const FieldMask& default_instance() { @@ -135,7 +140,7 @@ class PROTOBUF_EXPORT FieldMask final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(FieldMask* other) { @@ -146,46 +151,46 @@ class PROTOBUF_EXPORT FieldMask final : // implements Message ---------------------------------------------- - FieldMask* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + FieldMask* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const FieldMask& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const FieldMask& from) { FieldMask::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(FieldMask* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.FieldMask"; } protected: - explicit FieldMask(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit FieldMask(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -214,24 +219,24 @@ class PROTOBUF_EXPORT FieldMask final : void add_paths(const char* value); void add_paths(const char* value, std::size_t size); void add_paths(absl::string_view value); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& paths() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* mutable_paths(); + const ::google::protobuf::RepeatedPtrField& paths() const; + ::google::protobuf::RepeatedPtrField* mutable_paths(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& _internal_paths() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* _internal_mutable_paths(); + const ::google::protobuf::RepeatedPtrField& _internal_paths() const; + ::google::protobuf::RepeatedPtrField* _internal_mutable_paths(); public: // @@protoc_insertion_point(class_scope:google.protobuf.FieldMask) private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField paths_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::RepeatedPtrField paths_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto; @@ -322,20 +327,20 @@ inline void FieldMask::add_paths(absl::string_view value) { _internal_mutable_paths()->Add()->assign(value.data(), value.size()); // @@protoc_insertion_point(field_add_string_piece:google.protobuf.FieldMask.paths) } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& +inline const ::google::protobuf::RepeatedPtrField& FieldMask::paths() const { // @@protoc_insertion_point(field_list:google.protobuf.FieldMask.paths) return _internal_paths(); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* FieldMask::mutable_paths() { +inline ::google::protobuf::RepeatedPtrField* FieldMask::mutable_paths() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldMask.paths) return _internal_mutable_paths(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField& +inline const ::google::protobuf::RepeatedPtrField& FieldMask::_internal_paths() const { return _impl_.paths_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField* +inline ::google::protobuf::RepeatedPtrField* FieldMask::_internal_mutable_paths() { return &_impl_.paths_; } @@ -345,7 +350,8 @@ FieldMask::_internal_mutable_paths() { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 8f6f726a8a11b..68438e73b3ea3 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR SourceContext::SourceContext( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.file_name_)*/ { @@ -36,7 +37,8 @@ struct SourceContextDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceContextDefaultTypeInternal _SourceContext_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto = nullptr; @@ -45,23 +47,23 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceContext, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::SourceContext, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceContext, _impl_.file_name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::SourceContext, _impl_.file_name_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::SourceContext)}, + { 0, -1, -1, sizeof(::google::protobuf::SourceContext)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_._instance, + &::google::protobuf::_SourceContext_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fsource_5fcontext_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n$google/protobuf/source_context.proto\022\017" @@ -107,27 +109,28 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fsource_5fcontext_2eproto(&descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class SourceContext::_Internal { public: }; -SourceContext::SourceContext(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +SourceContext::SourceContext(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceContext) } SourceContext::SourceContext(const SourceContext& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { SourceContext* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.file_name_) {} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.file_name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.file_name_.Set("", GetArenaForAllocation()); @@ -153,7 +156,7 @@ inline void SourceContext::SharedCtor(::_pb::Arena* arena) { SourceContext::~SourceContext() { // @@protoc_insertion_point(destructor:google.protobuf.SourceContext) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -176,7 +179,7 @@ PROTOBUF_NOINLINE void SourceContext::Clear() { (void) cached_has_bits; _impl_.file_name_.ClearToEmpty(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* SourceContext::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -207,7 +210,7 @@ const char* SourceContext::_InternalParse(const char* ptr, ::_pbi::ParseContext* } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -220,7 +223,7 @@ const char* SourceContext::_InternalParse(const char* ptr, ::_pbi::ParseContext* } ::uint8_t* SourceContext::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceContext) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -228,14 +231,14 @@ ::uint8_t* SourceContext::_InternalSerialize( // string file_name = 1; if (!this->_internal_file_name().empty()) { const std::string& _s = this->_internal_file_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.SourceContext.file_name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.SourceContext.file_name"); target = stream->WriteStringMaybeAliased(1, _s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceContext) return target; @@ -251,21 +254,21 @@ ::size_t SourceContext::ByteSizeLong() const { // string file_name = 1; if (!this->_internal_file_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_file_name()); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData SourceContext::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData SourceContext::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, SourceContext::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*SourceContext::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*SourceContext::GetClassData() const { return &_class_data_; } -void SourceContext::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void SourceContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceContext) @@ -276,7 +279,7 @@ void SourceContext::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const :: if (!from._internal_file_name().empty()) { _this->_internal_set_file_name(from._internal_file_name()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void SourceContext::CopyFrom(const SourceContext& from) { @@ -299,18 +302,21 @@ void SourceContext::InternalSwap(SourceContext* other) { &other->_impl_.file_name_, rhs_arena); } -::PROTOBUF_NAMESPACE_ID::Metadata SourceContext::GetMetadata() const { +::google::protobuf::Metadata SourceContext::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_getter, &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_once, file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::SourceContext* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::SourceContext >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::SourceContext >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::SourceContext* +Arena::CreateMaybeMessage< ::google::protobuf::SourceContext >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::SourceContext >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index acd5e2e6f758b..53a95d21c9785 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -38,27 +38,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fsource_5fcontext_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class SourceContext; struct SourceContextDefaultTypeInternal; PROTOBUF_EXPORT extern SourceContextDefaultTypeInternal _SourceContext_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::SourceContext* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::SourceContext* Arena::CreateMaybeMessage<::google::protobuf::SourceContext>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -66,11 +71,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT SourceContext final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceContext) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceContext) */ { public: inline SourceContext() : SourceContext(nullptr) {} ~SourceContext() override; - explicit PROTOBUF_CONSTEXPR SourceContext(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR SourceContext(::google::protobuf::internal::ConstantInitialized); SourceContext(const SourceContext& from); SourceContext(SourceContext&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT SourceContext final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const SourceContext& default_instance() { @@ -135,7 +140,7 @@ class PROTOBUF_EXPORT SourceContext final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(SourceContext* other) { @@ -146,46 +151,46 @@ class PROTOBUF_EXPORT SourceContext final : // implements Message ---------------------------------------------- - SourceContext* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + SourceContext* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const SourceContext& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const SourceContext& from) { SourceContext::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(SourceContext* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.SourceContext"; } protected: - explicit SourceContext(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit SourceContext(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -214,12 +219,12 @@ class PROTOBUF_EXPORT SourceContext final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr file_name_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::internal::ArenaStringPtr file_name_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto; @@ -291,7 +296,8 @@ inline void SourceContext::set_allocated_file_name(std::string* value) { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index ef8d37cda6356..1521e0ad71863 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse( ::_pbi::ConstantInitialized) {} struct Struct_FieldsEntry_DoNotUseDefaultTypeInternal { @@ -74,38 +75,39 @@ struct ListValueDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListValueDefaultTypeInternal _ListValue_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fstruct_2eproto[4]; static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[1]; static constexpr const ::_pb::ServiceDescriptor** file_level_service_descriptors_google_2fprotobuf_2fstruct_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fstruct_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct_FieldsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct_FieldsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, value_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct_FieldsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct_FieldsEntry_DoNotUse, value_), 0, 1, ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct, _impl_.fields_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Struct, _impl_.fields_), ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _internal_metadata_), ~0u, // no _extensions_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _impl_._oneof_case_[0]), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _impl_._oneof_case_[0]), ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ @@ -116,31 +118,31 @@ const ::uint32_t TableStruct_google_2fprotobuf_2fstruct_2eproto::offsets[] PROTO ::_pbi::kInvalidFieldOffsetTag, ::_pbi::kInvalidFieldOffsetTag, ::_pbi::kInvalidFieldOffsetTag, - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _impl_.kind_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _impl_.kind_), ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ListValue, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::ListValue, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ListValue, _impl_.values_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::ListValue, _impl_.values_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, 10, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse)}, - { 12, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Struct)}, - { 21, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Value)}, - { 36, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::ListValue)}, + { 0, 10, -1, sizeof(::google::protobuf::Struct_FieldsEntry_DoNotUse)}, + { 12, -1, -1, sizeof(::google::protobuf::Struct)}, + { 21, -1, -1, sizeof(::google::protobuf::Value)}, + { 36, -1, -1, sizeof(::google::protobuf::ListValue)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Struct_FieldsEntry_DoNotUse_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Struct_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Value_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_ListValue_default_instance_._instance, + &::google::protobuf::_Struct_FieldsEntry_DoNotUse_default_instance_._instance, + &::google::protobuf::_Struct_default_instance_._instance, + &::google::protobuf::_Value_default_instance_._instance, + &::google::protobuf::_ListValue_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fstruct_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\034google/protobuf/struct.proto\022\017google.p" @@ -196,9 +198,10 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fstruct_2eproto(&descriptor_table_google_2fprotobuf_2fstruct_2eproto); -PROTOBUF_NAMESPACE_OPEN -const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* NullValue_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fstruct_2eproto); +namespace google { +namespace protobuf { +const ::google::protobuf::EnumDescriptor* NullValue_descriptor() { + ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fstruct_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[0]; } bool NullValue_IsValid(int value) { @@ -212,12 +215,12 @@ bool NullValue_IsValid(int value) { // =================================================================== Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse() {} -Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena) +Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* arena) : SuperType(arena) {} void Struct_FieldsEntry_DoNotUse::MergeFrom(const Struct_FieldsEntry_DoNotUse& other) { MergeFromInternal(other); } -::PROTOBUF_NAMESPACE_ID::Metadata Struct_FieldsEntry_DoNotUse::GetMetadata() const { +::google::protobuf::Metadata Struct_FieldsEntry_DoNotUse::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once, file_level_metadata_google_2fprotobuf_2fstruct_2eproto[0]); @@ -228,19 +231,19 @@ class Struct::_Internal { public: }; -Struct::Struct(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Struct::Struct(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Struct) } Struct::Struct(const Struct& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Struct* const _this = this; (void)_this; new (&_impl_) Impl_{ /* decltype(_impl_.fields_) */ {} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _this->_impl_.fields_.MergeFrom(from._impl_.fields_); // @@protoc_insertion_point(copy_constructor:google.protobuf.Struct) } @@ -248,7 +251,7 @@ Struct::Struct(const Struct& from) inline void Struct::SharedCtor(::_pb::Arena* arena) { (void)arena; new (&_impl_) Impl_{ - /* decltype(_impl_.fields_) */ { ::PROTOBUF_NAMESPACE_ID::internal::ArenaInitialized(), arena } + /* decltype(_impl_.fields_) */ { ::google::protobuf::internal::ArenaInitialized(), arena } , /*decltype(_impl_._cached_size_)*/{} }; @@ -256,7 +259,7 @@ inline void Struct::SharedCtor(::_pb::Arena* arena) { Struct::~Struct() { // @@protoc_insertion_point(destructor:google.protobuf.Struct) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -279,7 +282,7 @@ PROTOBUF_NOINLINE void Struct::Clear() { (void) cached_has_bits; _impl_.fields_.Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Struct::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -297,7 +300,7 @@ const char* Struct::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(&_impl_.fields_, ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } while (::google::protobuf::internal::ExpectTag<10>(ptr)); } else { goto handle_unusual; } @@ -313,7 +316,7 @@ const char* Struct::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -326,39 +329,39 @@ const char* Struct::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Struct::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Struct) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; // map fields = 1; if (!_internal_fields().empty()) { - using MapType = ::PROTOBUF_NAMESPACE_ID::Map; + using MapType = ::google::protobuf::Map; using WireHelper = Struct_FieldsEntry_DoNotUse::Funcs; const auto& field = _internal_fields(); if (stream->IsSerializationDeterministic() && field.size() > 1) { - for (const auto& entry : ::PROTOBUF_NAMESPACE_ID::internal::MapSorterPtr(field)) { + for (const auto& entry : ::google::protobuf::internal::MapSorterPtr(field)) { target = WireHelper::InternalSerialize( 1, entry.first, entry.second, target, stream); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( entry.first.data(), static_cast(entry.first.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Struct.fields"); + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Struct.fields"); } } else { for (const auto& entry : field) { target = WireHelper::InternalSerialize( 1, entry.first, entry.second, target, stream); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( entry.first.data(), static_cast(entry.first.length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Struct.fields"); + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Struct.fields"); } } } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Struct) return target; @@ -373,7 +376,7 @@ ::size_t Struct::ByteSizeLong() const { (void) cached_has_bits; // map fields = 1; - total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_internal_fields_size()); + total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_fields_size()); for (const auto& entry : _internal_fields()) { total_size += Struct_FieldsEntry_DoNotUse::Funcs::ByteSizeLong(entry.first, entry.second); } @@ -381,14 +384,14 @@ ::size_t Struct::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Struct::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Struct::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Struct::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Struct::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Struct::GetClassData() const { return &_class_data_; } -void Struct::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Struct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Struct) @@ -397,7 +400,7 @@ void Struct::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBU (void) cached_has_bits; _this->_impl_.fields_.MergeFrom(from._impl_.fields_); - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Struct::CopyFrom(const Struct& from) { @@ -417,7 +420,7 @@ void Struct::InternalSwap(Struct* other) { _impl_.fields_.InternalSwap(&other->_impl_.fields_); } -::PROTOBUF_NAMESPACE_ID::Metadata Struct::GetMetadata() const { +::google::protobuf::Metadata Struct::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once, file_level_metadata_google_2fprotobuf_2fstruct_2eproto[1]); @@ -427,25 +430,25 @@ ::PROTOBUF_NAMESPACE_ID::Metadata Struct::GetMetadata() const { class Value::_Internal { public: static constexpr ::int32_t kOneofCaseOffset = - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _impl_._oneof_case_); - static const ::PROTOBUF_NAMESPACE_ID::Struct& struct_value(const Value* msg); - static const ::PROTOBUF_NAMESPACE_ID::ListValue& list_value(const Value* msg); + PROTOBUF_FIELD_OFFSET(::google::protobuf::Value, _impl_._oneof_case_); + static const ::google::protobuf::Struct& struct_value(const Value* msg); + static const ::google::protobuf::ListValue& list_value(const Value* msg); }; -const ::PROTOBUF_NAMESPACE_ID::Struct& Value::_Internal::struct_value(const Value* msg) { +const ::google::protobuf::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 ::google::protobuf::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) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); +void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) { + ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); clear_kind(); if (struct_value) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(struct_value); + ::google::protobuf::Arena* submessage_arena = + ::google::protobuf::Arena::InternalGetOwningArena(struct_value); if (message_arena != submessage_arena) { - struct_value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + struct_value = ::google::protobuf::internal::GetOwnedMessage( message_arena, struct_value, submessage_arena); } set_has_struct_value(); @@ -453,14 +456,14 @@ void Value::set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_v } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.struct_value) } -void Value::set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value) { - ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation(); +void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value) { + ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); clear_kind(); if (list_value) { - ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena = - ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(list_value); + ::google::protobuf::Arena* submessage_arena = + ::google::protobuf::Arena::InternalGetOwningArena(list_value); if (message_arena != submessage_arena) { - list_value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage( + list_value = ::google::protobuf::internal::GetOwnedMessage( message_arena, list_value, submessage_arena); } set_has_list_value(); @@ -468,20 +471,20 @@ void Value::set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_va } // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.list_value) } -Value::Value(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Value::Value(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Value) } Value::Value(const Value& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Value* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.kind_){} , /*decltype(_impl_._cached_size_)*/{} , /*decltype(_impl_._oneof_case_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); clear_has_kind(); switch (from.kind_case()) { case kNullValue: { @@ -501,12 +504,12 @@ Value::Value(const Value& from) break; } case kStructValue: { - _this->_internal_mutable_struct_value()->::PROTOBUF_NAMESPACE_ID::Struct::MergeFrom( + _this->_internal_mutable_struct_value()->::google::protobuf::Struct::MergeFrom( from._internal_struct_value()); break; } case kListValue: { - _this->_internal_mutable_list_value()->::PROTOBUF_NAMESPACE_ID::ListValue::MergeFrom( + _this->_internal_mutable_list_value()->::google::protobuf::ListValue::MergeFrom( from._internal_list_value()); break; } @@ -529,7 +532,7 @@ inline void Value::SharedCtor(::_pb::Arena* arena) { Value::~Value() { // @@protoc_insertion_point(destructor:google.protobuf.Value) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -593,7 +596,7 @@ PROTOBUF_NOINLINE void Value::Clear() { (void) cached_has_bits; clear_kind(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -605,9 +608,9 @@ const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.NullValue null_value = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_null_value(static_cast<::PROTOBUF_NAMESPACE_ID::NullValue>(val)); + _internal_set_null_value(static_cast<::google::protobuf::NullValue>(val)); } else { goto handle_unusual; } @@ -615,7 +618,7 @@ const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // double number_value = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 17)) { - _internal_set_number_value(::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad(ptr)); + _internal_set_number_value(::google::protobuf::internal::UnalignedLoad(ptr)); ptr += sizeof(double); } else { goto handle_unusual; @@ -635,7 +638,7 @@ const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // bool bool_value = 4; case 4: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 32)) { - _internal_set_bool_value(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr)); + _internal_set_bool_value(::google::protobuf::internal::ReadVarint64(&ptr)); CHK_(ptr); } else { goto handle_unusual; @@ -670,7 +673,7 @@ const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -683,7 +686,7 @@ const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Value::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Value) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -703,8 +706,8 @@ ::uint8_t* Value::_InternalSerialize( } case kStringValue: { const std::string& _s = this->_internal_string_value(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Value.string_value"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Value.string_value"); target = stream->WriteStringMaybeAliased(3, _s, target); break; } @@ -715,13 +718,13 @@ ::uint8_t* Value::_InternalSerialize( break; } case kStructValue: { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(5, _Internal::struct_value(this), _Internal::struct_value(this).GetCachedSize(), target, stream); break; } case kListValue: { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(6, _Internal::list_value(this), _Internal::list_value(this).GetCachedSize(), target, stream); break; @@ -730,7 +733,7 @@ ::uint8_t* Value::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Value) return target; @@ -758,7 +761,7 @@ ::size_t Value::ByteSizeLong() const { } // string string_value = 3; case kStringValue: { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_string_value()); break; } @@ -770,14 +773,14 @@ ::size_t Value::ByteSizeLong() const { // .google.protobuf.Struct struct_value = 5; case kStructValue: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *_impl_.kind_.struct_value_); break; } // .google.protobuf.ListValue list_value = 6; case kListValue: { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *_impl_.kind_.list_value_); break; } @@ -788,14 +791,14 @@ ::size_t Value::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Value::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Value::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Value::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Value::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Value::GetClassData() const { return &_class_data_; } -void Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Value) @@ -821,12 +824,12 @@ void Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF break; } case kStructValue: { - _this->_internal_mutable_struct_value()->::PROTOBUF_NAMESPACE_ID::Struct::MergeFrom( + _this->_internal_mutable_struct_value()->::google::protobuf::Struct::MergeFrom( from._internal_struct_value()); break; } case kListValue: { - _this->_internal_mutable_list_value()->::PROTOBUF_NAMESPACE_ID::ListValue::MergeFrom( + _this->_internal_mutable_list_value()->::google::protobuf::ListValue::MergeFrom( from._internal_list_value()); break; } @@ -834,7 +837,7 @@ void Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF break; } } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Value::CopyFrom(const Value& from) { @@ -855,7 +858,7 @@ void Value::InternalSwap(Value* other) { swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]); } -::PROTOBUF_NAMESPACE_ID::Metadata Value::GetMetadata() const { +::google::protobuf::Metadata Value::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once, file_level_metadata_google_2fprotobuf_2fstruct_2eproto[2]); @@ -866,19 +869,19 @@ class ListValue::_Internal { public: }; -ListValue::ListValue(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +ListValue::ListValue(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.ListValue) } ListValue::ListValue(const ListValue& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { ListValue* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.values_){from._impl_.values_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.ListValue) } @@ -892,7 +895,7 @@ inline void ListValue::SharedCtor(::_pb::Arena* arena) { ListValue::~ListValue() { // @@protoc_insertion_point(destructor:google.protobuf.ListValue) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -915,7 +918,7 @@ PROTOBUF_NOINLINE void ListValue::Clear() { (void) cached_has_bits; _internal_mutable_values()->Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* ListValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -933,7 +936,7 @@ const char* ListValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx ptr = ctx->ParseMessage(_internal_mutable_values()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr)); + } while (::google::protobuf::internal::ExpectTag<10>(ptr)); } else { goto handle_unusual; } @@ -949,7 +952,7 @@ const char* ListValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -962,7 +965,7 @@ const char* ListValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ::uint8_t* ListValue::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ListValue) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -971,13 +974,13 @@ ::uint8_t* ListValue::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_values_size()); i < n; i++) { const auto& repfield = this->_internal_values().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ListValue) return target; @@ -995,20 +998,20 @@ ::size_t ListValue::ByteSizeLong() const { total_size += 1UL * this->_internal_values_size(); for (const auto& msg : this->_internal_values()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ListValue::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData ListValue::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, ListValue::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ListValue::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*ListValue::GetClassData() const { return &_class_data_; } -void ListValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void ListValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ListValue) @@ -1017,7 +1020,7 @@ void ListValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROT (void) cached_has_bits; _this->_internal_mutable_values()->MergeFrom(from._internal_values()); - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void ListValue::CopyFrom(const ListValue& from) { @@ -1037,30 +1040,33 @@ void ListValue::InternalSwap(ListValue* other) { _internal_mutable_values()->InternalSwap(other->_internal_mutable_values()); } -::PROTOBUF_NAMESPACE_ID::Metadata ListValue::GetMetadata() const { +::google::protobuf::Metadata ListValue::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once, file_level_metadata_google_2fprotobuf_2fstruct_2eproto[3]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Struct_FieldsEntry_DoNotUse* +Arena::CreateMaybeMessage< ::google::protobuf::Struct_FieldsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Struct_FieldsEntry_DoNotUse >(arena); } -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Struct* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Struct >(arena); +template<> PROTOBUF_NOINLINE ::google::protobuf::Struct* +Arena::CreateMaybeMessage< ::google::protobuf::Struct >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Struct >(arena); } -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Value* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Value >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Value >(arena); +template<> PROTOBUF_NOINLINE ::google::protobuf::Value* +Arena::CreateMaybeMessage< ::google::protobuf::Value >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Value >(arena); } -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::ListValue* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ListValue >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::ListValue >(arena); +template<> PROTOBUF_NOINLINE ::google::protobuf::ListValue* +Arena::CreateMaybeMessage< ::google::protobuf::ListValue >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::ListValue >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index f29d205202abf..b6d3f565dc6c4 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -42,19 +42,22 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fstruct_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fstruct_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fstruct_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class ListValue; struct ListValueDefaultTypeInternal; PROTOBUF_EXPORT extern ListValueDefaultTypeInternal _ListValue_default_instance_; @@ -68,16 +71,18 @@ class Value; struct ValueDefaultTypeInternal; PROTOBUF_EXPORT extern ValueDefaultTypeInternal _Value_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::ListValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ListValue>(Arena*); +PROTOBUF_EXPORT ::google::protobuf::ListValue* Arena::CreateMaybeMessage<::google::protobuf::ListValue>(Arena*); template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Struct* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Struct>(Arena*); +PROTOBUF_EXPORT ::google::protobuf::Struct* Arena::CreateMaybeMessage<::google::protobuf::Struct>(Arena*); template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse>(Arena*); +PROTOBUF_EXPORT ::google::protobuf::Struct_FieldsEntry_DoNotUse* Arena::CreateMaybeMessage<::google::protobuf::Struct_FieldsEntry_DoNotUse>(Arena*); template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Value>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Value* Arena::CreateMaybeMessage<::google::protobuf::Value>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { enum NullValue : int { NULL_VALUE = 0, NullValue_INT_MIN_SENTINEL_DO_NOT_USE_ = @@ -90,7 +95,7 @@ PROTOBUF_EXPORT bool NullValue_IsValid(int value); constexpr NullValue NullValue_MIN = static_cast(0); constexpr NullValue NullValue_MAX = static_cast(0); constexpr int NullValue_ARRAYSIZE = 0 + 1; -PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* +PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* NullValue_descriptor(); template const std::string& NullValue_Name(T value) { @@ -101,12 +106,12 @@ const std::string& NullValue_Name(T value) { } template <> inline const std::string& NullValue_Name(NullValue value) { - return ::PROTOBUF_NAMESPACE_ID::internal::NameOfDenseEnum( static_cast(value)); } inline bool NullValue_Parse(absl::string_view name, NullValue* value) { - return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum( + return ::google::protobuf::internal::ParseNamedEnum( NullValue_descriptor(), name, value); } @@ -115,37 +120,37 @@ inline bool NullValue_Parse(absl::string_view name, NullValue* value) { // ------------------------------------------------------------------- -class Struct_FieldsEntry_DoNotUse final : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry { +class Struct_FieldsEntry_DoNotUse final : public ::google::protobuf::internal::MapEntry { public: - typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry SuperType; + typedef ::google::protobuf::internal::MapEntry SuperType; Struct_FieldsEntry_DoNotUse(); explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse( - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); - explicit Struct_FieldsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena); + ::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 bool ValidateKey(std::string* s) { - return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key"); + return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key"); } static bool ValidateValue(void*) { return true; } - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + using ::google::protobuf::Message::MergeFrom; + ::google::protobuf::Metadata GetMetadata() const final; friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto; }; // ------------------------------------------------------------------- class PROTOBUF_EXPORT Struct final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ { public: inline Struct() : Struct(nullptr) {} ~Struct() override; - explicit PROTOBUF_CONSTEXPR Struct(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Struct(::google::protobuf::internal::ConstantInitialized); Struct(const Struct& from); Struct(Struct&& from) noexcept @@ -171,20 +176,20 @@ class PROTOBUF_EXPORT Struct final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Struct& default_instance() { @@ -210,7 +215,7 @@ class PROTOBUF_EXPORT Struct final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Struct* other) { @@ -221,46 +226,46 @@ class PROTOBUF_EXPORT Struct final : // implements Message ---------------------------------------------- - Struct* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Struct* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Struct& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Struct& from) { Struct::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Struct* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Struct"; } protected: - explicit Struct(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Struct(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -277,38 +282,38 @@ class PROTOBUF_EXPORT Struct final : public: void clear_fields() ; - const ::PROTOBUF_NAMESPACE_ID::Map& fields() const; - ::PROTOBUF_NAMESPACE_ID::Map* mutable_fields(); + const ::google::protobuf::Map& fields() const; + ::google::protobuf::Map* mutable_fields(); private: - const ::PROTOBUF_NAMESPACE_ID::Map& _internal_fields() const; - ::PROTOBUF_NAMESPACE_ID::Map* _internal_mutable_fields(); + const ::google::protobuf::Map& _internal_fields() const; + ::google::protobuf::Map* _internal_mutable_fields(); public: // @@protoc_insertion_point(class_scope:google.protobuf.Struct) private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::internal::MapField + ::google::protobuf::internal::MapField fields_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto; };// ------------------------------------------------------------------- class PROTOBUF_EXPORT Value final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ { public: inline Value() : Value(nullptr) {} ~Value() override; - explicit PROTOBUF_CONSTEXPR Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Value(::google::protobuf::internal::ConstantInitialized); Value(const Value& from); Value(Value&& from) noexcept @@ -334,20 +339,20 @@ class PROTOBUF_EXPORT Value final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Value& default_instance() { @@ -383,7 +388,7 @@ class PROTOBUF_EXPORT Value final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Value* other) { @@ -394,46 +399,46 @@ class PROTOBUF_EXPORT Value final : // implements Message ---------------------------------------------- - Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Value* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Value& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Value& from) { Value::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Value* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Value"; } protected: - explicit Value(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Value(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -450,12 +455,12 @@ class PROTOBUF_EXPORT Value final : // .google.protobuf.NullValue null_value = 1; bool has_null_value() const; void clear_null_value() ; - ::PROTOBUF_NAMESPACE_ID::NullValue null_value() const; - void set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value); + ::google::protobuf::NullValue null_value() const; + void set_null_value(::google::protobuf::NullValue value); private: - ::PROTOBUF_NAMESPACE_ID::NullValue _internal_null_value() const; - void _internal_set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value); + ::google::protobuf::NullValue _internal_null_value() const; + void _internal_set_null_value(::google::protobuf::NullValue value); public: // double number_value = 2; @@ -504,16 +509,16 @@ class PROTOBUF_EXPORT Value final : public: void clear_struct_value() ; - 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* value); - void unsafe_arena_set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* value); - ::PROTOBUF_NAMESPACE_ID::Struct* unsafe_arena_release_struct_value(); + const ::google::protobuf::Struct& struct_value() const; + PROTOBUF_NODISCARD ::google::protobuf::Struct* release_struct_value(); + ::google::protobuf::Struct* mutable_struct_value(); + void set_allocated_struct_value(::google::protobuf::Struct* value); + void unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* value); + ::google::protobuf::Struct* unsafe_arena_release_struct_value(); private: - const ::PROTOBUF_NAMESPACE_ID::Struct& _internal_struct_value() const; - ::PROTOBUF_NAMESPACE_ID::Struct* _internal_mutable_struct_value(); + const ::google::protobuf::Struct& _internal_struct_value() const; + ::google::protobuf::Struct* _internal_mutable_struct_value(); public: // .google.protobuf.ListValue list_value = 6; @@ -523,16 +528,16 @@ class PROTOBUF_EXPORT Value final : public: void clear_list_value() ; - 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* value); - void unsafe_arena_set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* value); - ::PROTOBUF_NAMESPACE_ID::ListValue* unsafe_arena_release_list_value(); + const ::google::protobuf::ListValue& list_value() const; + PROTOBUF_NODISCARD ::google::protobuf::ListValue* release_list_value(); + ::google::protobuf::ListValue* mutable_list_value(); + void set_allocated_list_value(::google::protobuf::ListValue* value); + void unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* value); + ::google::protobuf::ListValue* unsafe_arena_release_list_value(); private: - const ::PROTOBUF_NAMESPACE_ID::ListValue& _internal_list_value() const; - ::PROTOBUF_NAMESPACE_ID::ListValue* _internal_mutable_list_value(); + const ::google::protobuf::ListValue& _internal_list_value() const; + ::google::protobuf::ListValue* _internal_mutable_list_value(); public: void clear_kind(); @@ -550,21 +555,21 @@ class PROTOBUF_EXPORT Value final : inline bool has_kind() const; inline void clear_has_kind(); - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { union KindUnion { constexpr KindUnion() : _constinit_{} {} - ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_; + ::google::protobuf::internal::ConstantInitialized _constinit_; int null_value_; double number_value_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr string_value_; + ::google::protobuf::internal::ArenaStringPtr string_value_; bool bool_value_; - ::PROTOBUF_NAMESPACE_ID::Struct* struct_value_; - ::PROTOBUF_NAMESPACE_ID::ListValue* list_value_; + ::google::protobuf::Struct* struct_value_; + ::google::protobuf::ListValue* list_value_; } kind_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; ::uint32_t _oneof_case_[1]; }; @@ -573,11 +578,11 @@ class PROTOBUF_EXPORT Value final : };// ------------------------------------------------------------------- class PROTOBUF_EXPORT ListValue final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ { public: inline ListValue() : ListValue(nullptr) {} ~ListValue() override; - explicit PROTOBUF_CONSTEXPR ListValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ListValue(::google::protobuf::internal::ConstantInitialized); ListValue(const ListValue& from); ListValue(ListValue&& from) noexcept @@ -603,20 +608,20 @@ class PROTOBUF_EXPORT ListValue final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const ListValue& default_instance() { @@ -642,7 +647,7 @@ class PROTOBUF_EXPORT ListValue final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(ListValue* other) { @@ -653,46 +658,46 @@ class PROTOBUF_EXPORT ListValue final : // implements Message ---------------------------------------------- - ListValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + ListValue* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const ListValue& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const ListValue& from) { ListValue::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(ListValue* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.ListValue"; } protected: - explicit ListValue(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit ListValue(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -708,27 +713,27 @@ class PROTOBUF_EXPORT ListValue final : public: void clear_values() ; - ::PROTOBUF_NAMESPACE_ID::Value* mutable_values(int index); - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >* + ::google::protobuf::Value* mutable_values(int index); + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* mutable_values(); private: - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Value>& _internal_values() const; - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Value>* _internal_mutable_values(); + const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& _internal_values() const; + ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* _internal_mutable_values(); public: - const ::PROTOBUF_NAMESPACE_ID::Value& values(int index) const; - ::PROTOBUF_NAMESPACE_ID::Value* add_values(); - const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >& + const ::google::protobuf::Value& values(int index) const; + ::google::protobuf::Value* add_values(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& values() const; // @@protoc_insertion_point(class_scope:google.protobuf.ListValue) private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { - ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value > values_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value > values_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto; @@ -762,17 +767,17 @@ inline int Struct::fields_size() const { inline void Struct::clear_fields() { _impl_.fields_.Clear(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map& Struct::_internal_fields() const { +inline const ::google::protobuf::Map& Struct::_internal_fields() const { return _impl_.fields_.GetMap(); } -inline const ::PROTOBUF_NAMESPACE_ID::Map& Struct::fields() const { +inline const ::google::protobuf::Map& Struct::fields() const { // @@protoc_insertion_point(field_map:google.protobuf.Struct.fields) return _internal_fields(); } -inline ::PROTOBUF_NAMESPACE_ID::Map* Struct::_internal_mutable_fields() { +inline ::google::protobuf::Map* Struct::_internal_mutable_fields() { return _impl_.fields_.MutableMap(); } -inline ::PROTOBUF_NAMESPACE_ID::Map* Struct::mutable_fields() { +inline ::google::protobuf::Map* Struct::mutable_fields() { // @@protoc_insertion_point(field_mutable_map:google.protobuf.Struct.fields) return _internal_mutable_fields(); } @@ -794,21 +799,21 @@ inline void Value::clear_null_value() { clear_has_kind(); } } -inline ::PROTOBUF_NAMESPACE_ID::NullValue Value::null_value() const { +inline ::google::protobuf::NullValue Value::null_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.null_value) return _internal_null_value(); } -inline void Value::set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value) { +inline void Value::set_null_value(::google::protobuf::NullValue value) { _internal_set_null_value(value); // @@protoc_insertion_point(field_set:google.protobuf.Value.null_value) } -inline ::PROTOBUF_NAMESPACE_ID::NullValue Value::_internal_null_value() const { +inline ::google::protobuf::NullValue Value::_internal_null_value() const { if (kind_case() == kNullValue) { - return static_cast<::PROTOBUF_NAMESPACE_ID::NullValue>(_impl_.kind_.null_value_); + return static_cast<::google::protobuf::NullValue>(_impl_.kind_.null_value_); } - return static_cast<::PROTOBUF_NAMESPACE_ID::NullValue>(0); + return static_cast<::google::protobuf::NullValue>(0); } -inline void Value::_internal_set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value) { +inline void Value::_internal_set_null_value(::google::protobuf::NullValue value) { if (kind_case() != kNullValue) { clear_kind(); set_has_null_value(); @@ -887,7 +892,7 @@ inline std::string* Value::mutable_string_value() { } inline const std::string& Value::_internal_string_value() const { if (kind_case() != kStringValue) { - return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(); + return ::google::protobuf::internal::GetEmptyStringAlreadyInited(); } return _impl_.kind_.string_value_.Get(); } @@ -981,13 +986,13 @@ inline void Value::clear_struct_value() { clear_has_kind(); } } -inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::release_struct_value() { +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(); - ::PROTOBUF_NAMESPACE_ID::Struct* temp = _impl_.kind_.struct_value_; + ::google::protobuf::Struct* temp = _impl_.kind_.struct_value_; if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } _impl_.kind_.struct_value_ = nullptr; return temp; @@ -995,27 +1000,27 @@ inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::release_struct_value() { return nullptr; } } -inline const ::PROTOBUF_NAMESPACE_ID::Struct& Value::_internal_struct_value() const { +inline const ::google::protobuf::Struct& Value::_internal_struct_value() const { return kind_case() == kStructValue ? *_impl_.kind_.struct_value_ - : reinterpret_cast<::PROTOBUF_NAMESPACE_ID::Struct&>(::PROTOBUF_NAMESPACE_ID::_Struct_default_instance_); + : reinterpret_cast<::google::protobuf::Struct&>(::google::protobuf::_Struct_default_instance_); } -inline const ::PROTOBUF_NAMESPACE_ID::Struct& Value::struct_value() const { +inline const ::google::protobuf::Struct& Value::struct_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.struct_value) return _internal_struct_value(); } -inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::unsafe_arena_release_struct_value() { +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(); - ::PROTOBUF_NAMESPACE_ID::Struct* temp = _impl_.kind_.struct_value_; + ::google::protobuf::Struct* temp = _impl_.kind_.struct_value_; _impl_.kind_.struct_value_ = nullptr; return temp; } else { return nullptr; } } -inline void Value::unsafe_arena_set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value) { +inline void Value::unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* struct_value) { clear_kind(); if (struct_value) { set_has_struct_value(); @@ -1023,16 +1028,16 @@ inline void Value::unsafe_arena_set_allocated_struct_value(::PROTOBUF_NAMESPACE_ } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.struct_value) } -inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::_internal_mutable_struct_value() { +inline ::google::protobuf::Struct* Value::_internal_mutable_struct_value() { if (kind_case() != kStructValue) { clear_kind(); set_has_struct_value(); - _impl_.kind_.struct_value_ = CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct >(GetArenaForAllocation()); + _impl_.kind_.struct_value_ = CreateMaybeMessage< ::google::protobuf::Struct >(GetArenaForAllocation()); } return _impl_.kind_.struct_value_; } -inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::mutable_struct_value() { - ::PROTOBUF_NAMESPACE_ID::Struct* _msg = _internal_mutable_struct_value(); +inline ::google::protobuf::Struct* Value::mutable_struct_value() { + ::google::protobuf::Struct* _msg = _internal_mutable_struct_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Value.struct_value) return _msg; } @@ -1055,13 +1060,13 @@ inline void Value::clear_list_value() { clear_has_kind(); } } -inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::release_list_value() { +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(); - ::PROTOBUF_NAMESPACE_ID::ListValue* temp = _impl_.kind_.list_value_; + ::google::protobuf::ListValue* temp = _impl_.kind_.list_value_; if (GetArenaForAllocation() != nullptr) { - temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp); + temp = ::google::protobuf::internal::DuplicateIfNonNull(temp); } _impl_.kind_.list_value_ = nullptr; return temp; @@ -1069,27 +1074,27 @@ inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::release_list_value() { return nullptr; } } -inline const ::PROTOBUF_NAMESPACE_ID::ListValue& Value::_internal_list_value() const { +inline const ::google::protobuf::ListValue& Value::_internal_list_value() const { return kind_case() == kListValue ? *_impl_.kind_.list_value_ - : reinterpret_cast<::PROTOBUF_NAMESPACE_ID::ListValue&>(::PROTOBUF_NAMESPACE_ID::_ListValue_default_instance_); + : reinterpret_cast<::google::protobuf::ListValue&>(::google::protobuf::_ListValue_default_instance_); } -inline const ::PROTOBUF_NAMESPACE_ID::ListValue& Value::list_value() const { +inline const ::google::protobuf::ListValue& Value::list_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.list_value) return _internal_list_value(); } -inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::unsafe_arena_release_list_value() { +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(); - ::PROTOBUF_NAMESPACE_ID::ListValue* temp = _impl_.kind_.list_value_; + ::google::protobuf::ListValue* temp = _impl_.kind_.list_value_; _impl_.kind_.list_value_ = nullptr; return temp; } else { return nullptr; } } -inline void Value::unsafe_arena_set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value) { +inline void Value::unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* list_value) { clear_kind(); if (list_value) { set_has_list_value(); @@ -1097,16 +1102,16 @@ inline void Value::unsafe_arena_set_allocated_list_value(::PROTOBUF_NAMESPACE_ID } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.list_value) } -inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::_internal_mutable_list_value() { +inline ::google::protobuf::ListValue* Value::_internal_mutable_list_value() { if (kind_case() != kListValue) { clear_kind(); set_has_list_value(); - _impl_.kind_.list_value_ = CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ListValue >(GetArenaForAllocation()); + _impl_.kind_.list_value_ = CreateMaybeMessage< ::google::protobuf::ListValue >(GetArenaForAllocation()); } return _impl_.kind_.list_value_; } -inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::mutable_list_value() { - ::PROTOBUF_NAMESPACE_ID::ListValue* _msg = _internal_mutable_list_value(); +inline ::google::protobuf::ListValue* Value::mutable_list_value() { + ::google::protobuf::ListValue* _msg = _internal_mutable_list_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Value.list_value) return _msg; } @@ -1134,34 +1139,34 @@ inline int ListValue::values_size() const { inline void ListValue::clear_values() { _internal_mutable_values()->Clear(); } -inline ::PROTOBUF_NAMESPACE_ID::Value* ListValue::mutable_values(int index) { +inline ::google::protobuf::Value* ListValue::mutable_values(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.ListValue.values) return _internal_mutable_values()->Mutable(index); } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >* +inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* ListValue::mutable_values() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values) return _internal_mutable_values(); } -inline const ::PROTOBUF_NAMESPACE_ID::Value& ListValue::values(int index) const { +inline const ::google::protobuf::Value& ListValue::values(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.ListValue.values) return _internal_values().Get(index); } -inline ::PROTOBUF_NAMESPACE_ID::Value* ListValue::add_values() { - ::PROTOBUF_NAMESPACE_ID::Value* _add = _internal_mutable_values()->Add(); +inline ::google::protobuf::Value* ListValue::add_values() { + ::google::protobuf::Value* _add = _internal_mutable_values()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values) return _add; } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >& +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& ListValue::values() const { // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values) return _internal_values(); } -inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Value>& +inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& ListValue::_internal_values() const { return _impl_.values_; } -inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::Value>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* ListValue::_internal_mutable_values() { return &_impl_.values_; } @@ -1171,19 +1176,22 @@ ListValue::_internal_mutable_values() { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { template <> -struct is_proto_enum<::PROTOBUF_NAMESPACE_ID::NullValue> : std::true_type {}; +struct is_proto_enum<::google::protobuf::NullValue> : std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor<::PROTOBUF_NAMESPACE_ID::NullValue>() { - return ::PROTOBUF_NAMESPACE_ID::NullValue_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor<::google::protobuf::NullValue>() { + return ::google::protobuf::NullValue_descriptor(); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index ef87470dd081e..6c42a717fbb5a 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Timestamp::Timestamp( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.seconds_)*/ ::int64_t{0} @@ -36,7 +37,8 @@ struct TimestampDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TimestampDefaultTypeInternal _Timestamp_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto[1]; static constexpr const ::_pb::EnumDescriptor** file_level_enum_descriptors_google_2fprotobuf_2ftimestamp_2eproto = nullptr; @@ -45,24 +47,24 @@ static constexpr const ::_pb::ServiceDescriptor** const ::uint32_t TableStruct_google_2fprotobuf_2ftimestamp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Timestamp, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _impl_.seconds_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _impl_.nanos_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Timestamp, _impl_.seconds_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Timestamp, _impl_.nanos_), }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Timestamp)}, + { 0, -1, -1, sizeof(::google::protobuf::Timestamp)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Timestamp_default_instance_._instance, + &::google::protobuf::_Timestamp_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2ftimestamp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\037google/protobuf/timestamp.proto\022\017googl" @@ -108,21 +110,22 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ftimestamp_2eproto(&descriptor_table_google_2fprotobuf_2ftimestamp_2eproto); -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== class Timestamp::_Internal { public: }; -Timestamp::Timestamp(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Timestamp::Timestamp(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Timestamp) } Timestamp::Timestamp(const Timestamp& from) - : ::PROTOBUF_NAMESPACE_ID::Message(), _impl_(from._impl_) { - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>( + : ::google::protobuf::Message(), _impl_(from._impl_) { + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.Timestamp) } @@ -140,7 +143,7 @@ inline void Timestamp::SharedCtor(::_pb::Arena* arena) { Timestamp::~Timestamp() { // @@protoc_insertion_point(destructor:google.protobuf.Timestamp) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -164,7 +167,7 @@ PROTOBUF_NOINLINE void Timestamp::Clear() { ::memset(&_impl_.seconds_, 0, static_cast<::size_t>( reinterpret_cast(&_impl_.nanos_) - reinterpret_cast(&_impl_.seconds_)) + sizeof(_impl_.nanos_)); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -176,7 +179,7 @@ const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx // int64 seconds = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) { - _impl_.seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.seconds_ = ::google::protobuf::internal::ReadVarint64(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -185,7 +188,7 @@ const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx // int32 nanos = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 16)) { - _impl_.nanos_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.nanos_ = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -202,7 +205,7 @@ const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -215,28 +218,28 @@ const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ::uint8_t* Timestamp::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Timestamp) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; // int64 seconds = 1; if (this->_internal_seconds() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt64ToArrayWithField<1>( stream, this->_internal_seconds(), target); } // int32 nanos = 2; if (this->_internal_nanos() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt32ToArrayWithField<2>( stream, this->_internal_nanos(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Timestamp) return target; @@ -265,14 +268,14 @@ ::size_t Timestamp::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Timestamp::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Timestamp::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Timestamp::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Timestamp::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Timestamp::GetClassData() const { return &_class_data_; } -void Timestamp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Timestamp::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Timestamp) @@ -286,7 +289,7 @@ void Timestamp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROT if (from._internal_nanos() != 0) { _this->_internal_set_nanos(from._internal_nanos()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Timestamp::CopyFrom(const Timestamp& from) { @@ -303,7 +306,7 @@ PROTOBUF_NOINLINE bool Timestamp::IsInitialized() const { void Timestamp::InternalSwap(Timestamp* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Timestamp, _impl_.nanos_) + sizeof(Timestamp::_impl_.nanos_) - PROTOBUF_FIELD_OFFSET(Timestamp, _impl_.seconds_)>( @@ -311,18 +314,21 @@ void Timestamp::InternalSwap(Timestamp* other) { reinterpret_cast(&other->_impl_.seconds_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Timestamp::GetMetadata() const { +::google::protobuf::Metadata Timestamp::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_once, file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto[0]); } // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE -PROTOBUF_NAMESPACE_OPEN -template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Timestamp* -Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Timestamp >(Arena* arena) { - return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Timestamp >(arena); +} // namespace protobuf +} // namespace google +namespace google { +namespace protobuf { +template<> PROTOBUF_NOINLINE ::google::protobuf::Timestamp* +Arena::CreateMaybeMessage< ::google::protobuf::Timestamp >(Arena* arena) { + return Arena::CreateMessageInternal< ::google::protobuf::Timestamp >(arena); } -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) #include "google/protobuf/port_undef.inc" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index cd6cb62f3e098..833b1b1491364 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -38,27 +38,32 @@ #define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2ftimestamp_2eproto PROTOBUF_EXPORT -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { namespace internal { class AnyMetadata; } // namespace internal -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // Internal implementation detail -- do not use these members. struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ftimestamp_2eproto { static const ::uint32_t offsets[]; }; -PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ftimestamp_2eproto; -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { class Timestamp; struct TimestampDefaultTypeInternal; PROTOBUF_EXPORT extern TimestampDefaultTypeInternal _Timestamp_default_instance_; template <> -PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Timestamp* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Timestamp>(Arena*); -PROTOBUF_NAMESPACE_CLOSE +PROTOBUF_EXPORT ::google::protobuf::Timestamp* Arena::CreateMaybeMessage<::google::protobuf::Timestamp>(Arena*); +} // namespace protobuf +} // namespace google -PROTOBUF_NAMESPACE_OPEN +namespace google { +namespace protobuf { // =================================================================== @@ -66,11 +71,11 @@ PROTOBUF_NAMESPACE_OPEN // ------------------------------------------------------------------- class PROTOBUF_EXPORT Timestamp final : - public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Timestamp) */ { + public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Timestamp) */ { public: inline Timestamp() : Timestamp(nullptr) {} ~Timestamp() override; - explicit PROTOBUF_CONSTEXPR Timestamp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Timestamp(::google::protobuf::internal::ConstantInitialized); Timestamp(const Timestamp& from); Timestamp(Timestamp&& from) noexcept @@ -96,20 +101,20 @@ class PROTOBUF_EXPORT Timestamp final : return *this; } - inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const { - return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance); + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() { - return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* descriptor() { return GetDescriptor(); } - static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* GetReflection() { return default_instance().GetMetadata().reflection; } static const Timestamp& default_instance() { @@ -135,7 +140,7 @@ class PROTOBUF_EXPORT Timestamp final : #endif // !PROTOBUF_FORCE_COPY_IN_SWAP InternalSwap(other); } else { - ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other); + ::google::protobuf::internal::GenericSwap(this, other); } } void UnsafeArenaSwap(Timestamp* other) { @@ -146,46 +151,46 @@ class PROTOBUF_EXPORT Timestamp final : // implements Message ---------------------------------------------- - Timestamp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { + Timestamp* New(::google::protobuf::Arena* arena = nullptr) const final { return CreateMaybeMessage(arena); } - using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; + using ::google::protobuf::Message::CopyFrom; void CopyFrom(const Timestamp& from); - using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + using ::google::protobuf::Message::MergeFrom; void MergeFrom( const Timestamp& from) { Timestamp::MergeImpl(*this, from); } private: - static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg); public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; ::size_t ByteSizeLong() const final; - const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final; + const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final; ::uint8_t* _InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final; + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final; int GetCachedSize() const final { return _impl_._cached_size_.Get(); } private: - void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena); + void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void SetCachedSize(int size) const final; void InternalSwap(Timestamp* other); private: - friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata; + friend class ::google::protobuf::internal::AnyMetadata; static ::absl::string_view FullMessageName() { return "google.protobuf.Timestamp"; } protected: - explicit Timestamp(::PROTOBUF_NAMESPACE_ID::Arena* arena); + explicit Timestamp(::google::protobuf::Arena* arena); public: static const ClassData _class_data_; - const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + const ::google::protobuf::Message::ClassData*GetClassData() const final; - ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; + ::google::protobuf::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -219,13 +224,13 @@ class PROTOBUF_EXPORT Timestamp final : private: class _Internal; - template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; + template friend class ::google::protobuf::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; struct Impl_ { ::int64_t seconds_; ::int32_t nanos_; - mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; + mutable ::google::protobuf::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; friend struct ::TableStruct_google_2fprotobuf_2ftimestamp_2eproto; @@ -292,7 +297,8 @@ inline void Timestamp::_internal_set_nanos(::int32_t value) { #endif // __GNUC__ // @@protoc_insertion_point(namespace_scope) -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google // @@protoc_insertion_point(global_scope) diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 0a83b6b065169..e3b3f6b20a50e 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -16,9 +16,10 @@ // Must be included last. #include "google/protobuf/port_def.inc" PROTOBUF_PRAGMA_INIT_SEG -namespace _pb = ::PROTOBUF_NAMESPACE_ID; -namespace _pbi = ::PROTOBUF_NAMESPACE_ID::internal; -PROTOBUF_NAMESPACE_OPEN +namespace _pb = ::google::protobuf; +namespace _pbi = ::google::protobuf::internal; +namespace google { +namespace protobuf { PROTOBUF_CONSTEXPR Type::Type( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_._has_bits_)*/{} @@ -153,28 +154,29 @@ struct OptionDefaultTypeInternal { PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OptionDefaultTypeInternal _Option_default_instance_; -PROTOBUF_NAMESPACE_CLOSE +} // namespace protobuf +} // namespace google static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftype_2eproto[5]; static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[3]; static constexpr const ::_pb::ServiceDescriptor** file_level_service_descriptors_google_2fprotobuf_2ftype_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2ftype_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE( protodesc_cold) = { - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.fields_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.oneofs_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.source_context_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.syntax_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.edition_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.fields_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.oneofs_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.source_context_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.syntax_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Type, _impl_.edition_), ~0u, ~0u, ~0u, @@ -183,37 +185,37 @@ const ::uint32_t TableStruct_google_2fprotobuf_2ftype_2eproto::offsets[] PROTOBU ~0u, ~0u, ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.kind_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.cardinality_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.number_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.type_url_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.oneof_index_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.packed_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.json_name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.default_value_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.kind_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.cardinality_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.number_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.type_url_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.oneof_index_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.packed_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.json_name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Field, _impl_.default_value_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.enumvalue_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.source_context_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.syntax_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.edition_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.enumvalue_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.source_context_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.syntax_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Enum, _impl_.edition_), ~0u, ~0u, ~0u, @@ -221,45 +223,45 @@ const ::uint32_t TableStruct_google_2fprotobuf_2ftype_2eproto::offsets[] PROTOBU ~0u, ~0u, ~0u, // no _has_bits_ - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::EnumValue, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.number_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.options_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _impl_._has_bits_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _internal_metadata_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::EnumValue, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::EnumValue, _impl_.number_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::EnumValue, _impl_.options_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Option, _impl_._has_bits_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Option, _internal_metadata_), ~0u, // no _extensions_ ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ ~0u, // no _split_ ~0u, // no sizeof(Split) - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _impl_.name_), - PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _impl_.value_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Option, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::google::protobuf::Option, _impl_.value_), ~0u, 0, }; static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, 15, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Type)}, - { 22, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Field)}, - { 40, 54, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Enum)}, - { 60, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumValue)}, - { 71, 81, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Option)}, + { 0, 15, -1, sizeof(::google::protobuf::Type)}, + { 22, -1, -1, sizeof(::google::protobuf::Field)}, + { 40, 54, -1, sizeof(::google::protobuf::Enum)}, + { 60, -1, -1, sizeof(::google::protobuf::EnumValue)}, + { 71, 81, -1, sizeof(::google::protobuf::Option)}, }; static const ::_pb::Message* const file_default_instances[] = { - &::PROTOBUF_NAMESPACE_ID::_Type_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Field_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Enum_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_EnumValue_default_instance_._instance, - &::PROTOBUF_NAMESPACE_ID::_Option_default_instance_._instance, + &::google::protobuf::_Type_default_instance_._instance, + &::google::protobuf::_Field_default_instance_._instance, + &::google::protobuf::_Enum_default_instance_._instance, + &::google::protobuf::_EnumValue_default_instance_._instance, + &::google::protobuf::_Option_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2ftype_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { "\n\032google/protobuf/type.proto\022\017google.pro" @@ -346,9 +348,10 @@ PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2 // Force running AddDescriptors() at dynamic initialization time. PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ftype_2eproto(&descriptor_table_google_2fprotobuf_2ftype_2eproto); -PROTOBUF_NAMESPACE_OPEN -const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Kind_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); +namespace google { +namespace protobuf { +const ::google::protobuf::EnumDescriptor* Field_Kind_descriptor() { + ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[0]; } bool Field_Kind_IsValid(int value) { @@ -405,8 +408,8 @@ constexpr int Field::Kind_ARRAYSIZE; #endif // (__cplusplus < 201703) && // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) -const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Cardinality_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); +const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor() { + ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[1]; } bool Field_Cardinality_IsValid(int value) { @@ -433,8 +436,8 @@ constexpr int Field::Cardinality_ARRAYSIZE; #endif // (__cplusplus < 201703) && // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) -const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Syntax_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); +const ::google::protobuf::EnumDescriptor* Syntax_descriptor() { + ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[2]; } bool Syntax_IsValid(int value) { @@ -454,26 +457,26 @@ class Type::_Internal { using HasBits = decltype(std::declval()._impl_._has_bits_); static constexpr ::int32_t kHasBitsOffset = 8 * PROTOBUF_FIELD_OFFSET(Type, _impl_._has_bits_); - static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Type* msg); + static const ::google::protobuf::SourceContext& source_context(const Type* msg); static void set_has_source_context(HasBits* has_bits) { (*has_bits)[0] |= 1u; } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::_Internal::source_context(const Type* msg) { +const ::google::protobuf::SourceContext& Type::_Internal::source_context(const Type* msg) { return *msg->_impl_.source_context_; } void Type::clear_source_context() { if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; } -Type::Type(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Type::Type(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Type) } Type::Type(const Type& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Type* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_._has_bits_){from._impl_._has_bits_} @@ -489,7 +492,7 @@ Type::Type(const Type& from) , decltype(_impl_.syntax_) {} }; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -505,7 +508,7 @@ Type::Type(const Type& from) _this->_impl_.edition_.Set(from._internal_edition(), _this->GetArenaForAllocation()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_); + _this->_impl_.source_context_ = new ::google::protobuf::SourceContext(*from._impl_.source_context_); } _this->_impl_.syntax_ = from._impl_.syntax_; // @@protoc_insertion_point(copy_constructor:google.protobuf.Type) @@ -539,7 +542,7 @@ inline void Type::SharedCtor(::_pb::Arena* arena) { Type::~Type() { // @@protoc_insertion_point(destructor:google.protobuf.Type) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -578,7 +581,7 @@ PROTOBUF_NOINLINE void Type::Clear() { } _impl_.syntax_ = 0; _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -608,7 +611,7 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_fields()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr)); + } while (::google::protobuf::internal::ExpectTag<18>(ptr)); } else { goto handle_unusual; } @@ -624,7 +627,7 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { CHK_(ptr); CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Type.oneofs")); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); + } while (::google::protobuf::internal::ExpectTag<26>(ptr)); } else { goto handle_unusual; } @@ -638,7 +641,7 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr)); + } while (::google::protobuf::internal::ExpectTag<34>(ptr)); } else { goto handle_unusual; } @@ -655,9 +658,9 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Syntax syntax = 6; case 6: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 48)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val)); + _internal_set_syntax(static_cast<::google::protobuf::Syntax>(val)); } else { goto handle_unusual; } @@ -684,7 +687,7 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -698,7 +701,7 @@ const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Type::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Type) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -706,8 +709,8 @@ ::uint8_t* Type::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } @@ -715,15 +718,15 @@ ::uint8_t* Type::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_fields_size()); i < n; i++) { const auto& repfield = this->_internal_fields().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } // repeated string oneofs = 3; for (int i = 0, n = this->_internal_oneofs_size(); i < n; ++i) { const auto& s = this->_internal_oneofs().Get(i); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - s.data(), static_cast(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.oneofs"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + s.data(), static_cast(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.oneofs"); target = stream->WriteString(3, s, target); } @@ -731,14 +734,14 @@ ::uint8_t* Type::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream); } cached_has_bits = _impl_._has_bits_[0]; // .google.protobuf.SourceContext source_context = 5; if (cached_has_bits & 0x00000001u) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(5, _Internal::source_context(this), _Internal::source_context(this).GetCachedSize(), target, stream); } @@ -753,14 +756,14 @@ ::uint8_t* Type::_InternalSerialize( // string edition = 7; if (!this->_internal_edition().empty()) { const std::string& _s = this->_internal_edition(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.edition"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.edition"); target = stream->WriteStringMaybeAliased(7, _s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Type) return target; @@ -778,13 +781,13 @@ ::size_t Type::ByteSizeLong() const { total_size += 1UL * this->_internal_fields_size(); for (const auto& msg : this->_internal_fields()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // repeated string oneofs = 3; - total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_internal_oneofs().size()); + total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_oneofs().size()); for (int i = 0, n = _internal_oneofs().size(); i < n; ++i) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( _internal_oneofs().Get(i)); } @@ -792,18 +795,18 @@ ::size_t Type::ByteSizeLong() const { total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string edition = 7; if (!this->_internal_edition().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_edition()); } @@ -811,7 +814,7 @@ ::size_t Type::ByteSizeLong() const { cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *_impl_.source_context_); } @@ -824,14 +827,14 @@ ::size_t Type::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Type::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Type::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Type::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Type::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Type::GetClassData() const { return &_class_data_; } -void Type::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Type::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Type) @@ -849,13 +852,13 @@ void Type::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_ _this->_internal_set_edition(from._internal_edition()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom( + _this->_internal_mutable_source_context()->::google::protobuf::SourceContext::MergeFrom( from._internal_source_context()); } if (from._internal_syntax() != 0) { _this->_internal_set_syntax(from._internal_syntax()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Type::CopyFrom(const Type& from) { @@ -883,7 +886,7 @@ void Type::InternalSwap(Type* other) { &other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena, &other->_impl_.edition_, rhs_arena); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Type, _impl_.syntax_) + sizeof(Type::_impl_.syntax_) - PROTOBUF_FIELD_OFFSET(Type, _impl_.source_context_)>( @@ -891,7 +894,7 @@ void Type::InternalSwap(Type* other) { reinterpret_cast(&other->_impl_.source_context_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Type::GetMetadata() const { +::google::protobuf::Metadata Type::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once, file_level_metadata_google_2fprotobuf_2ftype_2eproto[0]); @@ -902,13 +905,13 @@ class Field::_Internal { public: }; -Field::Field(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Field::Field(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Field) } Field::Field(const Field& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Field* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.options_){from._impl_.options_} @@ -932,7 +935,7 @@ Field::Field(const Field& from) , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1011,7 +1014,7 @@ inline void Field::SharedCtor(::_pb::Arena* arena) { Field::~Field() { // @@protoc_insertion_point(destructor:google.protobuf.Field) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -1045,7 +1048,7 @@ PROTOBUF_NOINLINE void Field::Clear() { ::memset(&_impl_.kind_, 0, static_cast<::size_t>( reinterpret_cast(&_impl_.packed_) - reinterpret_cast(&_impl_.kind_)) + sizeof(_impl_.packed_)); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1057,9 +1060,9 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Field.Kind kind = 1; case 1: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 8)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_kind(static_cast<::PROTOBUF_NAMESPACE_ID::Field_Kind>(val)); + _internal_set_kind(static_cast<::google::protobuf::Field_Kind>(val)); } else { goto handle_unusual; } @@ -1067,9 +1070,9 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Field.Cardinality cardinality = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 16)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_cardinality(static_cast<::PROTOBUF_NAMESPACE_ID::Field_Cardinality>(val)); + _internal_set_cardinality(static_cast<::google::protobuf::Field_Cardinality>(val)); } else { goto handle_unusual; } @@ -1077,7 +1080,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // int32 number = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 24)) { - _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.number_ = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -1108,7 +1111,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // int32 oneof_index = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 56)) { - _impl_.oneof_index_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.oneof_index_ = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -1117,7 +1120,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // bool packed = 8; case 8: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 64)) { - _impl_.packed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.packed_ = ::google::protobuf::internal::ReadVarint64(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -1132,7 +1135,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr)); + } while (::google::protobuf::internal::ExpectTag<74>(ptr)); } else { goto handle_unusual; } @@ -1170,7 +1173,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1183,7 +1186,7 @@ const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Field::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Field) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1204,7 +1207,7 @@ ::uint8_t* Field::_InternalSerialize( // int32 number = 3; if (this->_internal_number() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt32ToArrayWithField<3>( stream, this->_internal_number(), target); } @@ -1212,22 +1215,22 @@ ::uint8_t* Field::_InternalSerialize( // string name = 4; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.name"); target = stream->WriteStringMaybeAliased(4, _s, target); } // string type_url = 6; if (!this->_internal_type_url().empty()) { const std::string& _s = this->_internal_type_url(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.type_url"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.type_url"); target = stream->WriteStringMaybeAliased(6, _s, target); } // int32 oneof_index = 7; if (this->_internal_oneof_index() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt32ToArrayWithField<7>( stream, this->_internal_oneof_index(), target); } @@ -1243,29 +1246,29 @@ ::uint8_t* Field::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(9, repfield, repfield.GetCachedSize(), target, stream); } // string json_name = 10; if (!this->_internal_json_name().empty()) { const std::string& _s = this->_internal_json_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.json_name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.json_name"); target = stream->WriteStringMaybeAliased(10, _s, target); } // string default_value = 11; if (!this->_internal_default_value().empty()) { const std::string& _s = this->_internal_default_value(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.default_value"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.default_value"); target = stream->WriteStringMaybeAliased(11, _s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Field) return target; @@ -1283,30 +1286,30 @@ ::size_t Field::ByteSizeLong() const { total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 4; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string type_url = 6; if (!this->_internal_type_url().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_type_url()); } // string json_name = 10; if (!this->_internal_json_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_json_name()); } // string default_value = 11; if (!this->_internal_default_value().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_default_value()); } @@ -1342,14 +1345,14 @@ ::size_t Field::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Field::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Field::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Field::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Field::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Field::GetClassData() const { return &_class_data_; } -void Field::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Field::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Field) @@ -1385,7 +1388,7 @@ void Field::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF if (from._internal_packed() != 0) { _this->_internal_set_packed(from._internal_packed()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Field::CopyFrom(const Field& from) { @@ -1413,7 +1416,7 @@ void Field::InternalSwap(Field* other) { &other->_impl_.json_name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.default_value_, lhs_arena, &other->_impl_.default_value_, rhs_arena); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Field, _impl_.packed_) + sizeof(Field::_impl_.packed_) - PROTOBUF_FIELD_OFFSET(Field, _impl_.kind_)>( @@ -1421,7 +1424,7 @@ void Field::InternalSwap(Field* other) { reinterpret_cast(&other->_impl_.kind_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Field::GetMetadata() const { +::google::protobuf::Metadata Field::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once, file_level_metadata_google_2fprotobuf_2ftype_2eproto[1]); @@ -1433,26 +1436,26 @@ class Enum::_Internal { using HasBits = decltype(std::declval()._impl_._has_bits_); static constexpr ::int32_t kHasBitsOffset = 8 * PROTOBUF_FIELD_OFFSET(Enum, _impl_._has_bits_); - static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Enum* msg); + static const ::google::protobuf::SourceContext& source_context(const Enum* msg); static void set_has_source_context(HasBits* has_bits) { (*has_bits)[0] |= 1u; } }; -const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::_Internal::source_context(const Enum* msg) { +const ::google::protobuf::SourceContext& Enum::_Internal::source_context(const Enum* msg) { return *msg->_impl_.source_context_; } void Enum::clear_source_context() { if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; } -Enum::Enum(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +Enum::Enum(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Enum) } Enum::Enum(const Enum& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { Enum* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_._has_bits_){from._impl_._has_bits_} @@ -1467,7 +1470,7 @@ Enum::Enum(const Enum& from) , decltype(_impl_.syntax_) {} }; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1483,7 +1486,7 @@ Enum::Enum(const Enum& from) _this->_impl_.edition_.Set(from._internal_edition(), _this->GetArenaForAllocation()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_); + _this->_impl_.source_context_ = new ::google::protobuf::SourceContext(*from._impl_.source_context_); } _this->_impl_.syntax_ = from._impl_.syntax_; // @@protoc_insertion_point(copy_constructor:google.protobuf.Enum) @@ -1516,7 +1519,7 @@ inline void Enum::SharedCtor(::_pb::Arena* arena) { Enum::~Enum() { // @@protoc_insertion_point(destructor:google.protobuf.Enum) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -1553,7 +1556,7 @@ PROTOBUF_NOINLINE void Enum::Clear() { } _impl_.syntax_ = 0; _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1583,7 +1586,7 @@ const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_enumvalue()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr)); + } while (::google::protobuf::internal::ExpectTag<18>(ptr)); } else { goto handle_unusual; } @@ -1597,7 +1600,7 @@ const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); + } while (::google::protobuf::internal::ExpectTag<26>(ptr)); } else { goto handle_unusual; } @@ -1614,9 +1617,9 @@ const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { // .google.protobuf.Syntax syntax = 5; case 5: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 40)) { - ::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + ::int32_t val = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); - _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val)); + _internal_set_syntax(static_cast<::google::protobuf::Syntax>(val)); } else { goto handle_unusual; } @@ -1643,7 +1646,7 @@ const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1657,7 +1660,7 @@ const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ::uint8_t* Enum::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Enum) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1665,8 +1668,8 @@ ::uint8_t* Enum::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } @@ -1674,7 +1677,7 @@ ::uint8_t* Enum::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_enumvalue_size()); i < n; i++) { const auto& repfield = this->_internal_enumvalue().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); } @@ -1682,14 +1685,14 @@ ::uint8_t* Enum::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream); } cached_has_bits = _impl_._has_bits_[0]; // .google.protobuf.SourceContext source_context = 4; if (cached_has_bits & 0x00000001u) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(4, _Internal::source_context(this), _Internal::source_context(this).GetCachedSize(), target, stream); } @@ -1704,14 +1707,14 @@ ::uint8_t* Enum::_InternalSerialize( // string edition = 6; if (!this->_internal_edition().empty()) { const std::string& _s = this->_internal_edition(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.edition"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.edition"); target = stream->WriteStringMaybeAliased(6, _s, target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Enum) return target; @@ -1729,25 +1732,25 @@ ::size_t Enum::ByteSizeLong() const { total_size += 1UL * this->_internal_enumvalue_size(); for (const auto& msg : this->_internal_enumvalue()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // repeated .google.protobuf.Option options = 3; total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } // string edition = 6; if (!this->_internal_edition().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_edition()); } @@ -1755,7 +1758,7 @@ ::size_t Enum::ByteSizeLong() const { cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( + ::google::protobuf::internal::WireFormatLite::MessageSize( *_impl_.source_context_); } @@ -1768,14 +1771,14 @@ ::size_t Enum::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Enum::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData Enum::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, Enum::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Enum::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*Enum::GetClassData() const { return &_class_data_; } -void Enum::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void Enum::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Enum) @@ -1792,13 +1795,13 @@ void Enum::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_ _this->_internal_set_edition(from._internal_edition()); } if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) { - _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom( + _this->_internal_mutable_source_context()->::google::protobuf::SourceContext::MergeFrom( from._internal_source_context()); } if (from._internal_syntax() != 0) { _this->_internal_set_syntax(from._internal_syntax()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void Enum::CopyFrom(const Enum& from) { @@ -1824,7 +1827,7 @@ void Enum::InternalSwap(Enum* other) { &other->_impl_.name_, rhs_arena); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.edition_, lhs_arena, &other->_impl_.edition_, rhs_arena); - ::PROTOBUF_NAMESPACE_ID::internal::memswap< + ::google::protobuf::internal::memswap< PROTOBUF_FIELD_OFFSET(Enum, _impl_.syntax_) + sizeof(Enum::_impl_.syntax_) - PROTOBUF_FIELD_OFFSET(Enum, _impl_.source_context_)>( @@ -1832,7 +1835,7 @@ void Enum::InternalSwap(Enum* other) { reinterpret_cast(&other->_impl_.source_context_)); } -::PROTOBUF_NAMESPACE_ID::Metadata Enum::GetMetadata() const { +::google::protobuf::Metadata Enum::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once, file_level_metadata_google_2fprotobuf_2ftype_2eproto[2]); @@ -1843,13 +1846,13 @@ class EnumValue::_Internal { public: }; -EnumValue::EnumValue(::PROTOBUF_NAMESPACE_ID::Arena* arena) - : ::PROTOBUF_NAMESPACE_ID::Message(arena) { +EnumValue::EnumValue(::google::protobuf::Arena* arena) + : ::google::protobuf::Message(arena) { SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValue) } EnumValue::EnumValue(const EnumValue& from) - : ::PROTOBUF_NAMESPACE_ID::Message() { + : ::google::protobuf::Message() { EnumValue* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.options_){from._impl_.options_} @@ -1859,7 +1862,7 @@ EnumValue::EnumValue(const EnumValue& from) , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1889,7 +1892,7 @@ inline void EnumValue::SharedCtor(::_pb::Arena* arena) { EnumValue::~EnumValue() { // @@protoc_insertion_point(destructor:google.protobuf.EnumValue) - if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::google::protobuf::UnknownFieldSet>()) { (void)arena; return; } @@ -1915,7 +1918,7 @@ PROTOBUF_NOINLINE void EnumValue::Clear() { _internal_mutable_options()->Clear(); _impl_.name_.ClearToEmpty(); _impl_.number_ = 0; - _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1938,7 +1941,7 @@ const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx // int32 number = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast<::uint8_t>(tag) == 16)) { - _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + _impl_.number_ = ::google::protobuf::internal::ReadVarint32(&ptr); CHK_(ptr); } else { goto handle_unusual; @@ -1953,7 +1956,7 @@ const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx ptr = ctx->ParseMessage(_internal_mutable_options()->Add(), ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); + } while (::google::protobuf::internal::ExpectTag<26>(ptr)); } else { goto handle_unusual; } @@ -1969,7 +1972,7 @@ const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), + _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1982,7 +1985,7 @@ const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ::uint8_t* EnumValue::_InternalSerialize( - ::uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const { + ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const { // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValue) ::uint32_t cached_has_bits = 0; (void) cached_has_bits; @@ -1990,14 +1993,14 @@ ::uint8_t* EnumValue::_InternalSerialize( // string name = 1; if (!this->_internal_name().empty()) { const std::string& _s = this->_internal_name(); - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - _s.data(), static_cast(_s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "google.protobuf.EnumValue.name"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + _s.data(), static_cast(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.EnumValue.name"); target = stream->WriteStringMaybeAliased(1, _s, target); } // int32 number = 2; if (this->_internal_number() != 0) { - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: WriteInt32ToArrayWithField<2>( stream, this->_internal_number(), target); } @@ -2006,13 +2009,13 @@ ::uint8_t* EnumValue::_InternalSerialize( for (unsigned i = 0, n = static_cast(this->_internal_options_size()); i < n; i++) { const auto& repfield = this->_internal_options().Get(i); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: + target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( - _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); + _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValue) return target; @@ -2030,12 +2033,12 @@ ::size_t EnumValue::ByteSizeLong() const { total_size += 1UL * this->_internal_options_size(); for (const auto& msg : this->_internal_options()) { total_size += - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); + ::google::protobuf::internal::WireFormatLite::MessageSize(msg); } // string name = 1; if (!this->_internal_name().empty()) { - total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->_internal_name()); } @@ -2048,14 +2051,14 @@ ::size_t EnumValue::ByteSizeLong() const { return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumValue::_class_data_ = { - ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, +const ::google::protobuf::Message::ClassData EnumValue::_class_data_ = { + ::google::protobuf::Message::CopyWithSourceCheck, EnumValue::MergeImpl }; -const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumValue::GetClassData() const { return &_class_data_; } +const ::google::protobuf::Message::ClassData*EnumValue::GetClassData() const { return &_class_data_; } -void EnumValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { +void EnumValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) { auto* const _this = static_cast(&to_msg); auto& from = static_cast(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValue) @@ -2070,7 +2073,7 @@ void EnumValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROT if (from._internal_number() != 0) { _this->_internal_set_number(from._internal_number()); } - _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_); } void EnumValue::CopyFrom(const EnumValue& from) { @@ -2095,7 +2098,7 @@ void EnumValue::InternalSwap(EnumValue* other) { swap(_impl_.number_, other->_impl_.number_); } -::PROTOBUF_NAMESPACE_ID::Metadata EnumValue::GetMetadata() const { +::google::protobuf::Metadata EnumValue::GetMetadata() const { return ::_pbi::AssignDescriptors( &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once, file_level_metadata_google_2fprotobuf_2ftype_2eproto[3]); @@ -2107,26 +2110,26 @@ class Option::_Internal { using HasBits = decltype(std::declval