| Index: third_party/protobuf/src/google/protobuf/empty.pb.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/empty.pb.h b/third_party/protobuf/src/google/protobuf/empty.pb.h
|
| index 868009fce4e5050a8d4c39a824a172422447a91b..4a84bb4fe88d1e05f135d25a3e2d6906929c9f91 100644
|
| --- a/third_party/protobuf/src/google/protobuf/empty.pb.h
|
| +++ b/third_party/protobuf/src/google/protobuf/empty.pb.h
|
| @@ -8,12 +8,12 @@
|
|
|
| #include <google/protobuf/stubs/common.h>
|
|
|
| -#if GOOGLE_PROTOBUF_VERSION < 3000000
|
| +#if GOOGLE_PROTOBUF_VERSION < 3001000
|
| #error This file was generated by a newer version of protoc which is
|
| #error incompatible with your Protocol Buffer headers. Please update
|
| #error your headers.
|
| #endif
|
| -#if 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
| +#if 3001000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
| #error This file was generated by an older version of protoc which is
|
| #error incompatible with your Protocol Buffer headers. Please
|
| #error regenerate this file with a newer version of protoc.
|
| @@ -24,24 +24,28 @@
|
| #include <google/protobuf/generated_message_util.h>
|
| #include <google/protobuf/metadata.h>
|
| #include <google/protobuf/message.h>
|
| -#include <google/protobuf/repeated_field.h>
|
| -#include <google/protobuf/extension_set.h>
|
| +#include <google/protobuf/repeated_field.h> // IWYU pragma: export
|
| +#include <google/protobuf/extension_set.h> // IWYU pragma: export
|
| #include <google/protobuf/unknown_field_set.h>
|
| // @@protoc_insertion_point(includes)
|
| +namespace google {
|
| +namespace protobuf {
|
| +class Empty;
|
| +class EmptyDefaultTypeInternal;
|
| +LIBPROTOBUF_EXPORT extern EmptyDefaultTypeInternal _Empty_default_instance_;
|
| +} // namespace protobuf
|
| +} // namespace google
|
|
|
| namespace google {
|
| namespace protobuf {
|
|
|
| // Internal implementation detail -- do not call these.
|
| void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto();
|
| -void protobuf_AssignDesc_google_2fprotobuf_2fempty_2eproto();
|
| -void protobuf_ShutdownFile_google_2fprotobuf_2fempty_2eproto();
|
| -
|
| -class Empty;
|
| +void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fempty_2eproto();
|
|
|
| // ===================================================================
|
|
|
| -class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| +class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Empty) */ {
|
| public:
|
| Empty();
|
| virtual ~Empty();
|
| @@ -53,39 +57,51 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| return *this;
|
| }
|
|
|
| - inline ::google::protobuf::Arena* GetArena() const { return GetArenaNoVirtual(); }
|
| - inline void* GetMaybeArenaPointer() const {
|
| + inline ::google::protobuf::Arena* GetArena() const PROTOBUF_FINAL {
|
| + return GetArenaNoVirtual();
|
| + }
|
| + inline void* GetMaybeArenaPointer() const PROTOBUF_FINAL {
|
| return MaybeArenaPtr();
|
| }
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const Empty& default_instance();
|
|
|
| + static inline const Empty* internal_default_instance() {
|
| + return reinterpret_cast<const Empty*>(
|
| + &_Empty_default_instance_);
|
| + }
|
| +
|
| void UnsafeArenaSwap(Empty* other);
|
| void Swap(Empty* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline Empty* New() const { return New(NULL); }
|
| + inline Empty* New() const PROTOBUF_FINAL { return New(NULL); }
|
|
|
| - Empty* New(::google::protobuf::Arena* arena) const;
|
| - void CopyFrom(const ::google::protobuf::Message& from);
|
| - void MergeFrom(const ::google::protobuf::Message& from);
|
| + Empty* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
|
| + void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
|
| + void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
|
| void CopyFrom(const Empty& from);
|
| void MergeFrom(const Empty& from);
|
| - void Clear();
|
| - bool IsInitialized() const;
|
| + void Clear() PROTOBUF_FINAL;
|
| + bool IsInitialized() const PROTOBUF_FINAL;
|
|
|
| - int ByteSize() const;
|
| + size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input);
|
| + ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| void SerializeWithCachedSizes(
|
| - ::google::protobuf::io::CodedOutputStream* output) const;
|
| - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| - int GetCachedSize() const { return _cached_size_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
|
| + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output)
|
| + const PROTOBUF_FINAL {
|
| + return InternalSerializeWithCachedSizesToArray(false, output);
|
| + }
|
| + int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const;
|
| + void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| void InternalSwap(Empty* other);
|
| protected:
|
| explicit Empty(::google::protobuf::Arena* arena);
|
| @@ -101,7 +117,7 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const;
|
| + ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -114,14 +130,12 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| friend class ::google::protobuf::Arena;
|
| typedef void InternalArenaConstructable_;
|
| typedef void DestructorSkippable_;
|
| - bool _is_default_instance_;
|
| mutable int _cached_size_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto();
|
| - friend void protobuf_AssignDesc_google_2fprotobuf_2fempty_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fempty_2eproto_impl();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto_impl();
|
| + friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fempty_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fempty_2eproto();
|
|
|
| - void InitAsDefaultInstance();
|
| - static Empty* default_instance_;
|
| };
|
| // ===================================================================
|
|
|
| @@ -135,6 +149,7 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
|
|
| // @@protoc_insertion_point(namespace_scope)
|
|
|
| +
|
| } // namespace protobuf
|
| } // namespace google
|
|
|
|
|