| 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..29309366866a29dab30c96c0d839a8657f55f27b 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.
|
| @@ -34,6 +34,7 @@ namespace protobuf {
|
|
|
| // Internal implementation detail -- do not call these.
|
| void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto();
|
| +void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fempty_2eproto();
|
| void protobuf_AssignDesc_google_2fprotobuf_2fempty_2eproto();
|
| void protobuf_ShutdownFile_google_2fprotobuf_2fempty_2eproto();
|
|
|
| @@ -41,7 +42,7 @@ class Empty;
|
|
|
| // ===================================================================
|
|
|
| -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();
|
| @@ -60,6 +61,8 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const Empty& default_instance();
|
|
|
| + static const Empty* internal_default_instance();
|
| +
|
| void UnsafeArenaSwap(Empty* other);
|
| void Swap(Empty* other);
|
|
|
| @@ -75,18 +78,23 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| void Clear();
|
| bool IsInitialized() const;
|
|
|
| - int ByteSize() const;
|
| + size_t ByteSizeLong() const;
|
| bool MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const;
|
| - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
|
| + bool deterministic, ::google::protobuf::uint8* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {
|
| + return InternalSerializeWithCachedSizesToArray(false, output);
|
| + }
|
| int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| void SetCachedSize(int size) const;
|
| void InternalSwap(Empty* other);
|
| + void UnsafeMergeFrom(const Empty& from);
|
| protected:
|
| explicit Empty(::google::protobuf::Arena* arena);
|
| private:
|
| @@ -114,15 +122,16 @@ 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 LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fempty_2eproto_impl();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto_impl();
|
| friend void protobuf_AssignDesc_google_2fprotobuf_2fempty_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fempty_2eproto();
|
|
|
| void InitAsDefaultInstance();
|
| - static Empty* default_instance_;
|
| };
|
| +extern ::google::protobuf::internal::ExplicitlyConstructed<Empty> Empty_default_instance_;
|
| +
|
| // ===================================================================
|
|
|
|
|
| @@ -131,6 +140,9 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message {
|
| #if !PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Empty
|
|
|
| +inline const Empty* Empty::internal_default_instance() {
|
| + return &Empty_default_instance_.get();
|
| +}
|
| #endif // !PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // @@protoc_insertion_point(namespace_scope)
|
|
|