From d36971ba8040103aaf7256e15edb0d0dea29ea44 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 13 Jan 2025 08:43:00 -0800 Subject: [PATCH] Remove the `proto_ns` substitution variable and replace its use with `pb` or `pbi` where appropriate. The `proto_ns` variable not fully qualified and risks forgetting the prefix `::` which could potentially break codegen if user namespace has a matching subnamespace. PiperOrigin-RevId: 714982016 --- .../golden/compare_cpp_codegen_failure.txt | 4 +- .../golden/compare_cpp_codegen_failure.xml | 2 +- src/google/protobuf/compiler/cpp/enum.cc | 42 +- src/google/protobuf/compiler/cpp/extension.cc | 5 +- .../cpp/field_generators/cord_field.cc | 12 +- .../cpp/field_generators/map_field.cc | 3 +- .../cpp/field_generators/message_field.cc | 3 +- .../cpp/field_generators/primitive_field.cc | 4 +- .../cpp/field_generators/string_field.cc | 10 +- .../cpp/field_generators/string_view_field.cc | 10 +- src/google/protobuf/compiler/cpp/file.cc | 9 +- src/google/protobuf/compiler/cpp/generator.cc | 1 - src/google/protobuf/compiler/cpp/helpers.h | 3 +- src/google/protobuf/compiler/cpp/message.cc | 210 ++- .../compiler/cpp/parse_function_generator.cc | 8 +- src/google/protobuf/compiler/cpp/service.cc | 86 +- .../compiler/java/java_features.pb.cc | 2 +- .../protobuf/compiler/java/java_features.pb.h | 47 +- src/google/protobuf/compiler/plugin.pb.cc | 28 +- src/google/protobuf/compiler/plugin.pb.h | 150 +- src/google/protobuf/cpp_features.pb.cc | 2 +- src/google/protobuf/cpp_features.pb.h | 47 +- src/google/protobuf/descriptor.pb.cc | 118 +- src/google/protobuf/descriptor.pb.h | 1257 +++++++---------- 24 files changed, 849 insertions(+), 1214 deletions(-) diff --git a/editions/golden/compare_cpp_codegen_failure.txt b/editions/golden/compare_cpp_codegen_failure.txt index 38caacfcefbcc..fdbc5525e8767 100644 --- a/editions/golden/compare_cpp_codegen_failure.txt +++ b/editions/golden/compare_cpp_codegen_failure.txt @@ -22,8 +22,8 @@ - // optional int32 int32_field = 1; + // int32 int32_field = 1; if (cached_has_bits & 0x00000001u) { - target = ::proto2::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::proto2::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( @@ @@ (void)cached_has_bits; diff --git a/editions/golden/compare_cpp_codegen_failure.xml b/editions/golden/compare_cpp_codegen_failure.xml index aad16a47ec4de..b897c0e51856c 100644 --- a/editions/golden/compare_cpp_codegen_failure.xml +++ b/editions/golden/compare_cpp_codegen_failure.xml @@ -2,7 +2,7 @@ - + diff --git a/src/google/protobuf/compiler/cpp/enum.cc b/src/google/protobuf/compiler/cpp/enum.cc index 969fda04b4351..551027c608690 100644 --- a/src/google/protobuf/compiler/cpp/enum.cc +++ b/src/google/protobuf/compiler/cpp/enum.cc @@ -204,7 +204,7 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) { if (has_reflection_) { p->Emit(R"( - $dllexport_decl $const ::$proto_ns$::EnumDescriptor* $nonnull$ $Msg_Enum$_descriptor(); + $dllexport_decl $const $pb$::EnumDescriptor* $nonnull$ $Msg_Enum$_descriptor(); )"); } else { p->Emit(R"cc( @@ -243,8 +243,7 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) { p->Emit(R"cc( template <> inline $return_type$ $Msg_Enum$_Name($Msg_Enum$ value) { - return ::$proto_ns$::internal::NameOfDenseEnum<$Msg_Enum$_descriptor, - $kMin$, $kMax$>( + return $pbi$::NameOfDenseEnum<$Msg_Enum$_descriptor, $kMin$, $kMax$>( static_cast(value)); } )cc"); @@ -254,7 +253,7 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) { template $return_type$ $Msg_Enum$_Name(T value) { $static_assert$; - return ::$proto_ns$::internal::NameOfEnum($Msg_Enum$_descriptor(), value); + return $pbi$::NameOfEnum($Msg_Enum$_descriptor(), value); } )cc"); } @@ -264,8 +263,8 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) { inline bool $Msg_Enum$_Parse( //~ absl::string_view name, $Msg_Enum$* $nonnull$ value) { - return ::$proto_ns$::internal::ParseNamedEnum<$Msg_Enum$>( - $Msg_Enum$_descriptor(), name, value); + return $pbi$::ParseNamedEnum<$Msg_Enum$>($Msg_Enum$_descriptor(), name, + value); } )cc"); } else { @@ -344,7 +343,7 @@ void EnumGenerator::GenerateSymbolImports(io::Printer* p) const { if (has_reflection_) { p->Emit(R"( - static inline const ::$proto_ns$::EnumDescriptor* $nonnull$ $Enum$_descriptor() { + static inline const $pb$::EnumDescriptor* $nonnull$ $Enum$_descriptor() { return $Msg_Enum$_descriptor(); } )"); @@ -410,8 +409,8 @@ void EnumGenerator::GenerateMethods(int idx, io::Printer* p) { if (has_reflection_) { p->Emit({{"idx", idx}}, R"cc( - const ::$proto_ns$::EnumDescriptor* $nonnull$ $Msg_Enum$_descriptor() { - ::$proto_ns$::internal::AssignDescriptors(&$desc_table$); + const $pb$::EnumDescriptor* $nonnull$ $Msg_Enum$_descriptor() { + $pbi$::AssignDescriptors(&$desc_table$); return $file_level_enum_descriptors$[$idx$]; } )cc"); @@ -527,16 +526,15 @@ void EnumGenerator::GenerateMethods(int idx, io::Printer* p) { }}, }, R"cc( - static ::$proto_ns$::internal::ExplicitlyConstructed + static $pbi$::ExplicitlyConstructed $Msg_Enum$_strings[$num_unique$] = {}; static const char $Msg_Enum$_names[] = { $names$, }; - static const ::$proto_ns$::internal::EnumEntry $Msg_Enum$_entries[] = - { - $entries$, + static const $pbi$::EnumEntry $Msg_Enum$_entries[] = { + $entries$, }; static const int $Msg_Enum$_entries_by_number[] = { @@ -544,22 +542,20 @@ void EnumGenerator::GenerateMethods(int idx, io::Printer* p) { }; $return_type$ $Msg_Enum$_Name($Msg_Enum$ value) { - static const bool kDummy = - ::$proto_ns$::internal::InitializeEnumStrings( - $Msg_Enum$_entries, $Msg_Enum$_entries_by_number, - $num_unique$, $Msg_Enum$_strings); + static const bool kDummy = $pbi$::InitializeEnumStrings( + $Msg_Enum$_entries, $Msg_Enum$_entries_by_number, $num_unique$, + $Msg_Enum$_strings); (void)kDummy; - int idx = ::$proto_ns$::internal::LookUpEnumName( - $Msg_Enum$_entries, $Msg_Enum$_entries_by_number, $num_unique$, - value); - return idx == -1 ? ::$proto_ns$::internal::GetEmptyString() - : $Msg_Enum$_strings[idx].get(); + int idx = $pbi$::LookUpEnumName($Msg_Enum$_entries, + $Msg_Enum$_entries_by_number, + $num_unique$, value); + return idx == -1 ? $pbi$::GetEmptyString() : $Msg_Enum$_strings[idx].get(); } bool $Msg_Enum$_Parse(absl::string_view name, $Msg_Enum$* $nonnull$ value) { int int_value; - bool success = ::$proto_ns$::internal::LookUpEnumValue( + bool success = $pbi$::LookUpEnumValue( $Msg_Enum$_entries, $num_declared$, name, &int_value); if (success) { *value = static_cast<$Msg_Enum$>(int_value); diff --git a/src/google/protobuf/compiler/cpp/extension.cc b/src/google/protobuf/compiler/cpp/extension.cc index 0babdcf46a07e..3dd9410b8fabd 100644 --- a/src/google/protobuf/compiler/cpp/extension.cc +++ b/src/google/protobuf/compiler/cpp/extension.cc @@ -116,9 +116,8 @@ void ExtensionGenerator::GenerateDeclaration(io::Printer* p) const { R"cc( inline $constant_qualifier $constexpr int $constant_name$ = $number$; - $id_qualifier$ ::$proto_ns$::internal::ExtensionIdentifier< - $extendee$, ::$proto_ns$::internal::$type_traits$, $field_type$, - $packed$> + $id_qualifier$ $pbi$::ExtensionIdentifier< + $extendee$, $pbi$::$type_traits$, $field_type$, $packed$> $name$; )cc"); } diff --git a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc index c14610f755a2d..6ad60738a4bfe 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc @@ -103,7 +103,7 @@ class CordFieldGenerator : public FieldGeneratorBase { void GenerateOneofCopyConstruct(io::Printer* p) const override { auto vars = p->WithVars(variables_); p->Emit(R"cc( - $field$ = ::$proto_ns$::Arena::Create(arena, *from.$field$); + $field$ = $pb$::Arena::Create(arena, *from.$field$); )cc"); } }; @@ -276,7 +276,7 @@ void CordFieldGenerator::GenerateByteSize(io::Printer* printer) const { Formatter format(printer, variables_); format( "total_size += $tag_size$ +\n" - " ::$proto_ns$::internal::WireFormatLite::$declared_type$Size(\n" + " $pbi$::WireFormatLite::$declared_type$Size(\n" " this_._internal_$name$());\n"); } @@ -362,7 +362,7 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name_internal$(); $field$ = new ::absl::Cord; - ::$proto_ns$::Arena* arena = GetArena(); + $pb$::Arena* arena = GetArena(); if (arena != nullptr) { arena->Own($field$); } @@ -379,7 +379,7 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name_internal$(); $field$ = new ::absl::Cord; - ::$proto_ns$::Arena* arena = GetArena(); + $pb$::Arena* arena = GetArena(); if (arena != nullptr) { arena->Own($field$); } @@ -396,7 +396,7 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name_internal$(); $field$ = new ::absl::Cord; - ::$proto_ns$::Arena* arena = GetArena(); + $pb$::Arena* arena = GetArena(); if (arena != nullptr) { arena->Own($field$); } @@ -447,7 +447,7 @@ void CordOneofFieldGenerator::GenerateArenaDestructorCode( void CordOneofFieldGenerator::GenerateMergingCode(io::Printer* printer) const { printer->Emit(R"cc( if (oneof_needs_init) { - _this->$field$ = ::$proto_ns$::Arena::Create(arena); + _this->$field$ = $pb$::Arena::Create(arena); } *_this->$field$ = *from.$field$; )cc"); diff --git a/src/google/protobuf/compiler/cpp/field_generators/map_field.cc b/src/google/protobuf/compiler/cpp/field_generators/map_field.cc index cc283d6bb0056..378e4c0c7952b 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/map_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/map_field.cc @@ -46,7 +46,8 @@ std::vector Vars(const FieldDescriptor* field, const Options& opts, } return { - {"Map", absl::Substitute("::google::protobuf::Map<$0, $1>", key_type, val_type)}, + {"Map", absl::Substitute("::$2::Map<$0, $1>", key_type, val_type, + ProtobufNamespace(opts))}, {"Entry", ClassName(field->message_type(), false)}, {"Key", PrimitiveTypeName(opts, key->cpp_type())}, {"Val", val_type}, diff --git a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc index 8c54b66c094b0..0d56447e23223 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc @@ -46,7 +46,8 @@ std::vector Vars(const FieldDescriptor* field, const Options& opts, QualifiedDefaultInstanceName(field->message_type(), opts); std::string default_ptr = QualifiedDefaultInstancePtr(field->message_type(), opts); - absl::string_view base = "::google::protobuf::MessageLite"; + std::string base = + absl::StrCat("::", ProtobufNamespace(opts), "::", "MessageLite"); return { {"Submsg", qualified_type}, diff --git a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc index 6279dce8d3b9d..ffbce44c0d149 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc @@ -246,8 +246,8 @@ void SingularPrimitive::GenerateSerializeWithCachedSizesToArray( // template parameter that handles the EnsureSpace and the writing // of the tag+value to the array p->Emit(R"cc( - target = ::$proto_ns$::internal::WireFormatLite:: - Write$declared_type$ToArrayWithField<$number$>( + target = + $pbi$::WireFormatLite::Write$declared_type$ToArrayWithField<$number$>( stream, this_._internal_$name$(), target); )cc"); } else { diff --git a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc index 52c91c3d6ea4b..f135cd2f76462 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc @@ -902,14 +902,14 @@ void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const { $annotate_add$; // @@protoc_insertion_point(field_add:$pkg.Msg.field$) } - inline const ::$proto_ns$::RepeatedPtrField& - $Msg$::$name$() const ABSL_ATTRIBUTE_LIFETIME_BOUND { + inline const $pb$::RepeatedPtrField& $Msg$::$name$() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { $WeakDescriptorSelfPin$; $annotate_list$; // @@protoc_insertion_point(field_list:$pkg.Msg.field$) return _internal_$name_internal$(); } - inline ::$proto_ns$::RepeatedPtrField* $nonnull$ + inline $pb$::RepeatedPtrField* $nonnull$ $Msg$::mutable_$name$() ABSL_ATTRIBUTE_LIFETIME_BOUND { $WeakDescriptorSelfPin$; $annotate_mutable_list$; @@ -938,12 +938,12 @@ void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const { )cc"); } else { p->Emit(R"cc( - inline const ::$proto_ns$::RepeatedPtrField& + inline const $pb$::RepeatedPtrField& $Msg$::_internal_$name_internal$() const { $TsanDetectConcurrentRead$; return $field_$; } - inline ::$proto_ns$::RepeatedPtrField* $nonnull$ + inline $pb$::RepeatedPtrField* $nonnull$ $Msg$::_internal_mutable_$name_internal$() { $TsanDetectConcurrentRead$; return &$field_$; diff --git a/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc b/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc index 07e2916b6c53e..7c85ca9fa7974 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc @@ -734,14 +734,14 @@ void RepeatedStringView::GenerateInlineAccessorDefinitions( $annotate_add$; // @@protoc_insertion_point(field_add_string_piece:$pkg.Msg.field$) } - inline const ::$proto_ns$::RepeatedPtrField& - $Msg$::$name$() const ABSL_ATTRIBUTE_LIFETIME_BOUND { + inline const $pb$::RepeatedPtrField& $Msg$::$name$() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { $WeakDescriptorSelfPin$; $annotate_list$; // @@protoc_insertion_point(field_list:$pkg.Msg.field$) return _internal_$name_internal$(); } - inline ::$proto_ns$::RepeatedPtrField* $nonnull$ + inline $pb$::RepeatedPtrField* $nonnull$ $Msg$::mutable_$name$() ABSL_ATTRIBUTE_LIFETIME_BOUND { $WeakDescriptorSelfPin$; $annotate_mutable_list$; @@ -770,12 +770,12 @@ void RepeatedStringView::GenerateInlineAccessorDefinitions( )cc"); } else { p->Emit(R"cc( - inline const ::$proto_ns$::RepeatedPtrField& + inline const $pb$::RepeatedPtrField& $Msg$::_internal_$name_internal$() const { $TsanDetectConcurrentRead$; return $field_$; } - inline ::$proto_ns$::RepeatedPtrField* $nonnull$ + inline $pb$::RepeatedPtrField* $nonnull$ $Msg$::_internal_mutable_$name_internal$() { $TsanDetectConcurrentRead$; return &$field_$; diff --git a/src/google/protobuf/compiler/cpp/file.cc b/src/google/protobuf/compiler/cpp/file.cc index c2d261a93ae59..c597924690506 100644 --- a/src/google/protobuf/compiler/cpp/file.cc +++ b/src/google/protobuf/compiler/cpp/file.cc @@ -548,9 +548,9 @@ void FileGenerator::GenerateSourcePrelude(io::Printer* p) { // required by the standard. p->Emit(R"cc( PROTOBUF_PRAGMA_INIT_SEG - namespace _pb = ::$proto_ns$; - namespace _pbi = ::$proto_ns$::internal; - namespace _fl = ::$proto_ns$::internal::field_layout; + namespace _pb = $pb$; + namespace _pbi = $pbi$; + namespace _fl = $pbi$::field_layout; )cc"); } @@ -1775,8 +1775,7 @@ void FileGenerator::GenerateGlobalStateFunctionDeclarations(io::Printer* p) { // just use the symbol to force-link the C++ generated code when necessary. p->Emit(R"cc( extern "C" { - $dllexport_decl $extern const ::$proto_ns$::internal::DescriptorTable - $desc_table$; + $dllexport_decl $extern const $pbi$::DescriptorTable $desc_table$; } // extern "C" )cc"); } diff --git a/src/google/protobuf/compiler/cpp/generator.cc b/src/google/protobuf/compiler/cpp/generator.cc index 24e48e55e7336..c8ded6c509600 100644 --- a/src/google/protobuf/compiler/cpp/generator.cc +++ b/src/google/protobuf/compiler/cpp/generator.cc @@ -52,7 +52,6 @@ absl::flat_hash_map CommonVars( const Options& options) { bool is_oss = options.opensource_runtime; return { - {"proto_ns", std::string(ProtobufNamespace(options))}, {"pb", absl::StrCat("::", ProtobufNamespace(options))}, {"pbi", absl::StrCat("::", ProtobufNamespace(options), "::internal")}, diff --git a/src/google/protobuf/compiler/cpp/helpers.h b/src/google/protobuf/compiler/cpp/helpers.h index 1a6670637e442..d7092c51e3751 100644 --- a/src/google/protobuf/compiler/cpp/helpers.h +++ b/src/google/protobuf/compiler/cpp/helpers.h @@ -1236,8 +1236,7 @@ inline auto GetEmitRepeatedFieldMutableSub(const Options& options, break; case BoundsCheckMode::kAbort: if (use_stringpiecefield) { - p->Emit( - "::google::protobuf::internal::CheckedMutableOrAbort(&$field$, index)"); + p->Emit("$pbi$::CheckedMutableOrAbort(&$field$, index)"); } else { p->Emit(R"cc( $pbi$::CheckedMutableOrAbort( diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index 37bfb103f064a..ed31341eb75d3 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -1437,20 +1437,18 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) { }}}, R"cc( class $classname$ final - : public ::$proto_ns$::internal::MapEntry< - $key_cpp$, $val_cpp$, - ::$proto_ns$::internal::WireFormatLite::$key_wire_type$, - ::$proto_ns$::internal::WireFormatLite::$val_wire_type$> { + : public $pbi$::MapEntry<$key_cpp$, $val_cpp$, + $pbi$::WireFormatLite::$key_wire_type$, + $pbi$::WireFormatLite::$val_wire_type$> { public: - using SuperType = ::$proto_ns$::internal::MapEntry< - $key_cpp$, $val_cpp$, - ::$proto_ns$::internal::WireFormatLite::$key_wire_type$, - ::$proto_ns$::internal::WireFormatLite::$val_wire_type$>; + using SuperType = + $pbi$::MapEntry<$key_cpp$, $val_cpp$, + $pbi$::WireFormatLite::$key_wire_type$, + $pbi$::WireFormatLite::$val_wire_type$>; $classname$(); template - explicit PROTOBUF_CONSTEXPR $classname$( - ::$proto_ns$::internal::ConstantInitialized); - explicit $classname$(::$proto_ns$::Arena* $nullable$ arena); + explicit PROTOBUF_CONSTEXPR $classname$($pbi$::ConstantInitialized); + explicit $classname$($pb$::Arena* $nullable$ arena); static const $classname$* $nonnull$ internal_default_instance() { return reinterpret_cast( &_$classname$_default_instance_); @@ -1461,7 +1459,7 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) { static constexpr auto InternalGenerateClassData_(); private: - friend class ::$proto_ns$::MessageLite; + friend class $pb$::MessageLite; friend struct ::$tablename$; $parse_decls$; @@ -1471,7 +1469,7 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) { static void* $nonnull$ PlacementNew_( //~ const void* $nonnull$, void* $nonnull$ mem, - ::$proto_ns$::Arena* $nullable$ arena); + $pb$::Arena* $nullable$ arena); static constexpr auto InternalNewImpl_(); }; $dllexport_decl $extern const $pbi$::ClassDataFull $classname$_class_data_; @@ -1495,7 +1493,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { if (descriptor_->extension_range_count() == 0) return; p->Emit(R"cc( - ::$proto_ns$::internal::ExtensionSet _extensions_; + $pbi$::ExtensionSet _extensions_; )cc"); }}, {"tracker", @@ -1503,7 +1501,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { if (!HasTracker(descriptor_, options_)) return; p->Emit(R"cc( - static ::$proto_ns$::AccessListener<$Msg$> _tracker_; + static $pb$::AccessListener<$Msg$> _tracker_; static void TrackerOnGetMetadata() { $annotate_reflection$; } )cc"); }}, @@ -1516,8 +1514,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { p->Emit({{"donated_size", InlinedStringDonatedSize()}}, R"cc( - ::$proto_ns$::internal::HasBits<$donated_size$> - _inlined_string_donated_; + $pbi$::HasBits<$donated_size$> _inlined_string_donated_; )cc"); }}, {"has_bits", @@ -1529,11 +1526,11 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { // Placing _cached_size_ together with _has_bits_ improves cache // locality despite potential alignment padding. p->Emit({{"sizeof_has_bits", sizeof_has_bits}}, R"cc( - ::$proto_ns$::internal::HasBits<$sizeof_has_bits$> _has_bits_; + $pbi$::HasBits<$sizeof_has_bits$> _has_bits_; )cc"); if (need_to_emit_cached_size) { p->Emit(R"cc( - ::$proto_ns$::internal::CachedSize _cached_size_; + $pbi$::CachedSize _cached_size_; )cc"); need_to_emit_cached_size = false; } @@ -1588,7 +1585,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { R"cc( union $camel_oneof_name$Union { constexpr $camel_oneof_name$Union() : _constinit_{} {} - ::$proto_ns$::internal::ConstantInitialized _constinit_; + $pbi$::ConstantInitialized _constinit_; $oneof_fields$; } $oneof_name$_; )cc"); @@ -1603,7 +1600,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { need_to_emit_cached_size = false; p->Emit(R"cc( - ::$proto_ns$::internal::CachedSize _cached_size_; + $pbi$::CachedSize _cached_size_; )cc"); }}, {"oneof_case", @@ -1621,7 +1618,7 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { if (num_weak_fields_ == 0) return; p->Emit(R"cc( - ::$proto_ns$::internal::WeakFieldMap _weak_field_map_; + $pbi$::WeakFieldMap _weak_field_map_; )cc"); }}, {"union_impl", @@ -1637,16 +1634,15 @@ void MessageGenerator::GenerateImplDefinition(io::Printer* p) { struct Impl_ { //~ TODO: check if/when there is a need for an //~ outline dtor. - inline explicit constexpr Impl_( - ::$proto_ns$::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_($pbi$::ConstantInitialized) noexcept; inline explicit Impl_( //~ $pbi$::InternalVisibility visibility, - ::$proto_ns$::Arena* $nullable$ arena); + $pb$::Arena* $nullable$ arena); inline explicit Impl_( //~ $pbi$::InternalVisibility visibility, - ::$proto_ns$::Arena* $nullable$ arena, const Impl_& from, + $pb$::Arena* $nullable$ arena, const Impl_& from, const $classname$& from_msg); //~ Members assumed to align to 8 bytes: $extension_set$; @@ -1679,52 +1675,52 @@ void MessageGenerator::GenerateAnyMethodDefinition(io::Printer* p) { if (HasDescriptorMethods(descriptor_->file(), options_)) { p->Emit( R"cc( - bool PackFrom(const ::$proto_ns$::Message& message) { + bool PackFrom(const $pb$::Message& message) { $DCHK$_NE(&message, this); - return ::$proto_ns$::internal::InternalPackFrom( - message, mutable_type_url(), _internal_mutable_value()); + return $pbi$::InternalPackFrom(message, mutable_type_url(), + _internal_mutable_value()); } - bool PackFrom(const ::$proto_ns$::Message& message, + bool PackFrom(const $pb$::Message& message, ::absl::string_view type_url_prefix) { $DCHK$_NE(&message, this); - return ::$proto_ns$::internal::InternalPackFrom( - message, type_url_prefix, mutable_type_url(), - _internal_mutable_value()); + return $pbi$::InternalPackFrom(message, type_url_prefix, + mutable_type_url(), + _internal_mutable_value()); } - bool UnpackTo(::$proto_ns$::Message* $nonnull$ message) const { - return ::$proto_ns$::internal::InternalUnpackTo( - _internal_type_url(), _internal_value(), message); + bool UnpackTo($pb$::Message* $nonnull$ message) const { + return $pbi$::InternalUnpackTo(_internal_type_url(), + _internal_value(), message); } static bool GetAnyFieldDescriptors( - const ::$proto_ns$::Message& message, - const ::$proto_ns$::FieldDescriptor* $nullable$* $nonnull$ + const $pb$::Message& message, + const $pb$::FieldDescriptor* $nullable$* $nonnull$ type_url_field, - const ::$proto_ns$::FieldDescriptor* $nullable$* $nonnull$ + const $pb$::FieldDescriptor* $nullable$* $nonnull$ value_field); template < typename T, class = typename std::enable_if::value>::type> + T, const $pb$::Message&>::value>::type> bool PackFrom(const T& message) { - return ::$proto_ns$::internal::InternalPackFrom( + return $pbi$::InternalPackFrom( message, mutable_type_url(), _internal_mutable_value()); } template < typename T, class = typename std::enable_if::value>::type> + T, const $pb$::Message&>::value>::type> bool PackFrom(const T& message, ::absl::string_view type_url_prefix) { - return ::$proto_ns$::internal::InternalPackFrom( + return $pbi$::InternalPackFrom( message, type_url_prefix, mutable_type_url(), _internal_mutable_value()); } template < typename T, class = typename std::enable_if::value>::type> + T, const $pb$::Message&>::value>::type> bool UnpackTo(T* $nonnull$ message) const { - return ::$proto_ns$::internal::InternalUnpackTo( + return $pbi$::InternalUnpackTo( _internal_type_url(), _internal_value(), message); } )cc"); @@ -1733,20 +1729,20 @@ void MessageGenerator::GenerateAnyMethodDefinition(io::Printer* p) { R"cc( template bool PackFrom(const T& message) { - return ::$proto_ns$::internal::InternalPackFrom( - message, mutable_type_url(), _internal_mutable_value()); + return $pbi$::InternalPackFrom(message, mutable_type_url(), + _internal_mutable_value()); } template bool PackFrom(const T& message, ::absl::string_view type_url_prefix) { - return ::$proto_ns$::internal::InternalPackFrom( - message, type_url_prefix, mutable_type_url(), - _internal_mutable_value()); + return $pbi$::InternalPackFrom(message, type_url_prefix, + mutable_type_url(), + _internal_mutable_value()); } template bool UnpackTo(T* $nonnull$ message) const { - return ::$proto_ns$::internal::InternalUnpackTo( - _internal_type_url(), _internal_value(), message); + return $pbi$::InternalUnpackTo(_internal_type_url(), + _internal_value(), message); } )cc"); } @@ -1759,7 +1755,7 @@ void MessageGenerator::GenerateAnyMethodDefinition(io::Printer* p) { template bool Is() const { - return ::$proto_ns$::internal::InternalIs(_internal_type_url()); + return $pbi$::InternalIs(_internal_type_url()); } static bool ParseAnyTypeUrl( //~ @@ -1801,7 +1797,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { } p->Emit(R"cc( - static const ::$proto_ns$::Descriptor* $nonnull$ descriptor() { + static const $pb$::Descriptor* $nonnull$ descriptor() { return GetDescriptor(); } )cc"); @@ -1819,10 +1815,10 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { if (!HasDescriptorMethods(descriptor_->file(), options_)) return; p->Emit(R"cc( - static const ::$proto_ns$::Descriptor* $nonnull$ GetDescriptor() { + static const $pb$::Descriptor* $nonnull$ GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::$proto_ns$::Reflection* $nonnull$ GetReflection() { + static const $pb$::Reflection* $nonnull$ GetReflection() { return default_instance().GetMetadata().reflection; } )cc"); @@ -1882,9 +1878,8 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { void MergeFrom(const $classname$& from) { $classname$::MergeImpl(*this, from); } private: - static void MergeImpl( - ::$proto_ns$::MessageLite& to_msg, - const ::$proto_ns$::MessageLite& from_msg); + static void MergeImpl($pb$::MessageLite& to_msg, + const $pb$::MessageLite& from_msg); public: )cc"); @@ -1908,8 +1903,8 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { void MergeFrom(const $classname$& from) { $classname$::MergeImpl(*this, from); } private: - static void MergeImpl(::$proto_ns$::MessageLite& to_msg, - const ::$proto_ns$::MessageLite& from_msg); + static void MergeImpl($pb$::MessageLite& to_msg, + const $pb$::MessageLite& from_msg); public: )cc"); @@ -1947,17 +1942,16 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) private: - static ::size_t ByteSizeLong(const ::$proto_ns$::MessageLite& msg); + static ::size_t ByteSizeLong(const $pb$::MessageLite& msg); static $uint8$* $nonnull$ _InternalSerialize( - const MessageLite& msg, $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ stream); + const $pb$::MessageLite& msg, $uint8$* $nonnull$ target, + $pb$::io::EpsCopyOutputStream* $nonnull$ stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } $uint8$* $nonnull$ _InternalSerialize( $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ - stream) const { + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE @@ -1965,8 +1959,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { $uint8$* $nonnull$ _InternalSerialize( //~ $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ - stream) const final; + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE )cc"); } @@ -1988,7 +1981,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { int GetCachedSize() const { return $cached_size$.Get(); } private: - void SharedCtor(::$proto_ns$::Arena* $nullable$ arena); + void SharedCtor($pb$::Arena* $nullable$ arena); static void SharedDtor(MessageLite& self); void InternalSwap($classname$* $nonnull$ other); )cc"); @@ -2000,8 +1993,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { p->Emit(R"cc( private: static void ArenaDtor(void* $nonnull$ object); - static void OnDemandRegisterArenaDtor( - MessageLite& msg, ::$proto_ns$::Arena& arena) { + static void OnDemandRegisterArenaDtor(MessageLite& msg, $pb$::Arena& arena) { auto& this_ = static_cast<$classname$&>(msg); if ((this_.$inlined_string_donated_array$[0] & 0x1u) == 0) { return; @@ -2026,7 +2018,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { if (!HasDescriptorMethods(descriptor_->file(), options_)) return; p->Emit(R"cc( - ::$proto_ns$::Metadata GetMetadata() const; + $pb$::Metadata GetMetadata() const; )cc"); }}, {"decl_split_methods", @@ -2156,8 +2148,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { //~ Templatize constexpr constructor as a workaround for a bug in //~ gcc 12 (warning in gcc 13). template - explicit PROTOBUF_CONSTEXPR $classname$( - ::$proto_ns$::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR $classname$($pbi$::ConstantInitialized); inline $classname$(const $classname$& from) : $classname$(nullptr, from) {} inline $classname$($classname$&& from) noexcept @@ -2214,8 +2205,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { // implements Message ---------------------------------------------- - $classname$* $nonnull$ - New(::$proto_ns$::Arena* $nullable$ arena = nullptr) const { + $classname$* $nonnull$ New($pb$::Arena* $nullable$ arena = nullptr) const { return $superclass$::DefaultConstruct<$classname$>(arena); } $generated_methods$; @@ -2229,8 +2219,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { //~ the absl::string_view namespace). private: template - friend ::absl::string_view( - ::$proto_ns$::internal::GetAnyMessageName)(); + friend ::absl::string_view($pbi$::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "$full_name$"; } $decl_annotate$; @@ -2238,12 +2227,11 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { //~ deriving from protos to give access to this constructor, //~ breaking the invariants we rely on. protected: - explicit $classname$(::$proto_ns$::Arena* $nullable$ arena); - $classname$(::$proto_ns$::Arena* $nullable$ arena, const $classname$& from); + explicit $classname$($pb$::Arena* $nullable$ arena); + $classname$($pb$::Arena* $nullable$ arena, const $classname$& from); $classname$( //~ - ::$proto_ns$::Arena* $nullable$ arena, - $classname$&& from) noexcept + $pb$::Arena* $nullable$ arena, $classname$&& from) noexcept : $classname$(arena) { *this = ::std::move(from); } @@ -2252,7 +2240,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { static void* $nonnull$ PlacementNew_( //~ const void* $nonnull$, void* $nonnull$ mem, - ::$proto_ns$::Arena* $nullable$ arena); + $pb$::Arena* $nullable$ arena); static constexpr auto InternalNewImpl_(); public: @@ -2283,10 +2271,10 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { $decl_data$; $post_loop_handler$; - friend class ::$proto_ns$::MessageLite; - friend class ::$proto_ns$::Arena; + friend class $pb$::MessageLite; + friend class $pb$::Arena; template - friend class ::$proto_ns$::Arena::InternalHelper; + friend class $pb$::Arena::InternalHelper; using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; $decl_impl$; @@ -2379,12 +2367,11 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { #if defined(PROTOBUF_CUSTOM_VTABLE) $classname$::$classname$() : SuperType($classname$_class_data_.base()) {} - $classname$::$classname$(::$proto_ns$::Arena* $nullable$ arena) + $classname$::$classname$($pb$::Arena* $nullable$ arena) : SuperType(arena, $classname$_class_data_.base()) {} #else // PROTOBUF_CUSTOM_VTABLE $classname$::$classname$() : SuperType() {} - $classname$::$classname$(::$proto_ns$::Arena* $nullable$ arena) - : SuperType(arena) {} + $classname$::$classname$($pb$::Arena* $nullable$ arena) : SuperType(arena) {} #endif // PROTOBUF_CUSTOM_VTABLE $annotate_accessors$; $verify$; @@ -2402,9 +2389,9 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { p->Emit( R"cc( bool $classname$::GetAnyFieldDescriptors( - const ::$proto_ns$::Message& message, - const ::$proto_ns$::FieldDescriptor** type_url_field, - const ::$proto_ns$::FieldDescriptor** value_field) { + const $pb$::Message& message, + const $pb$::FieldDescriptor** type_url_field, + const $pb$::FieldDescriptor** value_field) { return ::_pbi::GetAnyFieldDescriptors(message, type_url_field, value_field); } )cc"); @@ -2543,7 +2530,7 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { if (!HasDescriptorMethods(descriptor_->file(), options_)) return; // Same as the base class, but it avoids virtual dispatch. p->Emit(R"cc( - ::$proto_ns$::Metadata $classname$::GetMetadata() const { + $pb$::Metadata $classname$::GetMetadata() const { return $superclass$::GetMetadataImpl(GetClassData()->full()); } )cc"); @@ -2572,7 +2559,7 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { [&] { if (!HasTracker(descriptor_, options_)) return; p->Emit(R"cc( - ::$proto_ns$::AccessListener<$classtype$> $classname$::$tracker$( + $pb$::AccessListener<$classtype$> $classname$::$tracker$( &FullMessageName); )cc"); }}}, @@ -2912,7 +2899,7 @@ void MessageGenerator::GenerateSharedConstructorCode(io::Printer* p) { R"cc( PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_( $pbi$::InternalVisibility visibility, - ::$proto_ns$::Arena* $nullable$ arena) + $pb$::Arena* $nullable$ arena) //~ $init_impl$ {} @@ -3320,7 +3307,7 @@ void MessageGenerator::GenerateArenaEnabledCopyConstructor(io::Printer* p) { R"cc( PROTOBUF_NDEBUG_INLINE $classname$::Impl_::Impl_( $pbi$::InternalVisibility visibility, - ::$proto_ns$::Arena* $nullable$ arena, const Impl_& from, + $pb$::Arena* $nullable$ arena, const Impl_& from, const $classtype$& from_msg) //~ $init$ {} @@ -3375,7 +3362,7 @@ void MessageGenerator::GenerateArenaEnabledCopyConstructor(io::Printer* p) { R"cc( $classname$::$classname$( //~ force alignment - ::$proto_ns$::Arena* $nullable$ arena, + $pb$::Arena* $nullable$ arena, //~ force alignment const $classname$& from) #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -3427,7 +3414,7 @@ void MessageGenerator::GenerateStructors(io::Printer* p) { }}, }, R"cc( - $classname$::$classname$(::$proto_ns$::Arena* $nullable$ arena) + $classname$::$classname$($pb$::Arena* $nullable$ arena) #if defined(PROTOBUF_CUSTOM_VTABLE) : $superclass$(arena, $classname$_class_data_.base()) { #else // PROTOBUF_CUSTOM_VTABLE @@ -3447,7 +3434,7 @@ void MessageGenerator::GenerateStructors(io::Printer* p) { p->Emit(R"cc( $classname$::$classname$( //~ Force alignment - ::$proto_ns$::Arena* $nullable$ arena, const $classname$& from) + $pb$::Arena* $nullable$ arena, const $classname$& from) : $classname$(arena) { MergeFrom(from); } @@ -3456,7 +3443,7 @@ void MessageGenerator::GenerateStructors(io::Printer* p) { p->Emit(R"cc( $classname$::$classname$( //~ Force alignment - ::$proto_ns$::Arena* $nullable$ arena, const $classname$& from) + $pb$::Arena* $nullable$ arena, const $classname$& from) #if defined(PROTOBUF_CUSTOM_VTABLE) : $superclass$(arena, $classname$_class_data_.base()), #else // PROTOBUF_CUSTOM_VTABLE @@ -4002,7 +3989,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) { inline void* $nonnull$ $classname$::PlacementNew_( //~ const void* $nonnull$, void* $nonnull$ mem, - ::$proto_ns$::Arena* $nullable$ arena) { + $pb$::Arena* $nullable$ arena) { return ::new (mem) $classname$(arena); } )cc"); @@ -4077,8 +4064,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) { )cc"); } else { p->Emit(R"cc( - static_cast( - &$classname$::ClearImpl), + static_cast(&$classname$::ClearImpl), $superclass$::ByteSizeLongImpl, $superclass$::_InternalSerializeImpl , )cc"); @@ -4224,15 +4210,15 @@ void MessageGenerator::GenerateClassSpecificMergeImpl(io::Printer* p) { // cast. Formatter format(p); format( - "void $classname$::MergeImpl(::$proto_ns$::MessageLite& to_msg, const " - "::$proto_ns$::MessageLite& from_msg) {\n" + "void $classname$::MergeImpl($pb$::MessageLite& to_msg, const " + "$pb$::MessageLite& from_msg) {\n" "$WeakDescriptorSelfPin$" " auto* const _this = static_cast<$classname$*>(&to_msg);\n" " auto& from = static_cast(from_msg);\n"); format.Indent(); if (RequiresArena(GeneratorFunction::kMergeFrom)) { p->Emit(R"cc( - ::$proto_ns$::Arena* arena = _this->GetArena(); + $pb$::Arena* arena = _this->GetArena(); )cc"); } format( @@ -4632,13 +4618,13 @@ void MessageGenerator::GenerateSerializeWithCachedSizesToArray(io::Printer* p) { p->Emit(R"cc( #if defined(PROTOBUF_CUSTOM_VTABLE) $uint8$* $nonnull$ $classname$::_InternalSerialize( - const MessageLite& base, $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ stream) { + const $pb$::MessageLite& base, $uint8$* $nonnull$ target, + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) { const $classname$& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE $uint8$* $nonnull$ $classname$::_InternalSerialize( $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ stream) const { + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) const { const $classname$& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE $annotate_serialize$ target = @@ -4678,13 +4664,13 @@ void MessageGenerator::GenerateSerializeWithCachedSizesToArray(io::Printer* p) { R"cc( #if defined(PROTOBUF_CUSTOM_VTABLE) $uint8$* $nonnull$ $classname$::_InternalSerialize( - const MessageLite& base, $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ stream) { + const $pb$::MessageLite& base, $uint8$* $nonnull$ target, + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) { const $classname$& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE $uint8$* $nonnull$ $classname$::_InternalSerialize( $uint8$* $nonnull$ target, - ::$proto_ns$::io::EpsCopyOutputStream* $nonnull$ stream) const { + $pb$::io::EpsCopyOutputStream* $nonnull$ stream) const { const $classname$& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE $annotate_serialize$; diff --git a/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/src/google/protobuf/compiler/cpp/parse_function_generator.cc index 7723d904e6801..b38f832c52e51 100644 --- a/src/google/protobuf/compiler/cpp/parse_function_generator.cc +++ b/src/google/protobuf/compiler/cpp/parse_function_generator.cc @@ -162,11 +162,11 @@ void ParseFunctionGenerator::GenerateDataDecls(io::Printer* p) { {"field_lookup_size", field_num_to_entry_table.size16()}, }, R"cc( - friend class ::$proto_ns$::internal::TcParser; + friend class $pbi$::TcParser; $SECTION$ - static const ::$proto_ns$::internal::TcParseTable< - $table_size_log2$, $num_field_entries$, $num_field_aux$, - $name_table_size$, $field_lookup_size$> + static const $pbi$::TcParseTable<$table_size_log2$, $num_field_entries$, + $num_field_aux$, $name_table_size$, + $field_lookup_size$> _table_; )cc"); } diff --git a/src/google/protobuf/compiler/cpp/service.cc b/src/google/protobuf/compiler/cpp/service.cc index 80a19fd5bcf8f..e876c29decc0f 100644 --- a/src/google/protobuf/compiler/cpp/service.cc +++ b/src/google/protobuf/compiler/cpp/service.cc @@ -31,7 +31,7 @@ void ServiceGenerator::GenerateDeclarations(io::Printer* printer) { }, R"cc( class $classname$_Stub; - class $dllexport_decl $$classname$ : public ::$proto_ns$::Service { + class $dllexport_decl $$classname$ : public $pb$::Service { protected: $classname$() = default; @@ -42,50 +42,48 @@ void ServiceGenerator::GenerateDeclarations(io::Printer* printer) { $classname$& operator=(const $classname$&) = delete; virtual ~$classname$() = default; - static const ::$proto_ns$::ServiceDescriptor* $nonnull$ descriptor(); + static const $pb$::ServiceDescriptor* $nonnull$ descriptor(); $virts$; // implements Service ---------------------------------------------- - const ::$proto_ns$::ServiceDescriptor* $nonnull$ GetDescriptor() override; + const $pb$::ServiceDescriptor* $nonnull$ GetDescriptor() override; void CallMethod( //~ - const ::$proto_ns$::MethodDescriptor* $nonnull$ method, - ::$proto_ns$::RpcController* $nullable$ controller, - const ::$proto_ns$::Message* $nonnull$ request, - ::$proto_ns$::Message* $nonnull$ response, + const $pb$::MethodDescriptor* $nonnull$ method, + $pb$::RpcController* $nullable$ controller, + const $pb$::Message* $nonnull$ request, + $pb$::Message* $nonnull$ response, ::google::protobuf::Closure* $nullable$ done) override; - const ::$proto_ns$::Message& GetRequestPrototype( - const ::$proto_ns$::MethodDescriptor* $nonnull$ - method) const override; + const $pb$::Message& GetRequestPrototype( + const $pb$::MethodDescriptor* $nonnull$ method) const override; - const ::$proto_ns$::Message& GetResponsePrototype( - const ::$proto_ns$::MethodDescriptor* $nonnull$ - method) const override; + const $pb$::Message& GetResponsePrototype( + const $pb$::MethodDescriptor* $nonnull$ method) const override; }; class $dllexport_decl $$classname$_Stub final : public $classname$ { public: //~ It seems like channel should be nonnull, but some tests use //~ nullptr. TODO: clean up and switch to nonnull. - $classname$_Stub(::$proto_ns$::RpcChannel* $nullable$ channel); - $classname$_Stub(::$proto_ns$::RpcChannel* $nullable$ channel, - ::$proto_ns$::Service::ChannelOwnership ownership); + $classname$_Stub($pb$::RpcChannel* $nullable$ channel); + $classname$_Stub($pb$::RpcChannel* $nullable$ channel, + $pb$::Service::ChannelOwnership ownership); $classname$_Stub(const $classname$_Stub&) = delete; $classname$_Stub& operator=(const $classname$_Stub&) = delete; ~$classname$_Stub() override; - inline ::$proto_ns$::RpcChannel* $nullable$ channel() { return channel_; } + inline $pb$::RpcChannel* $nullable$ channel() { return channel_; } // implements $classname$ ------------------------------------------ $impls$; private: - ::$proto_ns$::RpcChannel* $nullable$ channel_; + $pb$::RpcChannel* $nullable$ channel_; bool owns_channel_; }; )cc"); @@ -107,7 +105,7 @@ void ServiceGenerator::GenerateMethodSignatures(VirtualOrNot virtual_or_not, // No cc, clang-format does not format this string well due to the // $ override$ substitution. R"( - $virtual $void $name$(::$proto_ns$::RpcController* $nullable$ controller, + $virtual $void $name$($pb$::RpcController* $nullable$ controller, const $input$* $nonnull$ request, $output$* $nonnull$ response, ::google::protobuf::Closure* $nullable$ done)$ override$; @@ -129,13 +127,12 @@ void ServiceGenerator::GenerateImplementation(io::Printer* printer) { {"stub_methods", [&] { GenerateStubMethods(printer); }}, }, R"cc( - const ::$proto_ns$::ServiceDescriptor* $nonnull$ - $classname$::descriptor() { - ::$proto_ns$::internal::AssignDescriptors(&$desc_table$); + const $pb$::ServiceDescriptor* $nonnull$ $classname$::descriptor() { + $pbi$::AssignDescriptors(&$desc_table$); return $file_level_service_descriptors$[$index$]; } - const ::$proto_ns$::ServiceDescriptor* $nonnull$ $classname$::GetDescriptor() { + const $pb$::ServiceDescriptor* $nonnull$ $classname$::GetDescriptor() { return descriptor(); } @@ -147,16 +144,14 @@ void ServiceGenerator::GenerateImplementation(io::Printer* printer) { $get_response$; - $classname$_Stub::$classname$_Stub( - ::$proto_ns$::RpcChannel* $nullable$ channel) + $classname$_Stub::$classname$_Stub($pb$::RpcChannel* $nullable$ channel) : channel_(channel), owns_channel_(false) {} $classname$_Stub::$classname$_Stub( - ::$proto_ns$::RpcChannel* $nullable$ channel, - ::$proto_ns$::Service::ChannelOwnership ownership) + $pb$::RpcChannel* $nullable$ channel, + $pb$::Service::ChannelOwnership ownership) : channel_(channel), - owns_channel_(ownership == - ::$proto_ns$::Service::STUB_OWNS_CHANNEL) {} + owns_channel_(ownership == $pb$::Service::STUB_OWNS_CHANNEL) {} $classname$_Stub::~$classname$_Stub() { if (owns_channel_) delete channel_; @@ -177,10 +172,10 @@ void ServiceGenerator::GenerateNotImplementedMethods(io::Printer* printer) { {"output", QualifiedClassName(method->output_type(), *options_)}, }, R"cc( - void $classname$::$name$( - ::$proto_ns$::RpcController* $nullable$ controller, - const $input$* $nonnull$, $output$* $nonnull$, - ::google::protobuf::Closure* $nullable$ done) { + void $classname$::$name$($pb$::RpcController* $nullable$ controller, + const $input$* $nonnull$, + $output$* $nonnull$, + ::google::protobuf::Closure* $nullable$ done) { controller->SetFailed("Method $name$() not implemented."); done->Run(); } @@ -196,11 +191,10 @@ void ServiceGenerator::GenerateCallMethod(io::Printer* printer) { }, R"cc( void $classname$::CallMethod( - const ::$proto_ns$::MethodDescriptor* $nonnull$ method, - ::$proto_ns$::RpcController* $nullable$ controller, - const ::$proto_ns$::Message* $nonnull$ request, - ::$proto_ns$::Message* $nonnull$ response, - ::google::protobuf::Closure* $nullable$ done) { + const $pb$::MethodDescriptor* $nonnull$ method, + $pb$::RpcController* $nullable$ controller, + const $pb$::Message* $nonnull$ request, + $pb$::Message* $nonnull$ response, ::google::protobuf::Closure* $nullable$ done) { ABSL_DCHECK_EQ(method->service(), $file_level_service_descriptors$[$index$]); switch (method->index()) { $cases$; @@ -240,16 +234,16 @@ void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which, }}, }, R"cc( - const ::$proto_ns$::Message& $classname$::Get$which$Prototype( - const ::$proto_ns$::MethodDescriptor* $nonnull$ method) const { + const $pb$::Message& $classname$::Get$which$Prototype( + const $pb$::MethodDescriptor* $nonnull$ method) const { ABSL_DCHECK_EQ(method->service(), descriptor()); switch (method->index()) { $cases$; default: ABSL_LOG(FATAL) << "Bad method index; this should never happen."; - return *::$proto_ns$::MessageFactory::generated_factory() - ->GetPrototype(method->$which_type$_type()); + return *$pb$::MessageFactory::generated_factory()->GetPrototype( + method->$which_type$_type()); } } )cc"); @@ -267,10 +261,8 @@ void ServiceGenerator::GenerateCallMethodCases(io::Printer* printer) { }, R"cc( case $index$: - this->$name$(controller, - ::$proto_ns$::DownCastMessage<$input$>(request), - ::$proto_ns$::DownCastMessage<$output$>(response), - done); + this->$name$(controller, $pb$::DownCastMessage<$input$>(request), + $pb$::DownCastMessage<$output$>(response), done); break; )cc"); } @@ -289,7 +281,7 @@ void ServiceGenerator::GenerateStubMethods(io::Printer* printer) { }, R"cc( void $classname$_Stub::$name$( - ::$proto_ns$::RpcController* $nullable$ controller, + $pb$::RpcController* $nullable$ controller, const $input$* $nonnull$ request, $output$* $nonnull$ response, ::google::protobuf::Closure* $nullable$ done) { channel_->CallMethod(descriptor()->method($index$), controller, diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 9cd55c4bc919d..b961624b743aa 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -302,7 +302,7 @@ PROTOBUF_NOINLINE void JavaFeatures::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL JavaFeatures::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const JavaFeatures& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 5584fc029c6d4..0da7ffb146025 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -52,8 +52,7 @@ struct PROTOC_EXPORT TableStruct_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffe static const ::uint32_t offsets[]; }; extern "C" { -PROTOC_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto; +PROTOC_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto; } // extern "C" namespace pb { enum JavaFeatures_Utf8Validation : int; @@ -97,14 +96,13 @@ const std::string& JavaFeatures_Utf8Validation_Name(T value) { } template <> inline const std::string& JavaFeatures_Utf8Validation_Name(JavaFeatures_Utf8Validation value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool JavaFeatures_Utf8Validation_Parse( absl::string_view name, JavaFeatures_Utf8Validation* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - JavaFeatures_Utf8Validation_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(JavaFeatures_Utf8Validation_descriptor(), name, + value); } // =================================================================== @@ -126,8 +124,7 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR JavaFeatures( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR JavaFeatures(::google::protobuf::internal::ConstantInitialized); inline JavaFeatures(const JavaFeatures& from) : JavaFeatures(nullptr, from) {} inline JavaFeatures(JavaFeatures&& from) noexcept @@ -186,8 +183,7 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - JavaFeatures* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + JavaFeatures* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -196,9 +192,8 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message void MergeFrom(const JavaFeatures& from) { JavaFeatures::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -209,23 +204,21 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -235,16 +228,14 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message void InternalSwap(JavaFeatures* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "pb.JavaFeatures"; } protected: explicit JavaFeatures(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); JavaFeatures(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const JavaFeatures& from); JavaFeatures( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - JavaFeatures&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, JavaFeatures&& from) noexcept : JavaFeatures(arena) { *this = ::std::move(from); } @@ -324,9 +315,9 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -336,8 +327,7 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -365,8 +355,7 @@ PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull JavaFeatu inline constexpr int kJavaFieldNumber = 1001; PROTOC_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< - ::google::protobuf::FeatureSet, ::google::protobuf::internal::MessageTypeTraits< ::pb::JavaFeatures >, 11, - false> + ::google::protobuf::FeatureSet, ::google::protobuf::internal::MessageTypeTraits< ::pb::JavaFeatures >, 11, false> java; // =================================================================== diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 3289663fa2196..ed543be95066b 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -499,7 +499,7 @@ PROTOBUF_NOINLINE void Version::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Version::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Version& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -515,22 +515,22 @@ ::uint8_t* PROTOBUF_NONNULL Version::_InternalSerialize( cached_has_bits = this_._impl_._has_bits_[0]; // optional int32 major = 1; if (cached_has_bits & 0x00000002u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( stream, this_._internal_major(), target); } // optional int32 minor = 2; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_minor(), target); } // optional int32 patch = 3; if (cached_has_bits & 0x00000008u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<3>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<3>( stream, this_._internal_patch(), target); } @@ -885,7 +885,7 @@ PROTOBUF_NOINLINE void CodeGeneratorRequest::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL CodeGeneratorRequest::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const CodeGeneratorRequest& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1286,7 +1286,7 @@ PROTOBUF_NOINLINE void CodeGeneratorResponse_File::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL CodeGeneratorResponse_File::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const CodeGeneratorResponse_File& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1660,7 +1660,7 @@ PROTOBUF_NOINLINE void CodeGeneratorResponse::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL CodeGeneratorResponse::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const CodeGeneratorResponse& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1691,15 +1691,15 @@ ::uint8_t* PROTOBUF_NONNULL CodeGeneratorResponse::_InternalSerialize( // optional int32 minimum_edition = 3; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<3>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<3>( stream, this_._internal_minimum_edition(), target); } // optional int32 maximum_edition = 4; if (cached_has_bits & 0x00000008u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<4>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<4>( stream, this_._internal_maximum_edition(), target); } diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 2078ca407d39a..4c8a9f78598fc 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -58,8 +58,7 @@ struct PROTOC_EXPORT TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOC_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto; +PROTOC_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -117,14 +116,13 @@ const std::string& CodeGeneratorResponse_Feature_Name(T value) { } template <> inline const std::string& CodeGeneratorResponse_Feature_Name(CodeGeneratorResponse_Feature value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool CodeGeneratorResponse_Feature_Parse( absl::string_view name, CodeGeneratorResponse_Feature* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - CodeGeneratorResponse_Feature_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(CodeGeneratorResponse_Feature_descriptor(), name, + value); } // =================================================================== @@ -146,8 +144,7 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Version( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Version(::google::protobuf::internal::ConstantInitialized); inline Version(const Version& from) : Version(nullptr, from) {} inline Version(Version&& from) noexcept @@ -206,8 +203,7 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Version* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Version* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -216,9 +212,8 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message void MergeFrom(const Version& from) { Version::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -229,23 +224,21 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -255,16 +248,14 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message void InternalSwap(Version* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.compiler.Version"; } protected: explicit Version(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Version(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Version& from); Version( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Version&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Version&& from) noexcept : Version(arena) { *this = ::std::move(from); } @@ -340,9 +331,9 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 4, 0, - 47, 2> + static const ::google::protobuf::internal::TcParseTable<2, 4, + 0, 47, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -352,8 +343,7 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -390,8 +380,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf #endif template - explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse_File( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse_File(::google::protobuf::internal::ConstantInitialized); inline CodeGeneratorResponse_File(const CodeGeneratorResponse_File& from) : CodeGeneratorResponse_File(nullptr, from) {} inline CodeGeneratorResponse_File(CodeGeneratorResponse_File&& from) noexcept @@ -450,8 +439,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf // implements Message ---------------------------------------------- - CodeGeneratorResponse_File* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + CodeGeneratorResponse_File* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -460,9 +448,8 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf void MergeFrom(const CodeGeneratorResponse_File& from) { CodeGeneratorResponse_File::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -473,23 +460,21 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -499,16 +484,14 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf void InternalSwap(CodeGeneratorResponse_File* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.compiler.CodeGeneratorResponse.File"; } protected: explicit CodeGeneratorResponse_File(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); CodeGeneratorResponse_File(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const CodeGeneratorResponse_File& from); CodeGeneratorResponse_File( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - CodeGeneratorResponse_File&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, CodeGeneratorResponse_File&& from) noexcept : CodeGeneratorResponse_File(arena) { *this = ::std::move(from); } @@ -598,9 +581,9 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 4, 1, - 86, 2> + static const ::google::protobuf::internal::TcParseTable<2, 4, + 1, 86, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -610,8 +593,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -648,8 +630,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes #endif template - explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse(::google::protobuf::internal::ConstantInitialized); inline CodeGeneratorResponse(const CodeGeneratorResponse& from) : CodeGeneratorResponse(nullptr, from) {} inline CodeGeneratorResponse(CodeGeneratorResponse&& from) noexcept @@ -708,8 +689,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes // implements Message ---------------------------------------------- - CodeGeneratorResponse* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + CodeGeneratorResponse* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -718,9 +698,8 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes void MergeFrom(const CodeGeneratorResponse& from) { CodeGeneratorResponse::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -731,23 +710,21 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -757,16 +734,14 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes void InternalSwap(CodeGeneratorResponse* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.compiler.CodeGeneratorResponse"; } protected: explicit CodeGeneratorResponse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); CodeGeneratorResponse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const CodeGeneratorResponse& from); CodeGeneratorResponse( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - CodeGeneratorResponse&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, CodeGeneratorResponse&& from) noexcept : CodeGeneratorResponse(arena) { *this = ::std::move(from); } @@ -882,9 +857,9 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 1, - 60, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 1, 60, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -894,8 +869,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -933,8 +907,7 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess #endif template - explicit PROTOBUF_CONSTEXPR CodeGeneratorRequest( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR CodeGeneratorRequest(::google::protobuf::internal::ConstantInitialized); inline CodeGeneratorRequest(const CodeGeneratorRequest& from) : CodeGeneratorRequest(nullptr, from) {} inline CodeGeneratorRequest(CodeGeneratorRequest&& from) noexcept @@ -993,8 +966,7 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess // implements Message ---------------------------------------------- - CodeGeneratorRequest* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + CodeGeneratorRequest* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -1003,9 +975,8 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess void MergeFrom(const CodeGeneratorRequest& from) { CodeGeneratorRequest::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -1021,23 +992,21 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1047,16 +1016,14 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess void InternalSwap(CodeGeneratorRequest* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.compiler.CodeGeneratorRequest"; } protected: explicit CodeGeneratorRequest(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); CodeGeneratorRequest(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const CodeGeneratorRequest& from); CodeGeneratorRequest( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - CodeGeneratorRequest&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, CodeGeneratorRequest&& from) noexcept : CodeGeneratorRequest(arena) { *this = ::std::move(from); } @@ -1171,9 +1138,9 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 3, - 79, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 3, 79, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -1183,8 +1150,7 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -1422,8 +1388,8 @@ inline void CodeGeneratorRequest::add_file_to_generate(Arg_&& value, Args_... ar args... ); // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate) } -inline const ::google::protobuf::RepeatedPtrField& -CodeGeneratorRequest::file_to_generate() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& CodeGeneratorRequest::file_to_generate() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate) return _internal_file_to_generate(); } diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 88a3995efb24c..76b9d8a0a9048 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -296,7 +296,7 @@ PROTOBUF_NOINLINE void CppFeatures::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL CppFeatures::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const CppFeatures& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 05d382a1ac91c..e6959608d84a0 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -52,8 +52,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fcpp_5ffeatures_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fcpp_5ffeatures_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fcpp_5ffeatures_2eproto; } // extern "C" namespace pb { enum CppFeatures_StringType : int; @@ -98,14 +97,13 @@ const std::string& CppFeatures_StringType_Name(T value) { } template <> inline const std::string& CppFeatures_StringType_Name(CppFeatures_StringType value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool CppFeatures_StringType_Parse( absl::string_view name, CppFeatures_StringType* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - CppFeatures_StringType_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(CppFeatures_StringType_descriptor(), name, + value); } // =================================================================== @@ -127,8 +125,7 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR CppFeatures( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR CppFeatures(::google::protobuf::internal::ConstantInitialized); inline CppFeatures(const CppFeatures& from) : CppFeatures(nullptr, from) {} inline CppFeatures(CppFeatures&& from) noexcept @@ -187,8 +184,7 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - CppFeatures* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + CppFeatures* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -197,9 +193,8 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message void MergeFrom(const CppFeatures& from) { CppFeatures::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -210,23 +205,21 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -236,16 +229,14 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message void InternalSwap(CppFeatures* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "pb.CppFeatures"; } protected: explicit CppFeatures(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); CppFeatures(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const CppFeatures& from); CppFeatures( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - CppFeatures&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, CppFeatures&& from) noexcept : CppFeatures(arena) { *this = ::std::move(from); } @@ -326,9 +317,9 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -338,8 +329,7 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -367,8 +357,7 @@ PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull CppFeat inline constexpr int kCppFieldNumber = 1000; PROTOBUF_EXPORT extern ::google::protobuf::internal::ExtensionIdentifier< - ::google::protobuf::FeatureSet, ::google::protobuf::internal::MessageTypeTraits< ::pb::CppFeatures >, 11, - false> + ::google::protobuf::FeatureSet, ::google::protobuf::internal::MessageTypeTraits< ::pb::CppFeatures >, 11, false> cpp; // =================================================================== diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index d5bb957aab7fc..ee014389efbf9 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -2503,7 +2503,7 @@ PROTOBUF_NOINLINE void FileDescriptorSet::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FileDescriptorSet::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FileDescriptorSet& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -2951,7 +2951,7 @@ PROTOBUF_NOINLINE void FileDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FileDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FileDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -3493,7 +3493,7 @@ PROTOBUF_NOINLINE void DescriptorProto_ExtensionRange::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL DescriptorProto_ExtensionRange::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const DescriptorProto_ExtensionRange& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -3509,15 +3509,15 @@ ::uint8_t* PROTOBUF_NONNULL DescriptorProto_ExtensionRange::_InternalSerialize( cached_has_bits = this_._impl_._has_bits_[0]; // optional int32 start = 1; if (cached_has_bits & 0x00000002u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( stream, this_._internal_start(), target); } // optional int32 end = 2; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_end(), target); } @@ -3790,7 +3790,7 @@ PROTOBUF_NOINLINE void DescriptorProto_ReservedRange::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL DescriptorProto_ReservedRange::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const DescriptorProto_ReservedRange& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -3806,15 +3806,15 @@ ::uint8_t* PROTOBUF_NONNULL DescriptorProto_ReservedRange::_InternalSerialize( cached_has_bits = this_._impl_._has_bits_[0]; // optional int32 start = 1; if (cached_has_bits & 0x00000001u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( stream, this_._internal_start(), target); } // optional int32 end = 2; if (cached_has_bits & 0x00000002u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_end(), target); } @@ -4208,7 +4208,7 @@ PROTOBUF_NOINLINE void DescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL DescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const DescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -4727,7 +4727,7 @@ PROTOBUF_NOINLINE void ExtensionRangeOptions_Declaration::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL ExtensionRangeOptions_Declaration::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const ExtensionRangeOptions_Declaration& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -4743,8 +4743,8 @@ ::uint8_t* PROTOBUF_NONNULL ExtensionRangeOptions_Declaration::_InternalSerializ cached_has_bits = this_._impl_._has_bits_[0]; // optional int32 number = 1; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( stream, this_._internal_number(), target); } @@ -5111,7 +5111,7 @@ PROTOBUF_NOINLINE void ExtensionRangeOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL ExtensionRangeOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const ExtensionRangeOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -5583,7 +5583,7 @@ PROTOBUF_NOINLINE void FieldDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FieldDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FieldDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -5615,8 +5615,8 @@ ::uint8_t* PROTOBUF_NONNULL FieldDescriptorProto::_InternalSerialize( // optional int32 number = 3; if (cached_has_bits & 0x00000040u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<3>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<3>( stream, this_._internal_number(), target); } @@ -5659,8 +5659,8 @@ ::uint8_t* PROTOBUF_NONNULL FieldDescriptorProto::_InternalSerialize( // optional int32 oneof_index = 9; if (cached_has_bits & 0x00000080u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<9>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<9>( stream, this_._internal_oneof_index(), target); } @@ -6039,7 +6039,7 @@ PROTOBUF_NOINLINE void OneofDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL OneofDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const OneofDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -6320,7 +6320,7 @@ PROTOBUF_NOINLINE void EnumDescriptorProto_EnumReservedRange::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumDescriptorProto_EnumReservedRange::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumDescriptorProto_EnumReservedRange& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -6336,15 +6336,15 @@ ::uint8_t* PROTOBUF_NONNULL EnumDescriptorProto_EnumReservedRange::_InternalSeri cached_has_bits = this_._impl_._has_bits_[0]; // optional int32 start = 1; if (cached_has_bits & 0x00000001u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<1>( stream, this_._internal_start(), target); } // optional int32 end = 2; if (cached_has_bits & 0x00000002u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_end(), target); } @@ -6665,7 +6665,7 @@ PROTOBUF_NOINLINE void EnumDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -7049,7 +7049,7 @@ PROTOBUF_NOINLINE void EnumValueDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumValueDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumValueDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -7073,8 +7073,8 @@ ::uint8_t* PROTOBUF_NONNULL EnumValueDescriptorProto::_InternalSerialize( // optional int32 number = 2; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_number(), target); } @@ -7397,7 +7397,7 @@ PROTOBUF_NOINLINE void ServiceDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL ServiceDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const ServiceDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -7782,7 +7782,7 @@ PROTOBUF_NOINLINE void MethodDescriptorProto::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL MethodDescriptorProto::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const MethodDescriptorProto& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -8389,7 +8389,7 @@ PROTOBUF_NOINLINE void FileOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FileOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FileOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -9079,7 +9079,7 @@ PROTOBUF_NOINLINE void MessageOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL MessageOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const MessageOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -9465,7 +9465,7 @@ PROTOBUF_NOINLINE void FieldOptions_EditionDefault::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FieldOptions_EditionDefault::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FieldOptions_EditionDefault& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -9776,7 +9776,7 @@ PROTOBUF_NOINLINE void FieldOptions_FeatureSupport::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FieldOptions_FeatureSupport::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FieldOptions_FeatureSupport& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -10234,7 +10234,7 @@ PROTOBUF_NOINLINE void FieldOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FieldOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FieldOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -10767,7 +10767,7 @@ PROTOBUF_NOINLINE void OneofOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL OneofOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const OneofOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -11133,7 +11133,7 @@ PROTOBUF_NOINLINE void EnumOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -11561,7 +11561,7 @@ PROTOBUF_NOINLINE void EnumValueOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumValueOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumValueOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -11963,7 +11963,7 @@ PROTOBUF_NOINLINE void ServiceOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL ServiceOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const ServiceOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -12351,7 +12351,7 @@ PROTOBUF_NOINLINE void MethodOptions::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL MethodOptions::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const MethodOptions& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -12697,7 +12697,7 @@ PROTOBUF_NOINLINE void UninterpretedOption_NamePart::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL UninterpretedOption_NamePart::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const UninterpretedOption_NamePart& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -13062,7 +13062,7 @@ PROTOBUF_NOINLINE void UninterpretedOption::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL UninterpretedOption::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const UninterpretedOption& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -13104,8 +13104,8 @@ ::uint8_t* PROTOBUF_NONNULL UninterpretedOption::_InternalSerialize( // optional int64 negative_int_value = 5; if (cached_has_bits & 0x00000010u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt64ToArrayWithField<5>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt64ToArrayWithField<5>( stream, this_._internal_negative_int_value(), target); } @@ -13492,7 +13492,7 @@ PROTOBUF_NOINLINE void FeatureSet::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FeatureSet::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FeatureSet& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -13873,7 +13873,7 @@ PROTOBUF_NOINLINE void FeatureSetDefaults_FeatureSetEditionDefault::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FeatureSetDefaults_FeatureSetEditionDefault::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FeatureSetDefaults_FeatureSetEditionDefault& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -14219,7 +14219,7 @@ PROTOBUF_NOINLINE void FeatureSetDefaults::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FeatureSetDefaults::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FeatureSetDefaults& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -14591,7 +14591,7 @@ PROTOBUF_NOINLINE void SourceCodeInfo_Location::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL SourceCodeInfo_Location::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const SourceCodeInfo_Location& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -14928,7 +14928,7 @@ PROTOBUF_NOINLINE void SourceCodeInfo::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL SourceCodeInfo::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const SourceCodeInfo& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -15256,7 +15256,7 @@ PROTOBUF_NOINLINE void GeneratedCodeInfo_Annotation::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL GeneratedCodeInfo_Annotation::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const GeneratedCodeInfo_Annotation& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -15289,15 +15289,15 @@ ::uint8_t* PROTOBUF_NONNULL GeneratedCodeInfo_Annotation::_InternalSerialize( // optional int32 begin = 3; if (cached_has_bits & 0x00000002u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<3>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<3>( stream, this_._internal_begin(), target); } // optional int32 end = 4; if (cached_has_bits & 0x00000004u) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<4>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<4>( stream, this_._internal_end(), target); } @@ -15583,7 +15583,7 @@ PROTOBUF_NOINLINE void GeneratedCodeInfo::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL GeneratedCodeInfo::_InternalSerialize( - const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const GeneratedCodeInfo& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 801894a745c7e..e14c5168896df 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -51,8 +51,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fdescriptor_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fdescriptor_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -307,14 +306,13 @@ const std::string& ExtensionRangeOptions_VerificationState_Name(T value) { } template <> inline const std::string& ExtensionRangeOptions_VerificationState_Name(ExtensionRangeOptions_VerificationState value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool ExtensionRangeOptions_VerificationState_Parse( absl::string_view name, ExtensionRangeOptions_VerificationState* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - ExtensionRangeOptions_VerificationState_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(ExtensionRangeOptions_VerificationState_descriptor(), name, + value); } enum FieldDescriptorProto_Type : int { FieldDescriptorProto_Type_TYPE_DOUBLE = 1, @@ -356,14 +354,13 @@ const std::string& FieldDescriptorProto_Type_Name(T value) { } template <> inline const std::string& FieldDescriptorProto_Type_Name(FieldDescriptorProto_Type value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldDescriptorProto_Type_Parse( absl::string_view name, FieldDescriptorProto_Type* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldDescriptorProto_Type_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldDescriptorProto_Type_descriptor(), name, + value); } enum FieldDescriptorProto_Label : int { FieldDescriptorProto_Label_LABEL_OPTIONAL = 1, @@ -390,14 +387,13 @@ const std::string& FieldDescriptorProto_Label_Name(T value) { } template <> inline const std::string& FieldDescriptorProto_Label_Name(FieldDescriptorProto_Label value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldDescriptorProto_Label_Parse( absl::string_view name, FieldDescriptorProto_Label* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldDescriptorProto_Label_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldDescriptorProto_Label_descriptor(), name, + value); } enum FileOptions_OptimizeMode : int { FileOptions_OptimizeMode_SPEED = 1, @@ -424,14 +420,13 @@ const std::string& FileOptions_OptimizeMode_Name(T value) { } template <> inline const std::string& FileOptions_OptimizeMode_Name(FileOptions_OptimizeMode value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FileOptions_OptimizeMode_Parse( absl::string_view name, FileOptions_OptimizeMode* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FileOptions_OptimizeMode_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FileOptions_OptimizeMode_descriptor(), name, + value); } enum FieldOptions_CType : int { FieldOptions_CType_STRING = 0, @@ -458,14 +453,13 @@ const std::string& FieldOptions_CType_Name(T value) { } template <> inline const std::string& FieldOptions_CType_Name(FieldOptions_CType value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldOptions_CType_Parse( absl::string_view name, FieldOptions_CType* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldOptions_CType_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldOptions_CType_descriptor(), name, + value); } enum FieldOptions_JSType : int { FieldOptions_JSType_JS_NORMAL = 0, @@ -492,14 +486,13 @@ const std::string& FieldOptions_JSType_Name(T value) { } template <> inline const std::string& FieldOptions_JSType_Name(FieldOptions_JSType value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldOptions_JSType_Parse( absl::string_view name, FieldOptions_JSType* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldOptions_JSType_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldOptions_JSType_descriptor(), name, + value); } enum FieldOptions_OptionRetention : int { FieldOptions_OptionRetention_RETENTION_UNKNOWN = 0, @@ -526,14 +519,13 @@ const std::string& FieldOptions_OptionRetention_Name(T value) { } template <> inline const std::string& FieldOptions_OptionRetention_Name(FieldOptions_OptionRetention value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldOptions_OptionRetention_Parse( absl::string_view name, FieldOptions_OptionRetention* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldOptions_OptionRetention_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldOptions_OptionRetention_descriptor(), name, + value); } enum FieldOptions_OptionTargetType : int { FieldOptions_OptionTargetType_TARGET_TYPE_UNKNOWN = 0, @@ -567,14 +559,13 @@ const std::string& FieldOptions_OptionTargetType_Name(T value) { } template <> inline const std::string& FieldOptions_OptionTargetType_Name(FieldOptions_OptionTargetType value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FieldOptions_OptionTargetType_Parse( absl::string_view name, FieldOptions_OptionTargetType* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FieldOptions_OptionTargetType_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FieldOptions_OptionTargetType_descriptor(), name, + value); } enum MethodOptions_IdempotencyLevel : int { MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN = 0, @@ -601,14 +592,13 @@ const std::string& MethodOptions_IdempotencyLevel_Name(T value) { } template <> inline const std::string& MethodOptions_IdempotencyLevel_Name(MethodOptions_IdempotencyLevel value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool MethodOptions_IdempotencyLevel_Parse( absl::string_view name, MethodOptions_IdempotencyLevel* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - MethodOptions_IdempotencyLevel_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(MethodOptions_IdempotencyLevel_descriptor(), name, + value); } enum FeatureSet_FieldPresence : int { FeatureSet_FieldPresence_FIELD_PRESENCE_UNKNOWN = 0, @@ -636,14 +626,13 @@ const std::string& FeatureSet_FieldPresence_Name(T value) { } template <> inline const std::string& FeatureSet_FieldPresence_Name(FeatureSet_FieldPresence value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_FieldPresence_Parse( absl::string_view name, FeatureSet_FieldPresence* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_FieldPresence_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_FieldPresence_descriptor(), name, + value); } enum FeatureSet_EnumType : int { FeatureSet_EnumType_ENUM_TYPE_UNKNOWN = 0, @@ -670,14 +659,13 @@ const std::string& FeatureSet_EnumType_Name(T value) { } template <> inline const std::string& FeatureSet_EnumType_Name(FeatureSet_EnumType value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_EnumType_Parse( absl::string_view name, FeatureSet_EnumType* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_EnumType_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_EnumType_descriptor(), name, + value); } enum FeatureSet_RepeatedFieldEncoding : int { FeatureSet_RepeatedFieldEncoding_REPEATED_FIELD_ENCODING_UNKNOWN = 0, @@ -704,14 +692,13 @@ const std::string& FeatureSet_RepeatedFieldEncoding_Name(T value) { } template <> inline const std::string& FeatureSet_RepeatedFieldEncoding_Name(FeatureSet_RepeatedFieldEncoding value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_RepeatedFieldEncoding_Parse( absl::string_view name, FeatureSet_RepeatedFieldEncoding* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_RepeatedFieldEncoding_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_RepeatedFieldEncoding_descriptor(), name, + value); } enum FeatureSet_Utf8Validation : int { FeatureSet_Utf8Validation_UTF8_VALIDATION_UNKNOWN = 0, @@ -738,14 +725,13 @@ const std::string& FeatureSet_Utf8Validation_Name(T value) { } template <> inline const std::string& FeatureSet_Utf8Validation_Name(FeatureSet_Utf8Validation value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_Utf8Validation_Parse( absl::string_view name, FeatureSet_Utf8Validation* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_Utf8Validation_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_Utf8Validation_descriptor(), name, + value); } enum FeatureSet_MessageEncoding : int { FeatureSet_MessageEncoding_MESSAGE_ENCODING_UNKNOWN = 0, @@ -772,14 +758,13 @@ const std::string& FeatureSet_MessageEncoding_Name(T value) { } template <> inline const std::string& FeatureSet_MessageEncoding_Name(FeatureSet_MessageEncoding value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_MessageEncoding_Parse( absl::string_view name, FeatureSet_MessageEncoding* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_MessageEncoding_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_MessageEncoding_descriptor(), name, + value); } enum FeatureSet_JsonFormat : int { FeatureSet_JsonFormat_JSON_FORMAT_UNKNOWN = 0, @@ -806,14 +791,13 @@ const std::string& FeatureSet_JsonFormat_Name(T value) { } template <> inline const std::string& FeatureSet_JsonFormat_Name(FeatureSet_JsonFormat value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool FeatureSet_JsonFormat_Parse( absl::string_view name, FeatureSet_JsonFormat* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - FeatureSet_JsonFormat_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(FeatureSet_JsonFormat_descriptor(), name, + value); } enum GeneratedCodeInfo_Annotation_Semantic : int { GeneratedCodeInfo_Annotation_Semantic_NONE = 0, @@ -840,14 +824,13 @@ const std::string& GeneratedCodeInfo_Annotation_Semantic_Name(T value) { } template <> inline const std::string& GeneratedCodeInfo_Annotation_Semantic_Name(GeneratedCodeInfo_Annotation_Semantic value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool GeneratedCodeInfo_Annotation_Semantic_Parse( absl::string_view name, GeneratedCodeInfo_Annotation_Semantic* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - GeneratedCodeInfo_Annotation_Semantic_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(GeneratedCodeInfo_Annotation_Semantic_descriptor(), name, + value); } enum Edition : int { EDITION_UNKNOWN = 0, @@ -882,8 +865,8 @@ const std::string& Edition_Name(T value) { } inline bool Edition_Parse( absl::string_view name, Edition* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - Edition_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(Edition_descriptor(), name, + value); } // =================================================================== @@ -905,8 +888,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot #endif template - explicit PROTOBUF_CONSTEXPR UninterpretedOption_NamePart( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR UninterpretedOption_NamePart(::google::protobuf::internal::ConstantInitialized); inline UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from) : UninterpretedOption_NamePart(nullptr, from) {} inline UninterpretedOption_NamePart(UninterpretedOption_NamePart&& from) noexcept @@ -965,8 +947,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot // implements Message ---------------------------------------------- - UninterpretedOption_NamePart* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + UninterpretedOption_NamePart* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -975,9 +956,8 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot void MergeFrom(const UninterpretedOption_NamePart& from) { UninterpretedOption_NamePart::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -993,23 +973,21 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1019,16 +997,14 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot void InternalSwap(UninterpretedOption_NamePart* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.UninterpretedOption.NamePart"; } protected: explicit UninterpretedOption_NamePart(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); UninterpretedOption_NamePart(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const UninterpretedOption_NamePart& from); UninterpretedOption_NamePart( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - UninterpretedOption_NamePart&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, UninterpretedOption_NamePart&& from) noexcept : UninterpretedOption_NamePart(arena) { *this = ::std::move(from); } @@ -1080,9 +1056,9 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, - 62, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 0, 62, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -1092,8 +1068,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -1128,8 +1103,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: #endif template - explicit PROTOBUF_CONSTEXPR SourceCodeInfo_Location( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR SourceCodeInfo_Location(::google::protobuf::internal::ConstantInitialized); inline SourceCodeInfo_Location(const SourceCodeInfo_Location& from) : SourceCodeInfo_Location(nullptr, from) {} inline SourceCodeInfo_Location(SourceCodeInfo_Location&& from) noexcept @@ -1188,8 +1162,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: // implements Message ---------------------------------------------- - SourceCodeInfo_Location* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + SourceCodeInfo_Location* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -1198,9 +1171,8 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: void MergeFrom(const SourceCodeInfo_Location& from) { SourceCodeInfo_Location::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -1211,23 +1183,21 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1237,16 +1207,14 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: void InternalSwap(SourceCodeInfo_Location* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.SourceCodeInfo.Location"; } protected: explicit SourceCodeInfo_Location(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); SourceCodeInfo_Location(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const SourceCodeInfo_Location& from); SourceCodeInfo_Location( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - SourceCodeInfo_Location&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, SourceCodeInfo_Location&& from) noexcept : SourceCodeInfo_Location(arena) { *this = ::std::move(from); } @@ -1364,9 +1332,9 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 0, - 106, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 0, 106, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -1376,8 +1344,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -1417,8 +1384,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot #endif template - explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation(::google::protobuf::internal::ConstantInitialized); inline GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from) : GeneratedCodeInfo_Annotation(nullptr, from) {} inline GeneratedCodeInfo_Annotation(GeneratedCodeInfo_Annotation&& from) noexcept @@ -1477,8 +1443,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot // implements Message ---------------------------------------------- - GeneratedCodeInfo_Annotation* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + GeneratedCodeInfo_Annotation* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -1487,9 +1452,8 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot void MergeFrom(const GeneratedCodeInfo_Annotation& from) { GeneratedCodeInfo_Annotation::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -1500,23 +1464,21 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1526,16 +1488,14 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot void InternalSwap(GeneratedCodeInfo_Annotation* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.GeneratedCodeInfo.Annotation"; } protected: explicit GeneratedCodeInfo_Annotation(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); GeneratedCodeInfo_Annotation(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const GeneratedCodeInfo_Annotation& from); GeneratedCodeInfo_Annotation( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - GeneratedCodeInfo_Annotation&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, GeneratedCodeInfo_Annotation&& from) noexcept : GeneratedCodeInfo_Annotation(arena) { *this = ::std::move(from); } @@ -1651,9 +1611,9 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 1, - 64, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 1, 64, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -1663,8 +1623,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -1703,8 +1662,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto #endif template - explicit PROTOBUF_CONSTEXPR FieldOptions_FeatureSupport( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldOptions_FeatureSupport(::google::protobuf::internal::ConstantInitialized); inline FieldOptions_FeatureSupport(const FieldOptions_FeatureSupport& from) : FieldOptions_FeatureSupport(nullptr, from) {} inline FieldOptions_FeatureSupport(FieldOptions_FeatureSupport&& from) noexcept @@ -1763,8 +1721,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto // implements Message ---------------------------------------------- - FieldOptions_FeatureSupport* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldOptions_FeatureSupport* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -1773,9 +1730,8 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto void MergeFrom(const FieldOptions_FeatureSupport& from) { FieldOptions_FeatureSupport::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -1786,23 +1742,21 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1812,16 +1766,14 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto void InternalSwap(FieldOptions_FeatureSupport* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FieldOptions.FeatureSupport"; } protected: explicit FieldOptions_FeatureSupport(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FieldOptions_FeatureSupport(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FieldOptions_FeatureSupport& from); FieldOptions_FeatureSupport( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FieldOptions_FeatureSupport&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FieldOptions_FeatureSupport&& from) noexcept : FieldOptions_FeatureSupport(arena) { *this = ::std::move(from); } @@ -1897,9 +1849,9 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 4, 3, - 71, 2> + static const ::google::protobuf::internal::TcParseTable<2, 4, + 3, 71, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -1909,8 +1861,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -1947,8 +1898,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto #endif template - explicit PROTOBUF_CONSTEXPR FieldOptions_EditionDefault( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldOptions_EditionDefault(::google::protobuf::internal::ConstantInitialized); inline FieldOptions_EditionDefault(const FieldOptions_EditionDefault& from) : FieldOptions_EditionDefault(nullptr, from) {} inline FieldOptions_EditionDefault(FieldOptions_EditionDefault&& from) noexcept @@ -2007,8 +1957,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto // implements Message ---------------------------------------------- - FieldOptions_EditionDefault* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldOptions_EditionDefault* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -2017,9 +1966,8 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto void MergeFrom(const FieldOptions_EditionDefault& from) { FieldOptions_EditionDefault::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -2030,23 +1978,21 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2056,16 +2002,14 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto void InternalSwap(FieldOptions_EditionDefault* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FieldOptions.EditionDefault"; } protected: explicit FieldOptions_EditionDefault(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FieldOptions_EditionDefault(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FieldOptions_EditionDefault& from); FieldOptions_EditionDefault( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FieldOptions_EditionDefault&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FieldOptions_EditionDefault&& from) noexcept : FieldOptions_EditionDefault(arena) { *this = ::std::move(from); } @@ -2117,9 +2061,9 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 1, - 57, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 1, 57, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -2129,8 +2073,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -2165,8 +2108,7 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR FeatureSet( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FeatureSet(::google::protobuf::internal::ConstantInitialized); inline FeatureSet(const FeatureSet& from) : FeatureSet(nullptr, from) {} inline FeatureSet(FeatureSet&& from) noexcept @@ -2225,8 +2167,7 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - FeatureSet* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FeatureSet* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -2235,9 +2176,8 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message void MergeFrom(const FeatureSet& from) { FeatureSet::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -2253,23 +2193,21 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2279,16 +2217,14 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message void InternalSwap(FeatureSet* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FeatureSet"; } protected: explicit FeatureSet(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FeatureSet(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FeatureSet& from); FeatureSet( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FeatureSet&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FeatureSet&& from) noexcept : FeatureSet(arena) { *this = ::std::move(from); } @@ -2687,9 +2623,9 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 6, 6, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<3, 6, + 6, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -2699,8 +2635,7 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -2740,8 +2675,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: #endif template - explicit PROTOBUF_CONSTEXPR ExtensionRangeOptions_Declaration( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ExtensionRangeOptions_Declaration(::google::protobuf::internal::ConstantInitialized); inline ExtensionRangeOptions_Declaration(const ExtensionRangeOptions_Declaration& from) : ExtensionRangeOptions_Declaration(nullptr, from) {} inline ExtensionRangeOptions_Declaration(ExtensionRangeOptions_Declaration&& from) noexcept @@ -2800,8 +2734,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: // implements Message ---------------------------------------------- - ExtensionRangeOptions_Declaration* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ExtensionRangeOptions_Declaration* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -2810,9 +2743,8 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: void MergeFrom(const ExtensionRangeOptions_Declaration& from) { ExtensionRangeOptions_Declaration::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -2823,23 +2755,21 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2849,16 +2779,14 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: void InternalSwap(ExtensionRangeOptions_Declaration* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.ExtensionRangeOptions.Declaration"; } protected: explicit ExtensionRangeOptions_Declaration(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); ExtensionRangeOptions_Declaration(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const ExtensionRangeOptions_Declaration& from); ExtensionRangeOptions_Declaration( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - ExtensionRangeOptions_Declaration&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, ExtensionRangeOptions_Declaration&& from) noexcept : ExtensionRangeOptions_Declaration(arena) { *this = ::std::move(from); } @@ -2951,9 +2879,9 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 0, - 71, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 0, 71, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -2963,8 +2891,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -3002,8 +2929,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo #endif template - explicit PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange(::google::protobuf::internal::ConstantInitialized); inline EnumDescriptorProto_EnumReservedRange(const EnumDescriptorProto_EnumReservedRange& from) : EnumDescriptorProto_EnumReservedRange(nullptr, from) {} inline EnumDescriptorProto_EnumReservedRange(EnumDescriptorProto_EnumReservedRange&& from) noexcept @@ -3062,8 +2988,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo // implements Message ---------------------------------------------- - EnumDescriptorProto_EnumReservedRange* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + EnumDescriptorProto_EnumReservedRange* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -3072,9 +2997,8 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo void MergeFrom(const EnumDescriptorProto_EnumReservedRange& from) { EnumDescriptorProto_EnumReservedRange::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -3085,23 +3009,21 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3111,16 +3033,14 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo void InternalSwap(EnumDescriptorProto_EnumReservedRange* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.EnumDescriptorProto.EnumReservedRange"; } protected: explicit EnumDescriptorProto_EnumReservedRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); EnumDescriptorProto_EnumReservedRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const EnumDescriptorProto_EnumReservedRange& from); EnumDescriptorProto_EnumReservedRange( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - EnumDescriptorProto_EnumReservedRange&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, EnumDescriptorProto_EnumReservedRange&& from) noexcept : EnumDescriptorProto_EnumReservedRange(arena) { *this = ::std::move(from); } @@ -3167,9 +3087,9 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 0, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -3179,8 +3099,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -3215,8 +3134,7 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro #endif template - explicit PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange(::google::protobuf::internal::ConstantInitialized); inline DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from) : DescriptorProto_ReservedRange(nullptr, from) {} inline DescriptorProto_ReservedRange(DescriptorProto_ReservedRange&& from) noexcept @@ -3275,8 +3193,7 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro // implements Message ---------------------------------------------- - DescriptorProto_ReservedRange* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + DescriptorProto_ReservedRange* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -3285,9 +3202,8 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro void MergeFrom(const DescriptorProto_ReservedRange& from) { DescriptorProto_ReservedRange::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -3298,23 +3214,21 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3324,16 +3238,14 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro void InternalSwap(DescriptorProto_ReservedRange* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.DescriptorProto.ReservedRange"; } protected: explicit DescriptorProto_ReservedRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); DescriptorProto_ReservedRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const DescriptorProto_ReservedRange& from); DescriptorProto_ReservedRange( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - DescriptorProto_ReservedRange&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, DescriptorProto_ReservedRange&& from) noexcept : DescriptorProto_ReservedRange(arena) { *this = ::std::move(from); } @@ -3380,9 +3292,9 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 0, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -3392,8 +3304,7 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -3428,8 +3339,7 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes #endif template - explicit PROTOBUF_CONSTEXPR UninterpretedOption( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR UninterpretedOption(::google::protobuf::internal::ConstantInitialized); inline UninterpretedOption(const UninterpretedOption& from) : UninterpretedOption(nullptr, from) {} inline UninterpretedOption(UninterpretedOption&& from) noexcept @@ -3488,8 +3398,7 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes // implements Message ---------------------------------------------- - UninterpretedOption* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + UninterpretedOption* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -3498,9 +3407,8 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes void MergeFrom(const UninterpretedOption& from) { UninterpretedOption::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -3516,23 +3424,21 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3542,16 +3448,14 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes void InternalSwap(UninterpretedOption* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.UninterpretedOption"; } protected: explicit UninterpretedOption(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); UninterpretedOption(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const UninterpretedOption& from); UninterpretedOption( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - UninterpretedOption&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, UninterpretedOption&& from) noexcept : UninterpretedOption(arena) { *this = ::std::move(from); } @@ -3680,9 +3584,9 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 7, 1, - 75, 2> + static const ::google::protobuf::internal::TcParseTable<3, 7, + 1, 75, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -3692,8 +3596,7 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -3733,8 +3636,7 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR SourceCodeInfo( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR SourceCodeInfo(::google::protobuf::internal::ConstantInitialized); inline SourceCodeInfo(const SourceCodeInfo& from) : SourceCodeInfo(nullptr, from) {} inline SourceCodeInfo(SourceCodeInfo&& from) noexcept @@ -3793,8 +3695,7 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - SourceCodeInfo* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + SourceCodeInfo* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -3803,9 +3704,8 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message void MergeFrom(const SourceCodeInfo& from) { SourceCodeInfo::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -3821,23 +3721,21 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3847,16 +3745,14 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message void InternalSwap(SourceCodeInfo* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.SourceCodeInfo"; } protected: explicit SourceCodeInfo(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); SourceCodeInfo(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const SourceCodeInfo& from); SourceCodeInfo( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - SourceCodeInfo&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, SourceCodeInfo&& from) noexcept : SourceCodeInfo(arena) { *this = ::std::move(from); } @@ -4075,9 +3971,9 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -4087,8 +3983,7 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -4122,8 +4017,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa #endif template - explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo(::google::protobuf::internal::ConstantInitialized); inline GeneratedCodeInfo(const GeneratedCodeInfo& from) : GeneratedCodeInfo(nullptr, from) {} inline GeneratedCodeInfo(GeneratedCodeInfo&& from) noexcept @@ -4182,8 +4076,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa // implements Message ---------------------------------------------- - GeneratedCodeInfo* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + GeneratedCodeInfo* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -4192,9 +4085,8 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa void MergeFrom(const GeneratedCodeInfo& from) { GeneratedCodeInfo::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -4205,23 +4097,21 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -4231,16 +4121,14 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa void InternalSwap(GeneratedCodeInfo* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.GeneratedCodeInfo"; } protected: explicit GeneratedCodeInfo(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); GeneratedCodeInfo(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const GeneratedCodeInfo& from); GeneratedCodeInfo( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - GeneratedCodeInfo&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, GeneratedCodeInfo&& from) noexcept : GeneratedCodeInfo(arena) { *this = ::std::move(from); } @@ -4282,9 +4170,9 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -4294,8 +4182,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -4328,8 +4215,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public #endif template - explicit PROTOBUF_CONSTEXPR FeatureSetDefaults_FeatureSetEditionDefault( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FeatureSetDefaults_FeatureSetEditionDefault(::google::protobuf::internal::ConstantInitialized); inline FeatureSetDefaults_FeatureSetEditionDefault(const FeatureSetDefaults_FeatureSetEditionDefault& from) : FeatureSetDefaults_FeatureSetEditionDefault(nullptr, from) {} inline FeatureSetDefaults_FeatureSetEditionDefault(FeatureSetDefaults_FeatureSetEditionDefault&& from) noexcept @@ -4388,8 +4274,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public // implements Message ---------------------------------------------- - FeatureSetDefaults_FeatureSetEditionDefault* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FeatureSetDefaults_FeatureSetEditionDefault* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -4398,9 +4283,8 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public void MergeFrom(const FeatureSetDefaults_FeatureSetEditionDefault& from) { FeatureSetDefaults_FeatureSetEditionDefault::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -4416,23 +4300,21 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -4442,16 +4324,14 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public void InternalSwap(FeatureSetDefaults_FeatureSetEditionDefault* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault"; } protected: explicit FeatureSetDefaults_FeatureSetEditionDefault(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FeatureSetDefaults_FeatureSetEditionDefault(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FeatureSetDefaults_FeatureSetEditionDefault& from); FeatureSetDefaults_FeatureSetEditionDefault( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FeatureSetDefaults_FeatureSetEditionDefault&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FeatureSetDefaults_FeatureSetEditionDefault&& from) noexcept : FeatureSetDefaults_FeatureSetEditionDefault(arena) { *this = ::std::move(from); } @@ -4518,9 +4398,9 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 3, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 3, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -4530,8 +4410,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -4567,8 +4446,7 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR ServiceOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ServiceOptions(::google::protobuf::internal::ConstantInitialized); inline ServiceOptions(const ServiceOptions& from) : ServiceOptions(nullptr, from) {} inline ServiceOptions(ServiceOptions&& from) noexcept @@ -4627,8 +4505,7 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - ServiceOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ServiceOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -4637,9 +4514,8 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message void MergeFrom(const ServiceOptions& from) { ServiceOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -4655,23 +4531,21 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -4681,16 +4555,14 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message void InternalSwap(ServiceOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.ServiceOptions"; } protected: explicit ServiceOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); ServiceOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const ServiceOptions& from); ServiceOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - ServiceOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, ServiceOptions&& from) noexcept : ServiceOptions(arena) { *this = ::std::move(from); } @@ -4936,9 +4808,9 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 2, - 0, 12> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 2, 0, + 12> _table_; friend class ::google::protobuf::MessageLite; @@ -4948,8 +4820,7 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -4986,8 +4857,7 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR OneofOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR OneofOptions(::google::protobuf::internal::ConstantInitialized); inline OneofOptions(const OneofOptions& from) : OneofOptions(nullptr, from) {} inline OneofOptions(OneofOptions&& from) noexcept @@ -5046,8 +4916,7 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - OneofOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + OneofOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -5056,9 +4925,8 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message void MergeFrom(const OneofOptions& from) { OneofOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -5074,23 +4942,21 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5100,16 +4966,14 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message void InternalSwap(OneofOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.OneofOptions"; } protected: explicit OneofOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); OneofOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const OneofOptions& from); OneofOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - OneofOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, OneofOptions&& from) noexcept : OneofOptions(arena) { *this = ::std::move(from); } @@ -5343,9 +5207,9 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 2, 2, - 0, 7> + static const ::google::protobuf::internal::TcParseTable<2, 2, + 2, 0, + 7> _table_; friend class ::google::protobuf::MessageLite; @@ -5355,8 +5219,7 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -5392,8 +5255,7 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR MethodOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MethodOptions(::google::protobuf::internal::ConstantInitialized); inline MethodOptions(const MethodOptions& from) : MethodOptions(nullptr, from) {} inline MethodOptions(MethodOptions&& from) noexcept @@ -5452,8 +5314,7 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - MethodOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + MethodOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -5462,9 +5323,8 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message void MergeFrom(const MethodOptions& from) { MethodOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -5480,23 +5340,21 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5506,16 +5364,14 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message void InternalSwap(MethodOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.MethodOptions"; } protected: explicit MethodOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); MethodOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const MethodOptions& from); MethodOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - MethodOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, MethodOptions&& from) noexcept : MethodOptions(arena) { *this = ::std::move(from); } @@ -5794,9 +5650,9 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 4, 3, - 0, 12> + static const ::google::protobuf::internal::TcParseTable<3, 4, + 3, 0, + 12> _table_; friend class ::google::protobuf::MessageLite; @@ -5806,8 +5662,7 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -5845,8 +5700,7 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR MessageOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MessageOptions(::google::protobuf::internal::ConstantInitialized); inline MessageOptions(const MessageOptions& from) : MessageOptions(nullptr, from) {} inline MessageOptions(MessageOptions&& from) noexcept @@ -5905,8 +5759,7 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - MessageOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + MessageOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -5915,9 +5768,8 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message void MergeFrom(const MessageOptions& from) { MessageOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -5933,23 +5785,21 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5959,16 +5809,14 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message void InternalSwap(MessageOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.MessageOptions"; } protected: explicit MessageOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); MessageOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const MessageOptions& from); MessageOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - MessageOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, MessageOptions&& from) noexcept : MessageOptions(arena) { *this = ::std::move(from); } @@ -6262,9 +6110,9 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 7, 2, - 0, 7> + static const ::google::protobuf::internal::TcParseTable<3, 7, + 2, 0, + 7> _table_; friend class ::google::protobuf::MessageLite; @@ -6274,8 +6122,7 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -6316,8 +6163,7 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR FileOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FileOptions(::google::protobuf::internal::ConstantInitialized); inline FileOptions(const FileOptions& from) : FileOptions(nullptr, from) {} inline FileOptions(FileOptions&& from) noexcept @@ -6376,8 +6222,7 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - FileOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FileOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -6386,9 +6231,8 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message void MergeFrom(const FileOptions& from) { FileOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -6404,23 +6248,21 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -6430,16 +6272,14 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message void InternalSwap(FileOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FileOptions"; } protected: explicit FileOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FileOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FileOptions& from); FileOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FileOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FileOptions&& from) noexcept : FileOptions(arena) { *this = ::std::move(from); } @@ -6972,9 +6812,9 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 5, 21, 3, - 202, 12> + static const ::google::protobuf::internal::TcParseTable<5, 21, + 3, 202, + 12> _table_; friend class ::google::protobuf::MessageLite; @@ -6984,8 +6824,7 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -7040,8 +6879,7 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR FieldOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldOptions(::google::protobuf::internal::ConstantInitialized); inline FieldOptions(const FieldOptions& from) : FieldOptions(nullptr, from) {} inline FieldOptions(FieldOptions&& from) noexcept @@ -7100,8 +6938,7 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - FieldOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -7110,9 +6947,8 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message void MergeFrom(const FieldOptions& from) { FieldOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -7128,23 +6964,21 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -7154,16 +6988,14 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message void InternalSwap(FieldOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FieldOptions"; } protected: explicit FieldOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FieldOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FieldOptions& from); FieldOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FieldOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FieldOptions&& from) noexcept : FieldOptions(arena) { *this = ::std::move(from); } @@ -7652,9 +7484,9 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 4, 14, 8, - 0, 7> + static const ::google::protobuf::internal::TcParseTable<4, 14, + 8, 0, + 7> _table_; friend class ::google::protobuf::MessageLite; @@ -7664,8 +7496,7 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -7713,8 +7544,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess #endif template - explicit PROTOBUF_CONSTEXPR FeatureSetDefaults( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FeatureSetDefaults(::google::protobuf::internal::ConstantInitialized); inline FeatureSetDefaults(const FeatureSetDefaults& from) : FeatureSetDefaults(nullptr, from) {} inline FeatureSetDefaults(FeatureSetDefaults&& from) noexcept @@ -7773,8 +7603,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess // implements Message ---------------------------------------------- - FeatureSetDefaults* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FeatureSetDefaults* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -7783,9 +7612,8 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess void MergeFrom(const FeatureSetDefaults& from) { FeatureSetDefaults::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -7801,23 +7629,21 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -7827,16 +7653,14 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess void InternalSwap(FeatureSetDefaults* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FeatureSetDefaults"; } protected: explicit FeatureSetDefaults(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FeatureSetDefaults(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FeatureSetDefaults& from); FeatureSetDefaults( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FeatureSetDefaults&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FeatureSetDefaults&& from) noexcept : FeatureSetDefaults(arena) { *this = ::std::move(from); } @@ -7902,9 +7726,9 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 3, 3, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<1, 3, + 3, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -7914,8 +7738,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -7951,8 +7774,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M #endif template - explicit PROTOBUF_CONSTEXPR ExtensionRangeOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ExtensionRangeOptions(::google::protobuf::internal::ConstantInitialized); inline ExtensionRangeOptions(const ExtensionRangeOptions& from) : ExtensionRangeOptions(nullptr, from) {} inline ExtensionRangeOptions(ExtensionRangeOptions&& from) noexcept @@ -8011,8 +7833,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M // implements Message ---------------------------------------------- - ExtensionRangeOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ExtensionRangeOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -8021,9 +7842,8 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M void MergeFrom(const ExtensionRangeOptions& from) { ExtensionRangeOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -8039,23 +7859,21 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -8065,16 +7883,14 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M void InternalSwap(ExtensionRangeOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.ExtensionRangeOptions"; } protected: explicit ExtensionRangeOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); ExtensionRangeOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const ExtensionRangeOptions& from); ExtensionRangeOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - ExtensionRangeOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, ExtensionRangeOptions&& from) noexcept : ExtensionRangeOptions(arena) { *this = ::std::move(from); } @@ -8359,9 +8175,9 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 4, 4, - 0, 12> + static const ::google::protobuf::internal::TcParseTable<3, 4, + 4, 0, + 12> _table_; friend class ::google::protobuf::MessageLite; @@ -8371,8 +8187,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -8410,8 +8225,7 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag #endif template - explicit PROTOBUF_CONSTEXPR EnumValueOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR EnumValueOptions(::google::protobuf::internal::ConstantInitialized); inline EnumValueOptions(const EnumValueOptions& from) : EnumValueOptions(nullptr, from) {} inline EnumValueOptions(EnumValueOptions&& from) noexcept @@ -8470,8 +8284,7 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag // implements Message ---------------------------------------------- - EnumValueOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + EnumValueOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -8480,9 +8293,8 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag void MergeFrom(const EnumValueOptions& from) { EnumValueOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -8498,23 +8310,21 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -8524,16 +8334,14 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag void InternalSwap(EnumValueOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.EnumValueOptions"; } protected: explicit EnumValueOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); EnumValueOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const EnumValueOptions& from); EnumValueOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - EnumValueOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, EnumValueOptions&& from) noexcept : EnumValueOptions(arena) { *this = ::std::move(from); } @@ -8807,9 +8615,9 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 3, - 0, 7> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 3, 0, + 7> _table_; friend class ::google::protobuf::MessageLite; @@ -8819,8 +8627,7 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -8859,8 +8666,7 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR EnumOptions( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR EnumOptions(::google::protobuf::internal::ConstantInitialized); inline EnumOptions(const EnumOptions& from) : EnumOptions(nullptr, from) {} inline EnumOptions(EnumOptions&& from) noexcept @@ -8919,8 +8725,7 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - EnumOptions* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + EnumOptions* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -8929,9 +8734,8 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message void MergeFrom(const EnumOptions& from) { EnumOptions::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -8947,23 +8751,21 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -8973,16 +8775,14 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message void InternalSwap(EnumOptions* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.EnumOptions"; } protected: explicit EnumOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); EnumOptions(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const EnumOptions& from); EnumOptions( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - EnumOptions&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, EnumOptions&& from) noexcept : EnumOptions(arena) { *this = ::std::move(from); } @@ -9252,9 +9052,9 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 2, - 0, 7> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 2, 0, + 7> _table_; friend class ::google::protobuf::MessageLite; @@ -9264,8 +9064,7 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -9304,8 +9103,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me #endif template - explicit PROTOBUF_CONSTEXPR OneofDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR OneofDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline OneofDescriptorProto(const OneofDescriptorProto& from) : OneofDescriptorProto(nullptr, from) {} inline OneofDescriptorProto(OneofDescriptorProto&& from) noexcept @@ -9364,8 +9162,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me // implements Message ---------------------------------------------- - OneofDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + OneofDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -9374,9 +9171,8 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me void MergeFrom(const OneofDescriptorProto& from) { OneofDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -9392,23 +9188,21 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9418,16 +9212,14 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me void InternalSwap(OneofDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.OneofDescriptorProto"; } protected: explicit OneofDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); OneofDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const OneofDescriptorProto& from); OneofDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - OneofDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, OneofDescriptorProto&& from) noexcept : OneofDescriptorProto(arena) { *this = ::std::move(from); } @@ -9483,9 +9275,9 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 1, - 49, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 1, 49, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -9495,8 +9287,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -9531,8 +9322,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M #endif template - explicit PROTOBUF_CONSTEXPR MethodDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR MethodDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline MethodDescriptorProto(const MethodDescriptorProto& from) : MethodDescriptorProto(nullptr, from) {} inline MethodDescriptorProto(MethodDescriptorProto&& from) noexcept @@ -9591,8 +9381,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M // implements Message ---------------------------------------------- - MethodDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + MethodDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -9601,9 +9390,8 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M void MergeFrom(const MethodDescriptorProto& from) { MethodDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -9619,23 +9407,21 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9645,16 +9431,14 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M void InternalSwap(MethodDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.MethodDescriptorProto"; } protected: explicit MethodDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); MethodDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const MethodDescriptorProto& from); MethodDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - MethodDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, MethodDescriptorProto&& from) noexcept : MethodDescriptorProto(arena) { *this = ::std::move(from); } @@ -9768,9 +9552,9 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 6, 1, - 71, 2> + static const ::google::protobuf::internal::TcParseTable<3, 6, + 1, 71, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -9780,8 +9564,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -9820,8 +9603,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me #endif template - explicit PROTOBUF_CONSTEXPR FieldDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline FieldDescriptorProto(const FieldDescriptorProto& from) : FieldDescriptorProto(nullptr, from) {} inline FieldDescriptorProto(FieldDescriptorProto&& from) noexcept @@ -9880,8 +9662,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me // implements Message ---------------------------------------------- - FieldDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -9890,9 +9671,8 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me void MergeFrom(const FieldDescriptorProto& from) { FieldDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -9908,23 +9688,21 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9934,16 +9712,14 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me void InternalSwap(FieldDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FieldDescriptorProto"; } protected: explicit FieldDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FieldDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FieldDescriptorProto& from); FieldDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FieldDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FieldDescriptorProto&& from) noexcept : FieldDescriptorProto(arena) { *this = ::std::move(from); } @@ -10184,9 +9960,9 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 4, 11, 3, - 96, 2> + static const ::google::protobuf::internal::TcParseTable<4, 11, + 3, 96, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -10196,8 +9972,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -10241,8 +10016,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf #endif template - explicit PROTOBUF_CONSTEXPR EnumValueDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR EnumValueDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline EnumValueDescriptorProto(const EnumValueDescriptorProto& from) : EnumValueDescriptorProto(nullptr, from) {} inline EnumValueDescriptorProto(EnumValueDescriptorProto&& from) noexcept @@ -10301,8 +10075,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf // implements Message ---------------------------------------------- - EnumValueDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + EnumValueDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -10311,9 +10084,8 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf void MergeFrom(const EnumValueDescriptorProto& from) { EnumValueDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -10329,23 +10101,21 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10355,16 +10125,14 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf void InternalSwap(EnumValueDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.EnumValueDescriptorProto"; } protected: explicit EnumValueDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); EnumValueDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const EnumValueDescriptorProto& from); EnumValueDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - EnumValueDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, EnumValueDescriptorProto&& from) noexcept : EnumValueDescriptorProto(arena) { *this = ::std::move(from); } @@ -10432,9 +10200,9 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 1, - 53, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 1, 53, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -10444,8 +10212,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -10481,8 +10248,7 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr #endif template - explicit PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange(::google::protobuf::internal::ConstantInitialized); inline DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from) : DescriptorProto_ExtensionRange(nullptr, from) {} inline DescriptorProto_ExtensionRange(DescriptorProto_ExtensionRange&& from) noexcept @@ -10541,8 +10307,7 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr // implements Message ---------------------------------------------- - DescriptorProto_ExtensionRange* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + DescriptorProto_ExtensionRange* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -10551,9 +10316,8 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr void MergeFrom(const DescriptorProto_ExtensionRange& from) { DescriptorProto_ExtensionRange::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -10569,23 +10333,21 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10595,16 +10357,14 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr void InternalSwap(DescriptorProto_ExtensionRange* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.DescriptorProto.ExtensionRange"; } protected: explicit DescriptorProto_ExtensionRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); DescriptorProto_ExtensionRange(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const DescriptorProto_ExtensionRange& from); DescriptorProto_ExtensionRange( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - DescriptorProto_ExtensionRange&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, DescriptorProto_ExtensionRange&& from) noexcept : DescriptorProto_ExtensionRange(arena) { *this = ::std::move(from); } @@ -10667,9 +10427,9 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -10679,8 +10439,7 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -10716,8 +10475,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: #endif template - explicit PROTOBUF_CONSTEXPR ServiceDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ServiceDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline ServiceDescriptorProto(const ServiceDescriptorProto& from) : ServiceDescriptorProto(nullptr, from) {} inline ServiceDescriptorProto(ServiceDescriptorProto&& from) noexcept @@ -10776,8 +10534,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: // implements Message ---------------------------------------------- - ServiceDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ServiceDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -10786,9 +10543,8 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: void MergeFrom(const ServiceDescriptorProto& from) { ServiceDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -10804,23 +10560,21 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10830,16 +10584,14 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: void InternalSwap(ServiceDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.ServiceDescriptorProto"; } protected: explicit ServiceDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); ServiceDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const ServiceDescriptorProto& from); ServiceDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - ServiceDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, ServiceDescriptorProto&& from) noexcept : ServiceDescriptorProto(arena) { *this = ::std::move(from); } @@ -10913,9 +10665,9 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 2, 3, 2, - 51, 2> + static const ::google::protobuf::internal::TcParseTable<2, 3, + 2, 51, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -10925,8 +10677,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -10962,8 +10713,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes #endif template - explicit PROTOBUF_CONSTEXPR EnumDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR EnumDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline EnumDescriptorProto(const EnumDescriptorProto& from) : EnumDescriptorProto(nullptr, from) {} inline EnumDescriptorProto(EnumDescriptorProto&& from) noexcept @@ -11022,8 +10772,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes // implements Message ---------------------------------------------- - EnumDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + EnumDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -11032,9 +10781,8 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes void MergeFrom(const EnumDescriptorProto& from) { EnumDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -11050,23 +10798,21 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11076,16 +10822,14 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes void InternalSwap(EnumDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.EnumDescriptorProto"; } protected: explicit EnumDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); EnumDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const EnumDescriptorProto& from); EnumDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - EnumDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, EnumDescriptorProto&& from) noexcept : EnumDescriptorProto(arena) { *this = ::std::move(from); } @@ -11201,9 +10945,9 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 5, 3, - 61, 2> + static const ::google::protobuf::internal::TcParseTable<3, 5, + 3, 61, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -11213,8 +10957,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -11252,8 +10995,7 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR DescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR DescriptorProto(::google::protobuf::internal::ConstantInitialized); inline DescriptorProto(const DescriptorProto& from) : DescriptorProto(nullptr, from) {} inline DescriptorProto(DescriptorProto&& from) noexcept @@ -11312,8 +11054,7 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - DescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + DescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -11322,9 +11063,8 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message void MergeFrom(const DescriptorProto& from) { DescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -11340,23 +11080,21 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11366,16 +11104,14 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message void InternalSwap(DescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.DescriptorProto"; } protected: explicit DescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); DescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const DescriptorProto& from); DescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - DescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, DescriptorProto&& from) noexcept : DescriptorProto(arena) { *this = ::std::move(from); } @@ -11582,9 +11318,9 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 4, 10, 8, - 65, 2> + static const ::google::protobuf::internal::TcParseTable<4, 10, + 8, 65, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -11594,8 +11330,7 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -11638,8 +11373,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes #endif template - explicit PROTOBUF_CONSTEXPR FileDescriptorProto( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FileDescriptorProto(::google::protobuf::internal::ConstantInitialized); inline FileDescriptorProto(const FileDescriptorProto& from) : FileDescriptorProto(nullptr, from) {} inline FileDescriptorProto(FileDescriptorProto&& from) noexcept @@ -11698,8 +11432,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes // implements Message ---------------------------------------------- - FileDescriptorProto* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FileDescriptorProto* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -11708,9 +11441,8 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes void MergeFrom(const FileDescriptorProto& from) { FileDescriptorProto::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -11726,23 +11458,21 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11752,16 +11482,14 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes void InternalSwap(FileDescriptorProto* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FileDescriptorProto"; } protected: explicit FileDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FileDescriptorProto(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FileDescriptorProto& from); FileDescriptorProto( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FileDescriptorProto&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FileDescriptorProto&& from) noexcept : FileDescriptorProto(arena) { *this = ::std::move(from); } @@ -12012,9 +11740,9 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 4, 13, 7, - 79, 2> + static const ::google::protobuf::internal::TcParseTable<4, 13, + 7, 79, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -12024,8 +11752,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -12071,8 +11798,7 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa #endif template - explicit PROTOBUF_CONSTEXPR FileDescriptorSet( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FileDescriptorSet(::google::protobuf::internal::ConstantInitialized); inline FileDescriptorSet(const FileDescriptorSet& from) : FileDescriptorSet(nullptr, from) {} inline FileDescriptorSet(FileDescriptorSet&& from) noexcept @@ -12131,8 +11857,7 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa // implements Message ---------------------------------------------- - FileDescriptorSet* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FileDescriptorSet* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -12141,9 +11866,8 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa void MergeFrom(const FileDescriptorSet& from) { FileDescriptorSet::MergeImpl(*this, from); } private: - static void MergeImpl( - ::google::protobuf::MessageLite& to_msg, - const ::google::protobuf::MessageLite& from_msg); + static void MergeImpl(::google::protobuf::MessageLite& to_msg, + const ::google::protobuf::MessageLite& from_msg); public: bool IsInitialized() const { @@ -12159,23 +11883,21 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa private: static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( - const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + const ::google::protobuf::MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const { + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE ::size_t ByteSizeLong() const final; ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( ::uint8_t* PROTOBUF_NONNULL target, - ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL - stream) const final; + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -12185,16 +11907,14 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa void InternalSwap(FileDescriptorSet* PROTOBUF_NONNULL other); private: template - friend ::absl::string_view( - ::google::protobuf::internal::GetAnyMessageName)(); + friend ::absl::string_view(::google::protobuf::internal::GetAnyMessageName)(); static ::absl::string_view FullMessageName() { return "google.protobuf.FileDescriptorSet"; } protected: explicit FileDescriptorSet(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FileDescriptorSet(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FileDescriptorSet& from); FileDescriptorSet( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FileDescriptorSet&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FileDescriptorSet&& from) noexcept : FileDescriptorSet(arena) { *this = ::std::move(from); } @@ -12412,9 +12132,9 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 1, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 1, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -12424,8 +12144,7 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; struct Impl_ { - inline explicit constexpr Impl_( - ::google::protobuf::internal::ConstantInitialized) noexcept; + inline explicit constexpr Impl_(::google::protobuf::internal::ConstantInitialized) noexcept; inline explicit Impl_( ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); @@ -12694,8 +12413,8 @@ inline void FileDescriptorProto::add_dependency(Arg_&& value, Args_... args) { args... ); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency) } -inline const ::google::protobuf::RepeatedPtrField& -FileDescriptorProto::dependency() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& FileDescriptorProto::dependency() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency) return _internal_dependency(); } @@ -14085,8 +13804,8 @@ inline void DescriptorProto::add_reserved_name(Arg_&& value, Args_... args) { args... ); // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name) } -inline const ::google::protobuf::RepeatedPtrField& -DescriptorProto::reserved_name() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& DescriptorProto::reserved_name() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name) return _internal_reserved_name(); } @@ -15703,8 +15422,8 @@ inline void EnumDescriptorProto::add_reserved_name(Arg_&& value, Args_... args) args... ); // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_name) } -inline const ::google::protobuf::RepeatedPtrField& -EnumDescriptorProto::reserved_name() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& EnumDescriptorProto::reserved_name() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.reserved_name) return _internal_reserved_name(); } @@ -21126,8 +20845,8 @@ inline void SourceCodeInfo_Location::add_leading_detached_comments(Arg_&& value, args... ); // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) } -inline const ::google::protobuf::RepeatedPtrField& -SourceCodeInfo_Location::leading_detached_comments() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& SourceCodeInfo_Location::leading_detached_comments() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) return _internal_leading_detached_comments(); }