From dca34c7c0509fc02f0feb99f01868e8b63eec875 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 13 Jan 2025 17:00:30 +0000 Subject: [PATCH] Auto-generate files after cl/714982016 --- src/google/protobuf/any.pb.cc | 2 +- src/google/protobuf/any.pb.h | 51 ++-- src/google/protobuf/api.pb.cc | 6 +- src/google/protobuf/api.pb.h | 105 +++----- src/google/protobuf/duration.pb.cc | 10 +- src/google/protobuf/duration.pb.h | 37 +-- src/google/protobuf/empty.pb.h | 24 +- src/google/protobuf/field_mask.pb.cc | 2 +- src/google/protobuf/field_mask.pb.h | 41 ++- src/google/protobuf/source_context.pb.cc | 2 +- src/google/protobuf/source_context.pb.h | 37 +-- src/google/protobuf/struct.pb.cc | 12 +- src/google/protobuf/struct.pb.h | 136 ++++------ src/google/protobuf/timestamp.pb.cc | 10 +- src/google/protobuf/timestamp.pb.h | 37 +-- src/google/protobuf/type.pb.cc | 22 +- src/google/protobuf/type.pb.h | 198 ++++++--------- src/google/protobuf/wrappers.pb.cc | 26 +- src/google/protobuf/wrappers.pb.h | 309 +++++++++-------------- 19 files changed, 422 insertions(+), 645 deletions(-) diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 9caffdc082044..edca53ed09fc9 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -303,7 +303,7 @@ PROTOBUF_NOINLINE void Any::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Any::_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 Any& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index b05af5672d811..5e20a7f52e00d 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -50,8 +50,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fany_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fany_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fany_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Any( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Any(::google::protobuf::internal::ConstantInitialized); inline Any(const Any& from) : Any(nullptr, from) {} inline Any(Any&& from) noexcept @@ -132,19 +130,19 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message bool PackFrom(const ::google::protobuf::Message& message) { ABSL_DCHECK_NE(&message, this); - return ::google::protobuf::internal::InternalPackFrom( - message, mutable_type_url(), _internal_mutable_value()); + return ::google::protobuf::internal::InternalPackFrom(message, mutable_type_url(), + _internal_mutable_value()); } bool PackFrom(const ::google::protobuf::Message& message, ::absl::string_view type_url_prefix) { ABSL_DCHECK_NE(&message, this); - return ::google::protobuf::internal::InternalPackFrom( - message, type_url_prefix, mutable_type_url(), - _internal_mutable_value()); + return ::google::protobuf::internal::InternalPackFrom(message, type_url_prefix, + mutable_type_url(), + _internal_mutable_value()); } bool UnpackTo(::google::protobuf::Message* PROTOBUF_NONNULL message) const { - return ::google::protobuf::internal::InternalUnpackTo( - _internal_type_url(), _internal_value(), message); + return ::google::protobuf::internal::InternalUnpackTo(_internal_type_url(), + _internal_value(), message); } static bool GetAnyFieldDescriptors( const ::google::protobuf::Message& message, @@ -203,8 +201,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Any* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Any* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -213,9 +210,8 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message void MergeFrom(const Any& from) { Any::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 { @@ -226,23 +222,21 @@ class PROTOBUF_EXPORT Any 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(); } @@ -252,16 +246,14 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message void InternalSwap(Any* 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.Any"; } protected: explicit Any(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Any(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Any& from); Any( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Any&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Any&& from) noexcept : Any(arena) { *this = ::std::move(from); } @@ -316,9 +308,9 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, - 36, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 0, 36, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -328,8 +320,7 @@ class PROTOBUF_EXPORT Any 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); diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 44d9ae7aedc68..2f1eda2e2273b 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -518,7 +518,7 @@ PROTOBUF_NOINLINE void Api::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Api::_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 Api& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1016,7 +1016,7 @@ PROTOBUF_NOINLINE void Method::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Method::_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 Method& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1440,7 +1440,7 @@ PROTOBUF_NOINLINE void Mixin::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Mixin::_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 Mixin& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 01026273b7e89..8e1bf58f5bbf5 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -52,8 +52,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fapi_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fapi_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fapi_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -94,8 +93,7 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Mixin( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Mixin(::google::protobuf::internal::ConstantInitialized); inline Mixin(const Mixin& from) : Mixin(nullptr, from) {} inline Mixin(Mixin&& from) noexcept @@ -154,8 +152,7 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Mixin* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Mixin* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -164,9 +161,8 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message void MergeFrom(const Mixin& from) { Mixin::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 { @@ -177,23 +173,21 @@ class PROTOBUF_EXPORT Mixin 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(); } @@ -203,16 +197,14 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message void InternalSwap(Mixin* 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.Mixin"; } protected: explicit Mixin(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Mixin(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Mixin& from); Mixin( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Mixin&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Mixin&& from) noexcept : Mixin(arena) { *this = ::std::move(from); } @@ -267,9 +259,9 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 0, - 38, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 0, 38, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -279,8 +271,7 @@ class PROTOBUF_EXPORT Mixin 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); @@ -315,8 +306,7 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Method( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Method(::google::protobuf::internal::ConstantInitialized); inline Method(const Method& from) : Method(nullptr, from) {} inline Method(Method&& from) noexcept @@ -375,8 +365,7 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Method* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Method* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -385,9 +374,8 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message void MergeFrom(const Method& from) { Method::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 { @@ -398,23 +386,21 @@ class PROTOBUF_EXPORT Method 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(); } @@ -424,16 +410,14 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message void InternalSwap(Method* 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.Method"; } protected: explicit Method(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Method(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Method& from); Method( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Method&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Method&& from) noexcept : Method(arena) { *this = ::std::move(from); } @@ -555,9 +539,9 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 7, 1, - 68, 2> + static const ::google::protobuf::internal::TcParseTable<3, 7, + 1, 68, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -567,8 +551,7 @@ class PROTOBUF_EXPORT Method 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); @@ -608,8 +591,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Api( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Api(::google::protobuf::internal::ConstantInitialized); inline Api(const Api& from) : Api(nullptr, from) {} inline Api(Api&& from) noexcept @@ -668,8 +650,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Api* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Api* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -678,9 +659,8 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message void MergeFrom(const Api& from) { Api::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 { @@ -691,23 +671,21 @@ class PROTOBUF_EXPORT Api 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(); } @@ -717,16 +695,14 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message void InternalSwap(Api* 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.Api"; } protected: explicit Api(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Api(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Api& from); Api( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Api&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Api&& from) noexcept : Api(arena) { *this = ::std::move(from); } @@ -862,9 +838,9 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 3, 7, 4, - 39, 2> + static const ::google::protobuf::internal::TcParseTable<3, 7, + 4, 39, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -874,8 +850,7 @@ class PROTOBUF_EXPORT Api 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); diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 8b7503f0a3f98..f76c12a462c55 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -266,7 +266,7 @@ PROTOBUF_NOINLINE void Duration::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Duration::_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 Duration& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -282,8 +282,8 @@ ::uint8_t* PROTOBUF_NONNULL Duration::_InternalSerialize( // int64 seconds = 1; if ((this_._impl_._has_bits_[0] & 0x00000001u) != 0) { if (this_._internal_seconds() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt64ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt64ToArrayWithField<1>( stream, this_._internal_seconds(), target); } } @@ -291,8 +291,8 @@ ::uint8_t* PROTOBUF_NONNULL Duration::_InternalSerialize( // int32 nanos = 2; if ((this_._impl_._has_bits_[0] & 0x00000002u) != 0) { if (this_._internal_nanos() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_nanos(), target); } } diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index a7ec4ee21486b..4e64965522c58 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -50,8 +50,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fduration_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fduration_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fduration_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Duration( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Duration(::google::protobuf::internal::ConstantInitialized); inline Duration(const Duration& from) : Duration(nullptr, from) {} inline Duration(Duration&& from) noexcept @@ -144,8 +142,7 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Duration* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Duration* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -154,9 +151,8 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message void MergeFrom(const Duration& from) { Duration::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 { @@ -167,23 +163,21 @@ class PROTOBUF_EXPORT Duration 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(); } @@ -193,16 +187,14 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message void InternalSwap(Duration* 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.Duration"; } protected: explicit Duration(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Duration(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Duration& from); Duration( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Duration&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Duration&& from) noexcept : Duration(arena) { *this = ::std::move(from); } @@ -247,9 +239,9 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message 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; @@ -259,8 +251,7 @@ class PROTOBUF_EXPORT Duration 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); diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 39aaa0b70fc57..e8a3aee96c4a8 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -51,8 +51,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fempty_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fempty_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fempty_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie #endif template - explicit PROTOBUF_CONSTEXPR Empty( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Empty(::google::protobuf::internal::ConstantInitialized); inline Empty(const Empty& from) : Empty(nullptr, from) {} inline Empty(Empty&& from) noexcept @@ -144,8 +142,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie // implements Message ---------------------------------------------- - Empty* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Empty* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::internal::ZeroFieldsBase::DefaultConstruct(arena); } using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom; @@ -163,16 +160,14 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie } 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.Empty"; } protected: explicit Empty(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Empty(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Empty& from); Empty( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Empty&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Empty&& from) noexcept : Empty(arena) { *this = ::std::move(from); } @@ -193,9 +188,9 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 0, 0, - 0, 2> + static const ::google::protobuf::internal::TcParseTable<0, 0, + 0, 0, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -205,8 +200,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie 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); diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 7b9732a612a23..73177c022b030 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -268,7 +268,7 @@ PROTOBUF_NOINLINE void FieldMask::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL FieldMask::_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 FieldMask& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 1433698a66f0b..b3699b26ef766 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -50,8 +50,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR FieldMask( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR FieldMask(::google::protobuf::internal::ConstantInitialized); inline FieldMask(const FieldMask& from) : FieldMask(nullptr, from) {} inline FieldMask(FieldMask&& from) noexcept @@ -144,8 +142,7 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - FieldMask* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldMask* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -154,9 +151,8 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message void MergeFrom(const FieldMask& from) { FieldMask::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 { @@ -167,23 +163,21 @@ class PROTOBUF_EXPORT FieldMask 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(); } @@ -193,16 +187,14 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message void InternalSwap(FieldMask* 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.FieldMask"; } protected: explicit FieldMask(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); FieldMask(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const FieldMask& from); FieldMask( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - FieldMask&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, FieldMask&& from) noexcept : FieldMask(arena) { *this = ::std::move(from); } @@ -248,9 +240,9 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 0, - 39, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 0, 39, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -260,8 +252,7 @@ class PROTOBUF_EXPORT FieldMask 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); @@ -337,8 +328,8 @@ inline void FieldMask::add_paths(Arg_&& value, Args_... args) { args... ); // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths) } -inline const ::google::protobuf::RepeatedPtrField& -FieldMask::paths() const ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline const ::google::protobuf::RepeatedPtrField& FieldMask::paths() const + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.FieldMask.paths) return _internal_paths(); } diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index d47fa7743da6b..7c717f118c974 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -269,7 +269,7 @@ PROTOBUF_NOINLINE void SourceContext::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL SourceContext::_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 SourceContext& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index c32939b2d2ed8..36e20aa40d379 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -50,8 +50,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR SourceContext( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR SourceContext(::google::protobuf::internal::ConstantInitialized); inline SourceContext(const SourceContext& from) : SourceContext(nullptr, from) {} inline SourceContext(SourceContext&& from) noexcept @@ -144,8 +142,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - SourceContext* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + SourceContext* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -154,9 +151,8 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message void MergeFrom(const SourceContext& from) { SourceContext::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 { @@ -167,23 +163,21 @@ class PROTOBUF_EXPORT SourceContext 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(); } @@ -193,16 +187,14 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message void InternalSwap(SourceContext* 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.SourceContext"; } protected: explicit SourceContext(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); SourceContext(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const SourceContext& from); SourceContext( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - SourceContext&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, SourceContext&& from) noexcept : SourceContext(arena) { *this = ::std::move(from); } @@ -241,9 +233,9 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 0, - 47, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 0, 47, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -253,8 +245,7 @@ class PROTOBUF_EXPORT SourceContext 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); diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 7dfeaaf3d4aca..ddb3b3a7553b6 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -242,8 +242,7 @@ Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Are : SuperType(arena, Struct_FieldsEntry_DoNotUse_class_data_.base()) {} #else // PROTOBUF_CUSTOM_VTABLE Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse() : SuperType() {} -Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena) - : SuperType(arena) {} +Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena) : SuperType(arena) {} #endif // PROTOBUF_CUSTOM_VTABLE inline void* PROTOBUF_NONNULL Struct_FieldsEntry_DoNotUse::PlacementNew_( const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, @@ -265,8 +264,7 @@ constexpr auto Struct_FieldsEntry_DoNotUse::InternalGenerateClassData_() { ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) &Struct_FieldsEntry_DoNotUse::SharedDtor, - static_cast( - &Struct_FieldsEntry_DoNotUse::ClearImpl), + static_cast(&Struct_FieldsEntry_DoNotUse::ClearImpl), ::google::protobuf::Message::ByteSizeLongImpl, ::google::protobuf::Message::_InternalSerializeImpl , #endif // PROTOBUF_CUSTOM_VTABLE @@ -503,7 +501,7 @@ PROTOBUF_NOINLINE void Struct::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Struct::_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 Struct& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -877,7 +875,7 @@ PROTOBUF_NOINLINE void Value::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Value::_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 Value& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1238,7 +1236,7 @@ PROTOBUF_NOINLINE void ListValue::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL ListValue::_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 ListValue& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 47dedc832cdd1..0c1e320981aae 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -55,8 +55,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fstruct_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2fstruct_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fstruct_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -113,14 +112,13 @@ const std::string& NullValue_Name(T value) { } template <> inline const std::string& NullValue_Name(NullValue value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool NullValue_Parse( absl::string_view name, NullValue* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - NullValue_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(NullValue_descriptor(), name, + value); } // =================================================================== @@ -142,8 +140,7 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR ListValue( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR ListValue(::google::protobuf::internal::ConstantInitialized); inline ListValue(const ListValue& from) : ListValue(nullptr, from) {} inline ListValue(ListValue&& from) noexcept @@ -202,8 +199,7 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - ListValue* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ListValue* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -212,9 +208,8 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message void MergeFrom(const ListValue& from) { ListValue::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 { @@ -225,23 +220,21 @@ class PROTOBUF_EXPORT ListValue 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(); } @@ -251,16 +244,14 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message void InternalSwap(ListValue* 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.ListValue"; } protected: explicit ListValue(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); ListValue(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const ListValue& from); ListValue( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - ListValue&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, ListValue&& from) noexcept : ListValue(arena) { *this = ::std::move(from); } @@ -301,9 +292,9 @@ class PROTOBUF_EXPORT ListValue 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; @@ -313,8 +304,7 @@ class PROTOBUF_EXPORT ListValue 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); @@ -347,8 +337,7 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Struct( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Struct(::google::protobuf::internal::ConstantInitialized); inline Struct(const Struct& from) : Struct(nullptr, from) {} inline Struct(Struct&& from) noexcept @@ -407,8 +396,7 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Struct* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Struct* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -417,9 +405,8 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message void MergeFrom(const Struct& from) { Struct::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 { @@ -430,23 +417,21 @@ class PROTOBUF_EXPORT Struct 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(); } @@ -456,16 +441,14 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message void InternalSwap(Struct* 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.Struct"; } protected: explicit Struct(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Struct(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Struct& from); Struct( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Struct&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Struct&& from) noexcept : Struct(arena) { *this = ::std::move(from); } @@ -504,9 +487,9 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message private: class _Internal; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 1, 2, - 37, 2> + static const ::google::protobuf::internal::TcParseTable<0, 1, + 2, 37, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -516,8 +499,7 @@ class PROTOBUF_EXPORT Struct 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); @@ -540,19 +522,17 @@ PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull Struct_ // ------------------------------------------------------------------- class Struct_FieldsEntry_DoNotUse final - : public ::google::protobuf::internal::MapEntry< - std::string, ::google::protobuf::Message, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> { + : public ::google::protobuf::internal::MapEntry { public: - using SuperType = ::google::protobuf::internal::MapEntry< - std::string, ::google::protobuf::Message, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>; + using SuperType = + ::google::protobuf::internal::MapEntry; Struct_FieldsEntry_DoNotUse(); template - explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse(::google::protobuf::internal::ConstantInitialized); explicit Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static const Struct_FieldsEntry_DoNotUse* PROTOBUF_NONNULL internal_default_instance() { return reinterpret_cast( @@ -567,9 +547,9 @@ class Struct_FieldsEntry_DoNotUse final friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto; friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 1, 2, 1, - 46, 2> + static const ::google::protobuf::internal::TcParseTable<1, 2, + 1, 46, + 2> _table_; const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; @@ -595,8 +575,7 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Value( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Value(::google::protobuf::internal::ConstantInitialized); inline Value(const Value& from) : Value(nullptr, from) {} inline Value(Value&& from) noexcept @@ -664,8 +643,7 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Value* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Value* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -674,9 +652,8 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message void MergeFrom(const Value& from) { Value::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 { @@ -687,23 +664,21 @@ class PROTOBUF_EXPORT Value 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(); } @@ -713,16 +688,14 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message void InternalSwap(Value* 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.Value"; } protected: explicit Value(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Value(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Value& from); Value( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Value&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Value&& from) noexcept : Value(arena) { *this = ::std::move(from); } @@ -848,9 +821,9 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message inline bool has_kind() const; inline void clear_has_kind(); friend class ::google::protobuf::internal::TcParser; - static const ::google::protobuf::internal::TcParseTable< - 0, 6, 2, - 42, 2> + static const ::google::protobuf::internal::TcParseTable<0, 6, + 2, 42, + 2> _table_; friend class ::google::protobuf::MessageLite; @@ -860,8 +833,7 @@ class PROTOBUF_EXPORT Value 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); diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index c683f3acfa961..440ece608ec56 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -266,7 +266,7 @@ PROTOBUF_NOINLINE void Timestamp::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Timestamp::_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 Timestamp& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -282,8 +282,8 @@ ::uint8_t* PROTOBUF_NONNULL Timestamp::_InternalSerialize( // int64 seconds = 1; if ((this_._impl_._has_bits_[0] & 0x00000001u) != 0) { if (this_._internal_seconds() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt64ToArrayWithField<1>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt64ToArrayWithField<1>( stream, this_._internal_seconds(), target); } } @@ -291,8 +291,8 @@ ::uint8_t* PROTOBUF_NONNULL Timestamp::_InternalSerialize( // int32 nanos = 2; if ((this_._impl_._has_bits_[0] & 0x00000002u) != 0) { if (this_._internal_nanos() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_nanos(), target); } } diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 15788c006e516..37f9f6901118d 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -50,8 +50,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ftimestamp_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2ftimestamp_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ftimestamp_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -84,8 +83,7 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Timestamp( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Timestamp(::google::protobuf::internal::ConstantInitialized); inline Timestamp(const Timestamp& from) : Timestamp(nullptr, from) {} inline Timestamp(Timestamp&& from) noexcept @@ -144,8 +142,7 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Timestamp* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Timestamp* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -154,9 +151,8 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message void MergeFrom(const Timestamp& from) { Timestamp::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 { @@ -167,23 +163,21 @@ class PROTOBUF_EXPORT Timestamp 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(); } @@ -193,16 +187,14 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message void InternalSwap(Timestamp* 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.Timestamp"; } protected: explicit Timestamp(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); Timestamp(::google::protobuf::Arena* PROTOBUF_NULLABLE arena, const Timestamp& from); Timestamp( - ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, - Timestamp&& from) noexcept + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena, Timestamp&& from) noexcept : Timestamp(arena) { *this = ::std::move(from); } @@ -247,9 +239,9 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message 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; @@ -259,8 +251,7 @@ class PROTOBUF_EXPORT Timestamp 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); diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 3b150d960c952..2b36dca9155bb 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -665,7 +665,7 @@ PROTOBUF_NOINLINE void Type::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Type::_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 Type& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1188,7 +1188,7 @@ PROTOBUF_NOINLINE void Field::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Field::_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 Field& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -1222,8 +1222,8 @@ ::uint8_t* PROTOBUF_NONNULL Field::_InternalSerialize( // int32 number = 3; if ((this_._impl_._has_bits_[0] & 0x00000040u) != 0) { if (this_._internal_number() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<3>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<3>( stream, this_._internal_number(), target); } } @@ -1251,8 +1251,8 @@ ::uint8_t* PROTOBUF_NONNULL Field::_InternalSerialize( // int32 oneof_index = 7; if ((this_._impl_._has_bits_[0] & 0x00000080u) != 0) { if (this_._internal_oneof_index() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<7>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<7>( stream, this_._internal_oneof_index(), target); } } @@ -1758,7 +1758,7 @@ PROTOBUF_NOINLINE void Enum::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Enum::_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 Enum& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -2176,7 +2176,7 @@ PROTOBUF_NOINLINE void EnumValue::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL EnumValue::_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 EnumValue& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE @@ -2202,8 +2202,8 @@ ::uint8_t* PROTOBUF_NONNULL EnumValue::_InternalSerialize( // int32 number = 2; if ((this_._impl_._has_bits_[0] & 0x00000002u) != 0) { if (this_._internal_number() != 0) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32ToArrayWithField<2>( + target = + ::google::protobuf::internal::WireFormatLite::WriteInt32ToArrayWithField<2>( stream, this_._internal_number(), target); } } @@ -2511,7 +2511,7 @@ PROTOBUF_NOINLINE void Option::Clear() { #if defined(PROTOBUF_CUSTOM_VTABLE) ::uint8_t* PROTOBUF_NONNULL Option::_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 Option& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 5d252e9ead9b5..6a3d490657f76 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -53,8 +53,7 @@ struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ftype_2eproto { static const ::uint32_t offsets[]; }; extern "C" { -PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable - descriptor_table_google_2fprotobuf_2ftype_2eproto; +PROTOBUF_EXPORT extern const ::google::protobuf::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ftype_2eproto; } // extern "C" namespace google { namespace protobuf { @@ -143,14 +142,13 @@ const std::string& Field_Kind_Name(T value) { } template <> inline const std::string& Field_Kind_Name(Field_Kind value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool Field_Kind_Parse( absl::string_view name, Field_Kind* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - Field_Kind_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(Field_Kind_descriptor(), name, + value); } enum Field_Cardinality : int { Field_Cardinality_CARDINALITY_UNKNOWN = 0, @@ -182,14 +180,13 @@ const std::string& Field_Cardinality_Name(T value) { } template <> inline const std::string& Field_Cardinality_Name(Field_Cardinality value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool Field_Cardinality_Parse( absl::string_view name, Field_Cardinality* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - Field_Cardinality_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(Field_Cardinality_descriptor(), name, + value); } enum Syntax : int { SYNTAX_PROTO2 = 0, @@ -220,14 +217,13 @@ const std::string& Syntax_Name(T value) { } template <> inline const std::string& Syntax_Name(Syntax value) { - return ::google::protobuf::internal::NameOfDenseEnum( + return ::google::protobuf::internal::NameOfDenseEnum( static_cast(value)); } inline bool Syntax_Parse( absl::string_view name, Syntax* PROTOBUF_NONNULL value) { - return ::google::protobuf::internal::ParseNamedEnum( - Syntax_descriptor(), name, value); + return ::google::protobuf::internal::ParseNamedEnum(Syntax_descriptor(), name, + value); } // =================================================================== @@ -249,8 +245,7 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message #endif template - explicit PROTOBUF_CONSTEXPR Option( - ::google::protobuf::internal::ConstantInitialized); + explicit PROTOBUF_CONSTEXPR Option(::google::protobuf::internal::ConstantInitialized); inline Option(const Option& from) : Option(nullptr, from) {} inline Option(Option&& from) noexcept @@ -309,8 +304,7 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Option* PROTOBUF_NONNULL - New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Option* PROTOBUF_NONNULL New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct