| Index: third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| diff --git a/third_party/protobuf/src/google/protobuf/descriptor.pb.h b/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| index 8459b138a1ee95c63464146356419e7177d999ca..92a0a3a763f0ecbadbc09566b36d8539ebd7e17a 100644
|
| --- a/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| +++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.h
|
| @@ -8,12 +8,12 @@
|
|
|
| #include <google/protobuf/stubs/common.h>
|
|
|
| -#if GOOGLE_PROTOBUF_VERSION < 3001000
|
| +#if GOOGLE_PROTOBUF_VERSION < 3000000
|
| #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 3001000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
| +#if 3000000 < 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,97 +24,44 @@
|
| #include <google/protobuf/generated_message_util.h>
|
| #include <google/protobuf/metadata.h>
|
| #include <google/protobuf/message.h>
|
| -#include <google/protobuf/repeated_field.h> // IWYU pragma: export
|
| -#include <google/protobuf/extension_set.h> // IWYU pragma: export
|
| +#include <google/protobuf/repeated_field.h>
|
| +#include <google/protobuf/extension_set.h>
|
| #include <google/protobuf/generated_enum_reflection.h>
|
| #include <google/protobuf/unknown_field_set.h>
|
| // @@protoc_insertion_point(includes)
|
| +
|
| namespace google {
|
| namespace protobuf {
|
| +
|
| +// Internal implementation detail -- do not call these.
|
| +void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| +void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| +void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| +
|
| class DescriptorProto;
|
| -class DescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;
|
| class DescriptorProto_ExtensionRange;
|
| -class DescriptorProto_ExtensionRangeDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;
|
| class DescriptorProto_ReservedRange;
|
| -class DescriptorProto_ReservedRangeDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;
|
| class EnumDescriptorProto;
|
| -class EnumDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;
|
| class EnumOptions;
|
| -class EnumOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;
|
| class EnumValueDescriptorProto;
|
| -class EnumValueDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;
|
| class EnumValueOptions;
|
| -class EnumValueOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;
|
| class FieldDescriptorProto;
|
| -class FieldDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;
|
| class FieldOptions;
|
| -class FieldOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
|
| class FileDescriptorProto;
|
| -class FileDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;
|
| class FileDescriptorSet;
|
| -class FileDescriptorSetDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;
|
| class FileOptions;
|
| -class FileOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern FileOptionsDefaultTypeInternal _FileOptions_default_instance_;
|
| class GeneratedCodeInfo;
|
| -class GeneratedCodeInfoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;
|
| class GeneratedCodeInfo_Annotation;
|
| -class GeneratedCodeInfo_AnnotationDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;
|
| class MessageOptions;
|
| -class MessageOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;
|
| class MethodDescriptorProto;
|
| -class MethodDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;
|
| class MethodOptions;
|
| -class MethodOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;
|
| class OneofDescriptorProto;
|
| -class OneofDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;
|
| -class OneofOptions;
|
| -class OneofOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;
|
| class ServiceDescriptorProto;
|
| -class ServiceDescriptorProtoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;
|
| class ServiceOptions;
|
| -class ServiceOptionsDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;
|
| class SourceCodeInfo;
|
| -class SourceCodeInfoDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;
|
| class SourceCodeInfo_Location;
|
| -class SourceCodeInfo_LocationDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;
|
| class UninterpretedOption;
|
| -class UninterpretedOptionDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;
|
| class UninterpretedOption_NamePart;
|
| -class UninterpretedOption_NamePartDefaultTypeInternal;
|
| -LIBPROTOBUF_EXPORT extern UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;
|
| -} // namespace protobuf
|
| -} // namespace google
|
| -
|
| -namespace google {
|
| -namespace protobuf {
|
| -
|
| -// Internal implementation detail -- do not call these.
|
| -void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| -void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| enum FieldDescriptorProto_Type {
|
| FieldDescriptorProto_Type_TYPE_DOUBLE = 1,
|
| @@ -231,29 +178,9 @@ inline bool FieldOptions_JSType_Parse(
|
| return ::google::protobuf::internal::ParseNamedEnum<FieldOptions_JSType>(
|
| FieldOptions_JSType_descriptor(), name, value);
|
| }
|
| -enum MethodOptions_IdempotencyLevel {
|
| - MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN = 0,
|
| - MethodOptions_IdempotencyLevel_NO_SIDE_EFFECTS = 1,
|
| - MethodOptions_IdempotencyLevel_IDEMPOTENT = 2
|
| -};
|
| -LIBPROTOBUF_EXPORT bool MethodOptions_IdempotencyLevel_IsValid(int value);
|
| -const MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel_IdempotencyLevel_MIN = MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN;
|
| -const MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX = MethodOptions_IdempotencyLevel_IDEMPOTENT;
|
| -const int MethodOptions_IdempotencyLevel_IdempotencyLevel_ARRAYSIZE = MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX + 1;
|
| -
|
| -LIBPROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor();
|
| -inline const ::std::string& MethodOptions_IdempotencyLevel_Name(MethodOptions_IdempotencyLevel value) {
|
| - return ::google::protobuf::internal::NameOfEnum(
|
| - MethodOptions_IdempotencyLevel_descriptor(), value);
|
| -}
|
| -inline bool MethodOptions_IdempotencyLevel_Parse(
|
| - const ::std::string& name, MethodOptions_IdempotencyLevel* value) {
|
| - return ::google::protobuf::internal::ParseNamedEnum<MethodOptions_IdempotencyLevel>(
|
| - MethodOptions_IdempotencyLevel_descriptor(), name, value);
|
| -}
|
| // ===================================================================
|
|
|
| -class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorSet) */ {
|
| +class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message {
|
| public:
|
| FileDescriptorSet();
|
| virtual ~FileDescriptorSet();
|
| @@ -276,52 +203,42 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const FileDescriptorSet& default_instance();
|
|
|
| - static inline const FileDescriptorSet* internal_default_instance() {
|
| - return reinterpret_cast<const FileDescriptorSet*>(
|
| - &_FileDescriptorSet_default_instance_);
|
| - }
|
| -
|
| void Swap(FileDescriptorSet* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline FileDescriptorSet* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline FileDescriptorSet* New() const { return New(NULL); }
|
|
|
| - FileDescriptorSet* 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;
|
| + FileDescriptorSet* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileDescriptorSet& from);
|
| void MergeFrom(const FileDescriptorSet& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(FileDescriptorSet* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -343,18 +260,19 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message
|
| private:
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static FileDescriptorSet* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| FileDescriptorProto();
|
| virtual ~FileDescriptorProto();
|
| @@ -377,52 +295,42 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const FileDescriptorProto& default_instance();
|
|
|
| - static inline const FileDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const FileDescriptorProto*>(
|
| - &_FileDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(FileDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline FileDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline FileDescriptorProto* New() const { return New(NULL); }
|
|
|
| - FileDescriptorProto* 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;
|
| + FileDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileDescriptorProto& from);
|
| void MergeFrom(const FileDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(FileDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -572,20 +480,22 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FileDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_package();
|
| - void clear_has_package();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| - void set_has_source_code_info();
|
| - void clear_has_source_code_info();
|
| - void set_has_syntax();
|
| - void clear_has_syntax();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_package();
|
| + inline void clear_has_package();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
| + inline void set_has_source_code_info();
|
| + inline void clear_has_source_code_info();
|
| + inline void set_has_syntax();
|
| + inline void clear_has_syntax();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::internal::ArenaStringPtr package_;
|
| ::google::protobuf::RepeatedPtrField< ::std::string> dependency_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > public_dependency_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > weak_dependency_;
|
| @@ -593,20 +503,19 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto > service_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > extension_;
|
| - ::google::protobuf::internal::ArenaStringPtr name_;
|
| - ::google::protobuf::internal::ArenaStringPtr package_;
|
| - ::google::protobuf::internal::ArenaStringPtr syntax_;
|
| ::google::protobuf::FileOptions* options_;
|
| ::google::protobuf::SourceCodeInfo* source_code_info_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + ::google::protobuf::internal::ArenaStringPtr syntax_;
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static FileDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ExtensionRange) */ {
|
| +class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::protobuf::Message {
|
| public:
|
| DescriptorProto_ExtensionRange();
|
| virtual ~DescriptorProto_ExtensionRange();
|
| @@ -629,52 +538,42 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const DescriptorProto_ExtensionRange& default_instance();
|
|
|
| - static inline const DescriptorProto_ExtensionRange* internal_default_instance() {
|
| - return reinterpret_cast<const DescriptorProto_ExtensionRange*>(
|
| - &_DescriptorProto_ExtensionRange_default_instance_);
|
| - }
|
| -
|
| void Swap(DescriptorProto_ExtensionRange* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline DescriptorProto_ExtensionRange* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline DescriptorProto_ExtensionRange* New() const { return New(NULL); }
|
|
|
| - DescriptorProto_ExtensionRange* 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;
|
| + DescriptorProto_ExtensionRange* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const DescriptorProto_ExtensionRange& from);
|
| void MergeFrom(const DescriptorProto_ExtensionRange& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(DescriptorProto_ExtensionRange* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -696,25 +595,26 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ExtensionRange)
|
| private:
|
| - void set_has_start();
|
| - void clear_has_start();
|
| - void set_has_end();
|
| - void clear_has_end();
|
| + inline void set_has_start();
|
| + inline void clear_has_start();
|
| + inline void set_has_end();
|
| + inline void clear_has_end();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::int32 start_;
|
| ::google::protobuf::int32 end_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static DescriptorProto_ExtensionRange* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ReservedRange) */ {
|
| +class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protobuf::Message {
|
| public:
|
| DescriptorProto_ReservedRange();
|
| virtual ~DescriptorProto_ReservedRange();
|
| @@ -737,52 +637,42 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protob
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const DescriptorProto_ReservedRange& default_instance();
|
|
|
| - static inline const DescriptorProto_ReservedRange* internal_default_instance() {
|
| - return reinterpret_cast<const DescriptorProto_ReservedRange*>(
|
| - &_DescriptorProto_ReservedRange_default_instance_);
|
| - }
|
| -
|
| void Swap(DescriptorProto_ReservedRange* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline DescriptorProto_ReservedRange* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline DescriptorProto_ReservedRange* New() const { return New(NULL); }
|
|
|
| - DescriptorProto_ReservedRange* 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;
|
| + DescriptorProto_ReservedRange* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const DescriptorProto_ReservedRange& from);
|
| void MergeFrom(const DescriptorProto_ReservedRange& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(DescriptorProto_ReservedRange* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -804,25 +694,26 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protob
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ReservedRange)
|
| private:
|
| - void set_has_start();
|
| - void clear_has_start();
|
| - void set_has_end();
|
| - void clear_has_end();
|
| + inline void set_has_start();
|
| + inline void clear_has_start();
|
| + inline void set_has_end();
|
| + inline void clear_has_end();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::int32 start_;
|
| ::google::protobuf::int32 end_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static DescriptorProto_ReservedRange* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| DescriptorProto();
|
| virtual ~DescriptorProto();
|
| @@ -845,52 +736,42 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message /*
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const DescriptorProto& default_instance();
|
|
|
| - static inline const DescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const DescriptorProto*>(
|
| - &_DescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(DescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline DescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline DescriptorProto* New() const { return New(NULL); }
|
|
|
| - DescriptorProto* 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;
|
| + DescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const DescriptorProto& from);
|
| void MergeFrom(const DescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(DescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1022,33 +903,34 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message /*
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| + ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > field_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto > extension_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto > nested_type_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto > enum_type_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange > extension_range_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto > oneof_decl_;
|
| + ::google::protobuf::MessageOptions* options_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange > reserved_range_;
|
| ::google::protobuf::RepeatedPtrField< ::std::string> reserved_name_;
|
| - ::google::protobuf::internal::ArenaStringPtr name_;
|
| - ::google::protobuf::MessageOptions* options_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static DescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| FieldDescriptorProto();
|
| virtual ~FieldDescriptorProto();
|
| @@ -1071,52 +953,42 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const FieldDescriptorProto& default_instance();
|
|
|
| - static inline const FieldDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const FieldDescriptorProto*>(
|
| - &_FieldDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(FieldDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline FieldDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline FieldDescriptorProto* New() const { return New(NULL); }
|
|
|
| - FieldDescriptorProto* 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;
|
| + FieldDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FieldDescriptorProto& from);
|
| void MergeFrom(const FieldDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(FieldDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1307,49 +1179,50 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FieldDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_number();
|
| - void clear_has_number();
|
| - void set_has_label();
|
| - void clear_has_label();
|
| - void set_has_type();
|
| - void clear_has_type();
|
| - void set_has_type_name();
|
| - void clear_has_type_name();
|
| - void set_has_extendee();
|
| - void clear_has_extendee();
|
| - void set_has_default_value();
|
| - void clear_has_default_value();
|
| - void set_has_oneof_index();
|
| - void clear_has_oneof_index();
|
| - void set_has_json_name();
|
| - void clear_has_json_name();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_number();
|
| + inline void clear_has_number();
|
| + inline void set_has_label();
|
| + inline void clear_has_label();
|
| + inline void set_has_type();
|
| + inline void clear_has_type();
|
| + inline void set_has_type_name();
|
| + inline void clear_has_type_name();
|
| + inline void set_has_extendee();
|
| + inline void clear_has_extendee();
|
| + inline void set_has_default_value();
|
| + inline void clear_has_default_value();
|
| + inline void set_has_oneof_index();
|
| + inline void clear_has_oneof_index();
|
| + inline void set_has_json_name();
|
| + inline void clear_has_json_name();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::int32 number_;
|
| + int label_;
|
| ::google::protobuf::internal::ArenaStringPtr type_name_;
|
| ::google::protobuf::internal::ArenaStringPtr extendee_;
|
| + int type_;
|
| + ::google::protobuf::int32 oneof_index_;
|
| ::google::protobuf::internal::ArenaStringPtr default_value_;
|
| ::google::protobuf::internal::ArenaStringPtr json_name_;
|
| ::google::protobuf::FieldOptions* options_;
|
| - ::google::protobuf::int32 number_;
|
| - ::google::protobuf::int32 oneof_index_;
|
| - int label_;
|
| - int type_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static FieldDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.OneofDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| OneofDescriptorProto();
|
| virtual ~OneofDescriptorProto();
|
| @@ -1372,52 +1245,42 @@ class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Messa
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const OneofDescriptorProto& default_instance();
|
|
|
| - static inline const OneofDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const OneofDescriptorProto*>(
|
| - &_OneofDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(OneofDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline OneofDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline OneofDescriptorProto* New() const { return New(NULL); }
|
|
|
| - OneofDescriptorProto* 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;
|
| + OneofDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const OneofDescriptorProto& from);
|
| void MergeFrom(const OneofDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(OneofDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1435,36 +1298,25 @@ class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Messa
|
| ::std::string* release_name();
|
| void set_allocated_name(::std::string* name);
|
|
|
| - // optional .google.protobuf.OneofOptions options = 2;
|
| - bool has_options() const;
|
| - void clear_options();
|
| - static const int kOptionsFieldNumber = 2;
|
| - const ::google::protobuf::OneofOptions& options() const;
|
| - ::google::protobuf::OneofOptions* mutable_options();
|
| - ::google::protobuf::OneofOptions* release_options();
|
| - void set_allocated_options(::google::protobuf::OneofOptions* options);
|
| -
|
| // @@protoc_insertion_point(class_scope:google.protobuf.OneofDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| - ::google::protobuf::OneofOptions* options_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static OneofDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| EnumDescriptorProto();
|
| virtual ~EnumDescriptorProto();
|
| @@ -1487,52 +1339,42 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const EnumDescriptorProto& default_instance();
|
|
|
| - static inline const EnumDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const EnumDescriptorProto*>(
|
| - &_EnumDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(EnumDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline EnumDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline EnumDescriptorProto* New() const { return New(NULL); }
|
|
|
| - EnumDescriptorProto* 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;
|
| + EnumDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumDescriptorProto& from);
|
| void MergeFrom(const EnumDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(EnumDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1573,26 +1415,27 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;
|
| ::google::protobuf::EnumOptions* options_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static EnumDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| EnumValueDescriptorProto();
|
| virtual ~EnumValueDescriptorProto();
|
| @@ -1615,52 +1458,42 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const EnumValueDescriptorProto& default_instance();
|
|
|
| - static inline const EnumValueDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const EnumValueDescriptorProto*>(
|
| - &_EnumValueDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(EnumValueDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline EnumValueDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline EnumValueDescriptorProto* New() const { return New(NULL); }
|
|
|
| - EnumValueDescriptorProto* 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;
|
| + EnumValueDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumValueDescriptorProto& from);
|
| void MergeFrom(const EnumValueDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(EnumValueDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1696,28 +1529,29 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_number();
|
| - void clear_has_number();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_number();
|
| + inline void clear_has_number();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::EnumValueOptions* options_;
|
| ::google::protobuf::int32 number_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static EnumValueDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| ServiceDescriptorProto();
|
| virtual ~ServiceDescriptorProto();
|
| @@ -1740,52 +1574,42 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const ServiceDescriptorProto& default_instance();
|
|
|
| - static inline const ServiceDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const ServiceDescriptorProto*>(
|
| - &_ServiceDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(ServiceDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline ServiceDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline ServiceDescriptorProto* New() const { return New(NULL); }
|
|
|
| - ServiceDescriptorProto* 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;
|
| + ServiceDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const ServiceDescriptorProto& from);
|
| void MergeFrom(const ServiceDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(ServiceDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1826,26 +1650,27 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.ServiceDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;
|
| ::google::protobuf::ServiceOptions* options_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static ServiceDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodDescriptorProto) */ {
|
| +class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Message {
|
| public:
|
| MethodDescriptorProto();
|
| virtual ~MethodDescriptorProto();
|
| @@ -1868,52 +1693,42 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const MethodDescriptorProto& default_instance();
|
|
|
| - static inline const MethodDescriptorProto* internal_default_instance() {
|
| - return reinterpret_cast<const MethodDescriptorProto*>(
|
| - &_MethodDescriptorProto_default_instance_);
|
| - }
|
| -
|
| void Swap(MethodDescriptorProto* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline MethodDescriptorProto* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline MethodDescriptorProto* New() const { return New(NULL); }
|
|
|
| - MethodDescriptorProto* 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;
|
| + MethodDescriptorProto* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MethodDescriptorProto& from);
|
| void MergeFrom(const MethodDescriptorProto& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(MethodDescriptorProto* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -1980,21 +1795,21 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MethodDescriptorProto)
|
| private:
|
| - void set_has_name();
|
| - void clear_has_name();
|
| - void set_has_input_type();
|
| - void clear_has_input_type();
|
| - void set_has_output_type();
|
| - void clear_has_output_type();
|
| - void set_has_options();
|
| - void clear_has_options();
|
| - void set_has_client_streaming();
|
| - void clear_has_client_streaming();
|
| - void set_has_server_streaming();
|
| - void clear_has_server_streaming();
|
| + inline void set_has_name();
|
| + inline void clear_has_name();
|
| + inline void set_has_input_type();
|
| + inline void clear_has_input_type();
|
| + inline void set_has_output_type();
|
| + inline void clear_has_output_type();
|
| + inline void set_has_options();
|
| + inline void clear_has_options();
|
| + inline void set_has_client_streaming();
|
| + inline void clear_has_client_streaming();
|
| + inline void set_has_server_streaming();
|
| + inline void clear_has_server_streaming();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::internal::ArenaStringPtr name_;
|
| ::google::protobuf::internal::ArenaStringPtr input_type_;
|
| @@ -2002,15 +1817,16 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess
|
| ::google::protobuf::MethodOptions* options_;
|
| bool client_streaming_;
|
| bool server_streaming_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static MethodDescriptorProto* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileOptions) */ {
|
| +class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {
|
| public:
|
| FileOptions();
|
| virtual ~FileOptions();
|
| @@ -2033,52 +1849,42 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const FileOptions& default_instance();
|
|
|
| - static inline const FileOptions* internal_default_instance() {
|
| - return reinterpret_cast<const FileOptions*>(
|
| - &_FileOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(FileOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline FileOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline FileOptions* New() const { return New(NULL); }
|
|
|
| - FileOptions* 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;
|
| + FileOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FileOptions& from);
|
| void MergeFrom(const FileOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(FileOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -2143,12 +1949,12 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
| bool java_multiple_files() const;
|
| void set_java_multiple_files(bool value);
|
|
|
| - // optional bool java_generate_equals_and_hash = 20 [deprecated = true];
|
| - GOOGLE_PROTOBUF_DEPRECATED_ATTR bool has_java_generate_equals_and_hash() const;
|
| - GOOGLE_PROTOBUF_DEPRECATED_ATTR void clear_java_generate_equals_and_hash();
|
| - GOOGLE_PROTOBUF_DEPRECATED_ATTR static const int kJavaGenerateEqualsAndHashFieldNumber = 20;
|
| - GOOGLE_PROTOBUF_DEPRECATED_ATTR bool java_generate_equals_and_hash() const;
|
| - GOOGLE_PROTOBUF_DEPRECATED_ATTR void set_java_generate_equals_and_hash(bool value);
|
| + // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| + bool has_java_generate_equals_and_hash() const;
|
| + void clear_java_generate_equals_and_hash();
|
| + static const int kJavaGenerateEqualsAndHashFieldNumber = 20;
|
| + bool java_generate_equals_and_hash() const;
|
| + void set_java_generate_equals_and_hash(bool value);
|
|
|
| // optional bool java_string_check_utf8 = 27 [default = false];
|
| bool has_java_string_check_utf8() const;
|
| @@ -2235,18 +2041,6 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
| ::std::string* release_csharp_namespace();
|
| void set_allocated_csharp_namespace(::std::string* csharp_namespace);
|
|
|
| - // optional string swift_prefix = 39;
|
| - bool has_swift_prefix() const;
|
| - void clear_swift_prefix();
|
| - static const int kSwiftPrefixFieldNumber = 39;
|
| - const ::std::string& swift_prefix() const;
|
| - void set_swift_prefix(const ::std::string& value);
|
| - void set_swift_prefix(const char* value);
|
| - void set_swift_prefix(const char* value, size_t size);
|
| - ::std::string* mutable_swift_prefix();
|
| - ::std::string* release_swift_prefix();
|
| - void set_allocated_swift_prefix(::std::string* swift_prefix);
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| int uninterpreted_option_size() const;
|
| void clear_uninterpreted_option();
|
| @@ -2262,67 +2056,65 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@p
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(FileOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FileOptions)
|
| private:
|
| - void set_has_java_package();
|
| - void clear_has_java_package();
|
| - void set_has_java_outer_classname();
|
| - void clear_has_java_outer_classname();
|
| - void set_has_java_multiple_files();
|
| - void clear_has_java_multiple_files();
|
| - void set_has_java_generate_equals_and_hash();
|
| - void clear_has_java_generate_equals_and_hash();
|
| - void set_has_java_string_check_utf8();
|
| - void clear_has_java_string_check_utf8();
|
| - void set_has_optimize_for();
|
| - void clear_has_optimize_for();
|
| - void set_has_go_package();
|
| - void clear_has_go_package();
|
| - void set_has_cc_generic_services();
|
| - void clear_has_cc_generic_services();
|
| - void set_has_java_generic_services();
|
| - void clear_has_java_generic_services();
|
| - void set_has_py_generic_services();
|
| - void clear_has_py_generic_services();
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| - void set_has_cc_enable_arenas();
|
| - void clear_has_cc_enable_arenas();
|
| - void set_has_objc_class_prefix();
|
| - void clear_has_objc_class_prefix();
|
| - void set_has_csharp_namespace();
|
| - void clear_has_csharp_namespace();
|
| - void set_has_swift_prefix();
|
| - void clear_has_swift_prefix();
|
| + inline void set_has_java_package();
|
| + inline void clear_has_java_package();
|
| + inline void set_has_java_outer_classname();
|
| + inline void clear_has_java_outer_classname();
|
| + inline void set_has_java_multiple_files();
|
| + inline void clear_has_java_multiple_files();
|
| + inline void set_has_java_generate_equals_and_hash();
|
| + inline void clear_has_java_generate_equals_and_hash();
|
| + inline void set_has_java_string_check_utf8();
|
| + inline void clear_has_java_string_check_utf8();
|
| + inline void set_has_optimize_for();
|
| + inline void clear_has_optimize_for();
|
| + inline void set_has_go_package();
|
| + inline void clear_has_go_package();
|
| + inline void set_has_cc_generic_services();
|
| + inline void clear_has_cc_generic_services();
|
| + inline void set_has_java_generic_services();
|
| + inline void clear_has_java_generic_services();
|
| + inline void set_has_py_generic_services();
|
| + inline void clear_has_py_generic_services();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
| + inline void set_has_cc_enable_arenas();
|
| + inline void clear_has_cc_enable_arenas();
|
| + inline void set_has_objc_class_prefix();
|
| + inline void clear_has_objc_class_prefix();
|
| + inline void set_has_csharp_namespace();
|
| + inline void clear_has_csharp_namespace();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| ::google::protobuf::internal::ArenaStringPtr java_package_;
|
| ::google::protobuf::internal::ArenaStringPtr java_outer_classname_;
|
| - ::google::protobuf::internal::ArenaStringPtr go_package_;
|
| - ::google::protobuf::internal::ArenaStringPtr objc_class_prefix_;
|
| - ::google::protobuf::internal::ArenaStringPtr csharp_namespace_;
|
| - ::google::protobuf::internal::ArenaStringPtr swift_prefix_;
|
| bool java_multiple_files_;
|
| bool java_generate_equals_and_hash_;
|
| bool java_string_check_utf8_;
|
| bool cc_generic_services_;
|
| + int optimize_for_;
|
| + ::google::protobuf::internal::ArenaStringPtr go_package_;
|
| + ::google::protobuf::internal::ArenaStringPtr objc_class_prefix_;
|
| + ::google::protobuf::internal::ArenaStringPtr csharp_namespace_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool java_generic_services_;
|
| bool py_generic_services_;
|
| bool deprecated_;
|
| bool cc_enable_arenas_;
|
| - int optimize_for_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static FileOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MessageOptions) */ {
|
| +class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {
|
| public:
|
| MessageOptions();
|
| virtual ~MessageOptions();
|
| @@ -2345,52 +2137,42 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message /*
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const MessageOptions& default_instance();
|
|
|
| - static inline const MessageOptions* internal_default_instance() {
|
| - return reinterpret_cast<const MessageOptions*>(
|
| - &_MessageOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(MessageOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline MessageOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline MessageOptions* New() const { return New(NULL); }
|
|
|
| - MessageOptions* 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;
|
| + MessageOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MessageOptions& from);
|
| void MergeFrom(const MessageOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(MessageOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -2439,34 +2221,35 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message /*
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(MessageOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MessageOptions)
|
| private:
|
| - void set_has_message_set_wire_format();
|
| - void clear_has_message_set_wire_format();
|
| - void set_has_no_standard_descriptor_accessor();
|
| - void clear_has_no_standard_descriptor_accessor();
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| - void set_has_map_entry();
|
| - void clear_has_map_entry();
|
| + inline void set_has_message_set_wire_format();
|
| + inline void clear_has_message_set_wire_format();
|
| + inline void set_has_no_standard_descriptor_accessor();
|
| + inline void clear_has_no_standard_descriptor_accessor();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
| + inline void set_has_map_entry();
|
| + inline void clear_has_map_entry();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool message_set_wire_format_;
|
| bool no_standard_descriptor_accessor_;
|
| bool deprecated_;
|
| bool map_entry_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static MessageOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions) */ {
|
| +class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {
|
| public:
|
| FieldOptions();
|
| virtual ~FieldOptions();
|
| @@ -2489,52 +2272,42 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message /* @@
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const FieldOptions& default_instance();
|
|
|
| - static inline const FieldOptions* internal_default_instance() {
|
| - return reinterpret_cast<const FieldOptions*>(
|
| - &_FieldOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(FieldOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline FieldOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline FieldOptions* New() const { return New(NULL); }
|
|
|
| - FieldOptions* 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;
|
| + FieldOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const FieldOptions& from);
|
| void MergeFrom(const FieldOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(FieldOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -2653,144 +2426,41 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message /* @@
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(FieldOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.FieldOptions)
|
| private:
|
| - void set_has_ctype();
|
| - void clear_has_ctype();
|
| - void set_has_packed();
|
| - void clear_has_packed();
|
| - void set_has_jstype();
|
| - void clear_has_jstype();
|
| - void set_has_lazy();
|
| - void clear_has_lazy();
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| - void set_has_weak();
|
| - void clear_has_weak();
|
| + inline void set_has_ctype();
|
| + inline void clear_has_ctype();
|
| + inline void set_has_packed();
|
| + inline void clear_has_packed();
|
| + inline void set_has_jstype();
|
| + inline void clear_has_jstype();
|
| + inline void set_has_lazy();
|
| + inline void clear_has_lazy();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
| + inline void set_has_weak();
|
| + inline void clear_has_weak();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| int ctype_;
|
| int jstype_;
|
| + ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool packed_;
|
| bool lazy_;
|
| bool deprecated_;
|
| bool weak_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static FieldOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT OneofOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.OneofOptions) */ {
|
| - public:
|
| - OneofOptions();
|
| - virtual ~OneofOptions();
|
| -
|
| - OneofOptions(const OneofOptions& from);
|
| -
|
| - inline OneofOptions& operator=(const OneofOptions& from) {
|
| - CopyFrom(from);
|
| - return *this;
|
| - }
|
| -
|
| - inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
|
| - return _internal_metadata_.unknown_fields();
|
| - }
|
| -
|
| - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
|
| - return _internal_metadata_.mutable_unknown_fields();
|
| - }
|
| -
|
| - static const ::google::protobuf::Descriptor* descriptor();
|
| - static const OneofOptions& default_instance();
|
| -
|
| - static inline const OneofOptions* internal_default_instance() {
|
| - return reinterpret_cast<const OneofOptions*>(
|
| - &_OneofOptions_default_instance_);
|
| - }
|
| -
|
| - void Swap(OneofOptions* other);
|
| -
|
| - // implements Message ----------------------------------------------
|
| -
|
| - inline OneofOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| -
|
| - OneofOptions* 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 OneofOptions& from);
|
| - void MergeFrom(const OneofOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| -
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| - bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| - void SerializeWithCachedSizes(
|
| - ::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 PROTOBUF_FINAL;
|
| - void InternalSwap(OneofOptions* other);
|
| - private:
|
| - inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| - }
|
| - inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| - }
|
| - public:
|
| -
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| -
|
| - // nested types ----------------------------------------------------
|
| -
|
| - // accessors -------------------------------------------------------
|
| -
|
| - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - int uninterpreted_option_size() const;
|
| - void clear_uninterpreted_option();
|
| - static const int kUninterpretedOptionFieldNumber = 999;
|
| - const ::google::protobuf::UninterpretedOption& uninterpreted_option(int index) const;
|
| - ::google::protobuf::UninterpretedOption* mutable_uninterpreted_option(int index);
|
| - ::google::protobuf::UninterpretedOption* add_uninterpreted_option();
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| - mutable_uninterpreted_option();
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| - uninterpreted_option() const;
|
| -
|
| - GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(OneofOptions)
|
| - // @@protoc_insertion_point(class_scope:google.protobuf.OneofOptions)
|
| - private:
|
| -
|
| - ::google::protobuf::internal::ExtensionSet _extensions_;
|
| -
|
| - ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| - mutable int _cached_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| - friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
| -
|
| -};
|
| -// -------------------------------------------------------------------
|
| -
|
| -class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumOptions) */ {
|
| +class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {
|
| public:
|
| EnumOptions();
|
| virtual ~EnumOptions();
|
| @@ -2813,52 +2483,42 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message /* @@p
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const EnumOptions& default_instance();
|
|
|
| - static inline const EnumOptions* internal_default_instance() {
|
| - return reinterpret_cast<const EnumOptions*>(
|
| - &_EnumOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(EnumOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline EnumOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline EnumOptions* New() const { return New(NULL); }
|
|
|
| - EnumOptions* 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;
|
| + EnumOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumOptions& from);
|
| void MergeFrom(const EnumOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(EnumOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -2893,28 +2553,29 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message /* @@p
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(EnumOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumOptions)
|
| private:
|
| - void set_has_allow_alias();
|
| - void clear_has_allow_alias();
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| + inline void set_has_allow_alias();
|
| + inline void clear_has_allow_alias();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool allow_alias_;
|
| bool deprecated_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static EnumOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueOptions) */ {
|
| +class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {
|
| public:
|
| EnumValueOptions();
|
| virtual ~EnumValueOptions();
|
| @@ -2937,52 +2598,42 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message /
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const EnumValueOptions& default_instance();
|
|
|
| - static inline const EnumValueOptions* internal_default_instance() {
|
| - return reinterpret_cast<const EnumValueOptions*>(
|
| - &_EnumValueOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(EnumValueOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline EnumValueOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline EnumValueOptions* New() const { return New(NULL); }
|
|
|
| - EnumValueOptions* 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;
|
| + EnumValueOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const EnumValueOptions& from);
|
| void MergeFrom(const EnumValueOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(EnumValueOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3010,25 +2661,26 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message /
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(EnumValueOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueOptions)
|
| private:
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool deprecated_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static EnumValueOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceOptions) */ {
|
| +class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {
|
| public:
|
| ServiceOptions();
|
| virtual ~ServiceOptions();
|
| @@ -3051,52 +2703,42 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message /*
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const ServiceOptions& default_instance();
|
|
|
| - static inline const ServiceOptions* internal_default_instance() {
|
| - return reinterpret_cast<const ServiceOptions*>(
|
| - &_ServiceOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(ServiceOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline ServiceOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline ServiceOptions* New() const { return New(NULL); }
|
|
|
| - ServiceOptions* 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;
|
| + ServiceOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const ServiceOptions& from);
|
| void MergeFrom(const ServiceOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(ServiceOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3124,25 +2766,26 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message /*
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(ServiceOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.ServiceOptions)
|
| private:
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool deprecated_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static ServiceOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodOptions) */ {
|
| +class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {
|
| public:
|
| MethodOptions();
|
| virtual ~MethodOptions();
|
| @@ -3165,83 +2808,45 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message /* @
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const MethodOptions& default_instance();
|
|
|
| - static inline const MethodOptions* internal_default_instance() {
|
| - return reinterpret_cast<const MethodOptions*>(
|
| - &_MethodOptions_default_instance_);
|
| - }
|
| -
|
| void Swap(MethodOptions* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline MethodOptions* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline MethodOptions* New() const { return New(NULL); }
|
|
|
| - MethodOptions* 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;
|
| + MethodOptions* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const MethodOptions& from);
|
| void MergeFrom(const MethodOptions& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(MethodOptions* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| - typedef MethodOptions_IdempotencyLevel IdempotencyLevel;
|
| - static const IdempotencyLevel IDEMPOTENCY_UNKNOWN =
|
| - MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN;
|
| - static const IdempotencyLevel NO_SIDE_EFFECTS =
|
| - MethodOptions_IdempotencyLevel_NO_SIDE_EFFECTS;
|
| - static const IdempotencyLevel IDEMPOTENT =
|
| - MethodOptions_IdempotencyLevel_IDEMPOTENT;
|
| - static inline bool IdempotencyLevel_IsValid(int value) {
|
| - return MethodOptions_IdempotencyLevel_IsValid(value);
|
| - }
|
| - static const IdempotencyLevel IdempotencyLevel_MIN =
|
| - MethodOptions_IdempotencyLevel_IdempotencyLevel_MIN;
|
| - static const IdempotencyLevel IdempotencyLevel_MAX =
|
| - MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX;
|
| - static const int IdempotencyLevel_ARRAYSIZE =
|
| - MethodOptions_IdempotencyLevel_IdempotencyLevel_ARRAYSIZE;
|
| - static inline const ::google::protobuf::EnumDescriptor*
|
| - IdempotencyLevel_descriptor() {
|
| - return MethodOptions_IdempotencyLevel_descriptor();
|
| - }
|
| - static inline const ::std::string& IdempotencyLevel_Name(IdempotencyLevel value) {
|
| - return MethodOptions_IdempotencyLevel_Name(value);
|
| - }
|
| - static inline bool IdempotencyLevel_Parse(const ::std::string& name,
|
| - IdempotencyLevel* value) {
|
| - return MethodOptions_IdempotencyLevel_Parse(name, value);
|
| - }
|
| -
|
| // accessors -------------------------------------------------------
|
|
|
| // optional bool deprecated = 33 [default = false];
|
| @@ -3251,13 +2856,6 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message /* @
|
| bool deprecated() const;
|
| void set_deprecated(bool value);
|
|
|
| - // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
|
| - bool has_idempotency_level() const;
|
| - void clear_idempotency_level();
|
| - static const int kIdempotencyLevelFieldNumber = 34;
|
| - ::google::protobuf::MethodOptions_IdempotencyLevel idempotency_level() const;
|
| - void set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value);
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| int uninterpreted_option_size() const;
|
| void clear_uninterpreted_option();
|
| @@ -3273,28 +2871,26 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message /* @
|
| GOOGLE_PROTOBUF_EXTENSION_ACCESSORS(MethodOptions)
|
| // @@protoc_insertion_point(class_scope:google.protobuf.MethodOptions)
|
| private:
|
| - void set_has_deprecated();
|
| - void clear_has_deprecated();
|
| - void set_has_idempotency_level();
|
| - void clear_has_idempotency_level();
|
| + inline void set_has_deprecated();
|
| + inline void clear_has_deprecated();
|
|
|
| ::google::protobuf::internal::ExtensionSet _extensions_;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;
|
| bool deprecated_;
|
| - int idempotency_level_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static MethodOptions* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption.NamePart) */ {
|
| +class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobuf::Message {
|
| public:
|
| UninterpretedOption_NamePart();
|
| virtual ~UninterpretedOption_NamePart();
|
| @@ -3317,52 +2913,42 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const UninterpretedOption_NamePart& default_instance();
|
|
|
| - static inline const UninterpretedOption_NamePart* internal_default_instance() {
|
| - return reinterpret_cast<const UninterpretedOption_NamePart*>(
|
| - &_UninterpretedOption_NamePart_default_instance_);
|
| - }
|
| -
|
| void Swap(UninterpretedOption_NamePart* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline UninterpretedOption_NamePart* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline UninterpretedOption_NamePart* New() const { return New(NULL); }
|
|
|
| - UninterpretedOption_NamePart* 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;
|
| + UninterpretedOption_NamePart* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const UninterpretedOption_NamePart& from);
|
| void MergeFrom(const UninterpretedOption_NamePart& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(UninterpretedOption_NamePart* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3389,28 +2975,29 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption.NamePart)
|
| private:
|
| - void set_has_name_part();
|
| - void clear_has_name_part();
|
| - void set_has_is_extension();
|
| - void clear_has_is_extension();
|
| + inline void set_has_name_part();
|
| + inline void clear_has_name_part();
|
| + inline void set_has_is_extension();
|
| + inline void clear_has_is_extension();
|
|
|
| - // helper for ByteSizeLong()
|
| - size_t RequiredFieldsByteSizeFallback() const;
|
| + // helper for ByteSize()
|
| + int RequiredFieldsByteSizeFallback() const;
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::internal::ArenaStringPtr name_part_;
|
| bool is_extension_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static UninterpretedOption_NamePart* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption) */ {
|
| +class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Message {
|
| public:
|
| UninterpretedOption();
|
| virtual ~UninterpretedOption();
|
| @@ -3433,52 +3020,42 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const UninterpretedOption& default_instance();
|
|
|
| - static inline const UninterpretedOption* internal_default_instance() {
|
| - return reinterpret_cast<const UninterpretedOption*>(
|
| - &_UninterpretedOption_default_instance_);
|
| - }
|
| -
|
| void Swap(UninterpretedOption* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline UninterpretedOption* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline UninterpretedOption* New() const { return New(NULL); }
|
|
|
| - UninterpretedOption* 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;
|
| + UninterpretedOption* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const UninterpretedOption& from);
|
| void MergeFrom(const UninterpretedOption& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(UninterpretedOption* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3557,38 +3134,39 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption)
|
| private:
|
| - void set_has_identifier_value();
|
| - void clear_has_identifier_value();
|
| - void set_has_positive_int_value();
|
| - void clear_has_positive_int_value();
|
| - void set_has_negative_int_value();
|
| - void clear_has_negative_int_value();
|
| - void set_has_double_value();
|
| - void clear_has_double_value();
|
| - void set_has_string_value();
|
| - void clear_has_string_value();
|
| - void set_has_aggregate_value();
|
| - void clear_has_aggregate_value();
|
| + inline void set_has_identifier_value();
|
| + inline void clear_has_identifier_value();
|
| + inline void set_has_positive_int_value();
|
| + inline void clear_has_positive_int_value();
|
| + inline void set_has_negative_int_value();
|
| + inline void clear_has_negative_int_value();
|
| + inline void set_has_double_value();
|
| + inline void clear_has_double_value();
|
| + inline void set_has_string_value();
|
| + inline void clear_has_string_value();
|
| + inline void set_has_aggregate_value();
|
| + inline void clear_has_aggregate_value();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart > name_;
|
| ::google::protobuf::internal::ArenaStringPtr identifier_value_;
|
| - ::google::protobuf::internal::ArenaStringPtr string_value_;
|
| - ::google::protobuf::internal::ArenaStringPtr aggregate_value_;
|
| ::google::protobuf::uint64 positive_int_value_;
|
| ::google::protobuf::int64 negative_int_value_;
|
| double double_value_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + ::google::protobuf::internal::ArenaStringPtr string_value_;
|
| + ::google::protobuf::internal::ArenaStringPtr aggregate_value_;
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static UninterpretedOption* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo.Location) */ {
|
| +class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Message {
|
| public:
|
| SourceCodeInfo_Location();
|
| virtual ~SourceCodeInfo_Location();
|
| @@ -3611,52 +3189,42 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const SourceCodeInfo_Location& default_instance();
|
|
|
| - static inline const SourceCodeInfo_Location* internal_default_instance() {
|
| - return reinterpret_cast<const SourceCodeInfo_Location*>(
|
| - &_SourceCodeInfo_Location_default_instance_);
|
| - }
|
| -
|
| void Swap(SourceCodeInfo_Location* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline SourceCodeInfo_Location* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline SourceCodeInfo_Location* New() const { return New(NULL); }
|
|
|
| - SourceCodeInfo_Location* 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;
|
| + SourceCodeInfo_Location* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const SourceCodeInfo_Location& from);
|
| void MergeFrom(const SourceCodeInfo_Location& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(SourceCodeInfo_Location* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3728,30 +3296,31 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.SourceCodeInfo.Location)
|
| private:
|
| - void set_has_leading_comments();
|
| - void clear_has_leading_comments();
|
| - void set_has_trailing_comments();
|
| - void clear_has_trailing_comments();
|
| + inline void set_has_leading_comments();
|
| + inline void clear_has_leading_comments();
|
| + inline void set_has_trailing_comments();
|
| + inline void clear_has_trailing_comments();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > path_;
|
| mutable int _path_cached_byte_size_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > span_;
|
| mutable int _span_cached_byte_size_;
|
| - ::google::protobuf::RepeatedPtrField< ::std::string> leading_detached_comments_;
|
| ::google::protobuf::internal::ArenaStringPtr leading_comments_;
|
| ::google::protobuf::internal::ArenaStringPtr trailing_comments_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + ::google::protobuf::RepeatedPtrField< ::std::string> leading_detached_comments_;
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static SourceCodeInfo_Location* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo) */ {
|
| +class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {
|
| public:
|
| SourceCodeInfo();
|
| virtual ~SourceCodeInfo();
|
| @@ -3774,52 +3343,42 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message /*
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const SourceCodeInfo& default_instance();
|
|
|
| - static inline const SourceCodeInfo* internal_default_instance() {
|
| - return reinterpret_cast<const SourceCodeInfo*>(
|
| - &_SourceCodeInfo_default_instance_);
|
| - }
|
| -
|
| void Swap(SourceCodeInfo* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline SourceCodeInfo* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline SourceCodeInfo* New() const { return New(NULL); }
|
|
|
| - SourceCodeInfo* 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;
|
| + SourceCodeInfo* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const SourceCodeInfo& from);
|
| void MergeFrom(const SourceCodeInfo& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(SourceCodeInfo* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3843,18 +3402,19 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message /*
|
| private:
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location > location_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static SourceCodeInfo* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo.Annotation) */ {
|
| +class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobuf::Message {
|
| public:
|
| GeneratedCodeInfo_Annotation();
|
| virtual ~GeneratedCodeInfo_Annotation();
|
| @@ -3877,52 +3437,42 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobu
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const GeneratedCodeInfo_Annotation& default_instance();
|
|
|
| - static inline const GeneratedCodeInfo_Annotation* internal_default_instance() {
|
| - return reinterpret_cast<const GeneratedCodeInfo_Annotation*>(
|
| - &_GeneratedCodeInfo_Annotation_default_instance_);
|
| - }
|
| -
|
| void Swap(GeneratedCodeInfo_Annotation* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline GeneratedCodeInfo_Annotation* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline GeneratedCodeInfo_Annotation* New() const { return New(NULL); }
|
|
|
| - GeneratedCodeInfo_Annotation* 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;
|
| + GeneratedCodeInfo_Annotation* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const GeneratedCodeInfo_Annotation& from);
|
| void MergeFrom(const GeneratedCodeInfo_Annotation& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(GeneratedCodeInfo_Annotation* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -3968,30 +3518,31 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobu
|
|
|
| // @@protoc_insertion_point(class_scope:google.protobuf.GeneratedCodeInfo.Annotation)
|
| private:
|
| - void set_has_source_file();
|
| - void clear_has_source_file();
|
| - void set_has_begin();
|
| - void clear_has_begin();
|
| - void set_has_end();
|
| - void clear_has_end();
|
| + inline void set_has_source_file();
|
| + inline void clear_has_source_file();
|
| + inline void set_has_begin();
|
| + inline void clear_has_begin();
|
| + inline void set_has_end();
|
| + inline void clear_has_end();
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedField< ::google::protobuf::int32 > path_;
|
| mutable int _path_cached_byte_size_;
|
| ::google::protobuf::internal::ArenaStringPtr source_file_;
|
| ::google::protobuf::int32 begin_;
|
| ::google::protobuf::int32 end_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static GeneratedCodeInfo_Annotation* default_instance_;
|
| };
|
| // -------------------------------------------------------------------
|
|
|
| -class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo) */ {
|
| +class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message {
|
| public:
|
| GeneratedCodeInfo();
|
| virtual ~GeneratedCodeInfo();
|
| @@ -4014,52 +3565,42 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message
|
| static const ::google::protobuf::Descriptor* descriptor();
|
| static const GeneratedCodeInfo& default_instance();
|
|
|
| - static inline const GeneratedCodeInfo* internal_default_instance() {
|
| - return reinterpret_cast<const GeneratedCodeInfo*>(
|
| - &_GeneratedCodeInfo_default_instance_);
|
| - }
|
| -
|
| void Swap(GeneratedCodeInfo* other);
|
|
|
| // implements Message ----------------------------------------------
|
|
|
| - inline GeneratedCodeInfo* New() const PROTOBUF_FINAL { return New(NULL); }
|
| + inline GeneratedCodeInfo* New() const { return New(NULL); }
|
|
|
| - GeneratedCodeInfo* 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;
|
| + GeneratedCodeInfo* New(::google::protobuf::Arena* arena) const;
|
| + void CopyFrom(const ::google::protobuf::Message& from);
|
| + void MergeFrom(const ::google::protobuf::Message& from);
|
| void CopyFrom(const GeneratedCodeInfo& from);
|
| void MergeFrom(const GeneratedCodeInfo& from);
|
| - void Clear() PROTOBUF_FINAL;
|
| - bool IsInitialized() const PROTOBUF_FINAL;
|
| + void Clear();
|
| + bool IsInitialized() const;
|
|
|
| - size_t ByteSizeLong() const PROTOBUF_FINAL;
|
| + int ByteSize() const;
|
| bool MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
|
| + ::google::protobuf::io::CodedInputStream* input);
|
| void SerializeWithCachedSizes(
|
| - ::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_; }
|
| + ::google::protobuf::io::CodedOutputStream* output) const;
|
| + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
|
| + int GetCachedSize() const { return _cached_size_; }
|
| private:
|
| void SharedCtor();
|
| void SharedDtor();
|
| - void SetCachedSize(int size) const PROTOBUF_FINAL;
|
| + void SetCachedSize(int size) const;
|
| void InternalSwap(GeneratedCodeInfo* other);
|
| private:
|
| inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
|
| - return NULL;
|
| + return _internal_metadata_.arena();
|
| }
|
| inline void* MaybeArenaPtr() const {
|
| - return NULL;
|
| + return _internal_metadata_.raw_arena_ptr();
|
| }
|
| public:
|
|
|
| - ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
|
| + ::google::protobuf::Metadata GetMetadata() const;
|
|
|
| // nested types ----------------------------------------------------
|
|
|
| @@ -4083,14 +3624,15 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message
|
| private:
|
|
|
| ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
|
| - ::google::protobuf::internal::HasBits<1> _has_bits_;
|
| + ::google::protobuf::uint32 _has_bits_[1];
|
| mutable int _cached_size_;
|
| ::google::protobuf::RepeatedPtrField< ::google::protobuf::GeneratedCodeInfo_Annotation > annotation_;
|
| - friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();
|
| - friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| + friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();
|
| friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();
|
|
|
| + void InitAsDefaultInstance();
|
| + static GeneratedCodeInfo* default_instance_;
|
| };
|
| // ===================================================================
|
|
|
| @@ -4150,7 +3692,7 @@ inline void FileDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& FileDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -4204,7 +3746,7 @@ inline void FileDescriptorProto::clear_package() {
|
| }
|
| inline const ::std::string& FileDescriptorProto::package() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package)
|
| - return package_.GetNoArena();
|
| + return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_package(const ::std::string& value) {
|
| set_has_package();
|
| @@ -4479,13 +4021,13 @@ FileDescriptorProto::extension() const {
|
|
|
| // optional .google.protobuf.FileOptions options = 8;
|
| inline bool FileDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| + return (_has_bits_[0] & 0x00000200u) != 0;
|
| }
|
| inline void FileDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| + _has_bits_[0] |= 0x00000200u;
|
| }
|
| inline void FileDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| + _has_bits_[0] &= ~0x00000200u;
|
| }
|
| inline void FileDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();
|
| @@ -4493,8 +4035,7 @@ inline void FileDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::FileOptions& FileDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::FileOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -4524,13 +4065,13 @@ inline void FileDescriptorProto::set_allocated_options(::google::protobuf::FileO
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| inline bool FileDescriptorProto::has_source_code_info() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| + return (_has_bits_[0] & 0x00000400u) != 0;
|
| }
|
| inline void FileDescriptorProto::set_has_source_code_info() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| + _has_bits_[0] |= 0x00000400u;
|
| }
|
| inline void FileDescriptorProto::clear_has_source_code_info() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| + _has_bits_[0] &= ~0x00000400u;
|
| }
|
| inline void FileDescriptorProto::clear_source_code_info() {
|
| if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();
|
| @@ -4538,8 +4079,7 @@ inline void FileDescriptorProto::clear_source_code_info() {
|
| }
|
| inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info)
|
| - return source_code_info_ != NULL ? *source_code_info_
|
| - : *::google::protobuf::SourceCodeInfo::internal_default_instance();
|
| + return source_code_info_ != NULL ? *source_code_info_ : *default_instance_->source_code_info_;
|
| }
|
| inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() {
|
| set_has_source_code_info();
|
| @@ -4569,13 +4109,13 @@ inline void FileDescriptorProto::set_allocated_source_code_info(::google::protob
|
|
|
| // optional string syntax = 12;
|
| inline bool FileDescriptorProto::has_syntax() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000800u) != 0;
|
| }
|
| inline void FileDescriptorProto::set_has_syntax() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000800u;
|
| }
|
| inline void FileDescriptorProto::clear_has_syntax() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000800u;
|
| }
|
| inline void FileDescriptorProto::clear_syntax() {
|
| syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -4583,7 +4123,7 @@ inline void FileDescriptorProto::clear_syntax() {
|
| }
|
| inline const ::std::string& FileDescriptorProto::syntax() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax)
|
| - return syntax_.GetNoArena();
|
| + return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileDescriptorProto::set_syntax(const ::std::string& value) {
|
| set_has_syntax();
|
| @@ -4745,7 +4285,7 @@ inline void DescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& DescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void DescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -4965,13 +4505,13 @@ DescriptorProto::oneof_decl() const {
|
|
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| inline bool DescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000080u) != 0;
|
| }
|
| inline void DescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000080u;
|
| }
|
| inline void DescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000080u;
|
| }
|
| inline void DescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();
|
| @@ -4979,8 +4519,7 @@ inline void DescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::MessageOptions& DescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::MessageOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -5113,7 +4652,7 @@ inline void FieldDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& FieldDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -5153,13 +4692,13 @@ inline void FieldDescriptorProto::set_allocated_name(::std::string* name) {
|
|
|
| // optional int32 number = 3;
|
| inline bool FieldDescriptorProto::has_number() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_number() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| + _has_bits_[0] |= 0x00000002u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_number() {
|
| - _has_bits_[0] &= ~0x00000040u;
|
| + _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void FieldDescriptorProto::clear_number() {
|
| number_ = 0;
|
| @@ -5177,13 +4716,13 @@ inline void FieldDescriptorProto::set_number(::google::protobuf::int32 value) {
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| inline bool FieldDescriptorProto::has_label() const {
|
| - return (_has_bits_[0] & 0x00000100u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_label() {
|
| - _has_bits_[0] |= 0x00000100u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_label() {
|
| - _has_bits_[0] &= ~0x00000100u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void FieldDescriptorProto::clear_label() {
|
| label_ = 1;
|
| @@ -5202,13 +4741,13 @@ inline void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorP
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| inline bool FieldDescriptorProto::has_type() const {
|
| - return (_has_bits_[0] & 0x00000200u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_type() {
|
| - _has_bits_[0] |= 0x00000200u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_type() {
|
| - _has_bits_[0] &= ~0x00000200u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void FieldDescriptorProto::clear_type() {
|
| type_ = 1;
|
| @@ -5227,13 +4766,13 @@ inline void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorPr
|
|
|
| // optional string type_name = 6;
|
| inline bool FieldDescriptorProto::has_type_name() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000010u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_type_name() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000010u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_type_name() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000010u;
|
| }
|
| inline void FieldDescriptorProto::clear_type_name() {
|
| type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -5241,7 +4780,7 @@ inline void FieldDescriptorProto::clear_type_name() {
|
| }
|
| inline const ::std::string& FieldDescriptorProto::type_name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name)
|
| - return type_name_.GetNoArena();
|
| + return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_type_name(const ::std::string& value) {
|
| set_has_type_name();
|
| @@ -5281,13 +4820,13 @@ inline void FieldDescriptorProto::set_allocated_type_name(::std::string* type_na
|
|
|
| // optional string extendee = 2;
|
| inline bool FieldDescriptorProto::has_extendee() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000020u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_extendee() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000020u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_extendee() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000020u;
|
| }
|
| inline void FieldDescriptorProto::clear_extendee() {
|
| extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -5295,7 +4834,7 @@ inline void FieldDescriptorProto::clear_extendee() {
|
| }
|
| inline const ::std::string& FieldDescriptorProto::extendee() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee)
|
| - return extendee_.GetNoArena();
|
| + return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_extendee(const ::std::string& value) {
|
| set_has_extendee();
|
| @@ -5335,13 +4874,13 @@ inline void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee
|
|
|
| // optional string default_value = 7;
|
| inline bool FieldDescriptorProto::has_default_value() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| + return (_has_bits_[0] & 0x00000040u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_default_value() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| + _has_bits_[0] |= 0x00000040u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_default_value() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| + _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void FieldDescriptorProto::clear_default_value() {
|
| default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -5349,7 +4888,7 @@ inline void FieldDescriptorProto::clear_default_value() {
|
| }
|
| inline const ::std::string& FieldDescriptorProto::default_value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value)
|
| - return default_value_.GetNoArena();
|
| + return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_default_value(const ::std::string& value) {
|
| set_has_default_value();
|
| @@ -5413,13 +4952,13 @@ inline void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 valu
|
|
|
| // optional string json_name = 10;
|
| inline bool FieldDescriptorProto::has_json_name() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| + return (_has_bits_[0] & 0x00000100u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_json_name() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| + _has_bits_[0] |= 0x00000100u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_json_name() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| + _has_bits_[0] &= ~0x00000100u;
|
| }
|
| inline void FieldDescriptorProto::clear_json_name() {
|
| json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -5427,7 +4966,7 @@ inline void FieldDescriptorProto::clear_json_name() {
|
| }
|
| inline const ::std::string& FieldDescriptorProto::json_name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name)
|
| - return json_name_.GetNoArena();
|
| + return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FieldDescriptorProto::set_json_name(const ::std::string& value) {
|
| set_has_json_name();
|
| @@ -5467,13 +5006,13 @@ inline void FieldDescriptorProto::set_allocated_json_name(::std::string* json_na
|
|
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| inline bool FieldDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| + return (_has_bits_[0] & 0x00000200u) != 0;
|
| }
|
| inline void FieldDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| + _has_bits_[0] |= 0x00000200u;
|
| }
|
| inline void FieldDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| + _has_bits_[0] &= ~0x00000200u;
|
| }
|
| inline void FieldDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();
|
| @@ -5481,8 +5020,7 @@ inline void FieldDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::FieldOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -5530,7 +5068,7 @@ inline void OneofDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& OneofDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void OneofDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -5568,51 +5106,6 @@ inline void OneofDescriptorProto::set_allocated_name(::std::string* name) {
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name)
|
| }
|
|
|
| -// optional .google.protobuf.OneofOptions options = 2;
|
| -inline bool OneofDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -inline void OneofDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -inline void OneofDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -inline void OneofDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::OneofOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| -inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::OneofOptions::internal_default_instance();
|
| -}
|
| -inline ::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::OneofOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.options)
|
| - return options_;
|
| -}
|
| -inline ::google::protobuf::OneofOptions* OneofDescriptorProto::release_options() {
|
| - // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options)
|
| - clear_has_options();
|
| - ::google::protobuf::OneofOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| -inline void OneofDescriptorProto::set_allocated_options(::google::protobuf::OneofOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.options)
|
| -}
|
| -
|
| // -------------------------------------------------------------------
|
|
|
| // EnumDescriptorProto
|
| @@ -5633,7 +5126,7 @@ inline void EnumDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& EnumDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -5703,13 +5196,13 @@ EnumDescriptorProto::value() const {
|
|
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| inline bool EnumDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void EnumDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void EnumDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void EnumDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear();
|
| @@ -5717,8 +5210,7 @@ inline void EnumDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::EnumOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -5766,7 +5258,7 @@ inline void EnumValueDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& EnumValueDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void EnumValueDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -5806,13 +5298,13 @@ inline void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {
|
|
|
| // optional int32 number = 2;
|
| inline bool EnumValueDescriptorProto::has_number() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| }
|
| inline void EnumValueDescriptorProto::set_has_number() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000002u;
|
| }
|
| inline void EnumValueDescriptorProto::clear_has_number() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void EnumValueDescriptorProto::clear_number() {
|
| number_ = 0;
|
| @@ -5830,13 +5322,13 @@ inline void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value
|
|
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| inline bool EnumValueDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void EnumValueDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void EnumValueDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void EnumValueDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear();
|
| @@ -5844,8 +5336,7 @@ inline void EnumValueDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::EnumValueOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -5893,7 +5384,7 @@ inline void ServiceDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& ServiceDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void ServiceDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -5963,13 +5454,13 @@ ServiceDescriptorProto::method() const {
|
|
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| inline bool ServiceDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void ServiceDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void ServiceDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void ServiceDescriptorProto::clear_options() {
|
| if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear();
|
| @@ -5977,8 +5468,7 @@ inline void ServiceDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::ServiceOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -6026,7 +5516,7 @@ inline void MethodDescriptorProto::clear_name() {
|
| }
|
| inline const ::std::string& MethodDescriptorProto::name() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name)
|
| - return name_.GetNoArena();
|
| + return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_name(const ::std::string& value) {
|
| set_has_name();
|
| @@ -6080,7 +5570,7 @@ inline void MethodDescriptorProto::clear_input_type() {
|
| }
|
| inline const ::std::string& MethodDescriptorProto::input_type() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type)
|
| - return input_type_.GetNoArena();
|
| + return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_input_type(const ::std::string& value) {
|
| set_has_input_type();
|
| @@ -6134,7 +5624,7 @@ inline void MethodDescriptorProto::clear_output_type() {
|
| }
|
| inline const ::std::string& MethodDescriptorProto::output_type() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type)
|
| - return output_type_.GetNoArena();
|
| + return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void MethodDescriptorProto::set_output_type(const ::std::string& value) {
|
| set_has_output_type();
|
| @@ -6188,8 +5678,7 @@ inline void MethodDescriptorProto::clear_options() {
|
| }
|
| inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)
|
| - return options_ != NULL ? *options_
|
| - : *::google::protobuf::MethodOptions::internal_default_instance();
|
| + return options_ != NULL ? *options_ : *default_instance_->options_;
|
| }
|
| inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() {
|
| set_has_options();
|
| @@ -6285,7 +5774,7 @@ inline void FileOptions::clear_java_package() {
|
| }
|
| inline const ::std::string& FileOptions::java_package() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package)
|
| - return java_package_.GetNoArena();
|
| + return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_java_package(const ::std::string& value) {
|
| set_has_java_package();
|
| @@ -6339,7 +5828,7 @@ inline void FileOptions::clear_java_outer_classname() {
|
| }
|
| inline const ::std::string& FileOptions::java_outer_classname() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname)
|
| - return java_outer_classname_.GetNoArena();
|
| + return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_java_outer_classname(const ::std::string& value) {
|
| set_has_java_outer_classname();
|
| @@ -6379,13 +5868,13 @@ inline void FileOptions::set_allocated_java_outer_classname(::std::string* java_
|
|
|
| // optional bool java_multiple_files = 10 [default = false];
|
| inline bool FileOptions::has_java_multiple_files() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void FileOptions::set_has_java_multiple_files() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void FileOptions::clear_has_java_multiple_files() {
|
| - _has_bits_[0] &= ~0x00000040u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void FileOptions::clear_java_multiple_files() {
|
| java_multiple_files_ = false;
|
| @@ -6401,15 +5890,15 @@ inline void FileOptions::set_java_multiple_files(bool value) {
|
| // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)
|
| }
|
|
|
| -// optional bool java_generate_equals_and_hash = 20 [deprecated = true];
|
| +// optional bool java_generate_equals_and_hash = 20 [default = false];
|
| inline bool FileOptions::has_java_generate_equals_and_hash() const {
|
| - return (_has_bits_[0] & 0x00000080u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void FileOptions::set_has_java_generate_equals_and_hash() {
|
| - _has_bits_[0] |= 0x00000080u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void FileOptions::clear_has_java_generate_equals_and_hash() {
|
| - _has_bits_[0] &= ~0x00000080u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void FileOptions::clear_java_generate_equals_and_hash() {
|
| java_generate_equals_and_hash_ = false;
|
| @@ -6427,13 +5916,13 @@ inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
|
|
|
| // optional bool java_string_check_utf8 = 27 [default = false];
|
| inline bool FileOptions::has_java_string_check_utf8() const {
|
| - return (_has_bits_[0] & 0x00000100u) != 0;
|
| + return (_has_bits_[0] & 0x00000010u) != 0;
|
| }
|
| inline void FileOptions::set_has_java_string_check_utf8() {
|
| - _has_bits_[0] |= 0x00000100u;
|
| + _has_bits_[0] |= 0x00000010u;
|
| }
|
| inline void FileOptions::clear_has_java_string_check_utf8() {
|
| - _has_bits_[0] &= ~0x00000100u;
|
| + _has_bits_[0] &= ~0x00000010u;
|
| }
|
| inline void FileOptions::clear_java_string_check_utf8() {
|
| java_string_check_utf8_ = false;
|
| @@ -6451,13 +5940,13 @@ inline void FileOptions::set_java_string_check_utf8(bool value) {
|
|
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| inline bool FileOptions::has_optimize_for() const {
|
| - return (_has_bits_[0] & 0x00004000u) != 0;
|
| + return (_has_bits_[0] & 0x00000020u) != 0;
|
| }
|
| inline void FileOptions::set_has_optimize_for() {
|
| - _has_bits_[0] |= 0x00004000u;
|
| + _has_bits_[0] |= 0x00000020u;
|
| }
|
| inline void FileOptions::clear_has_optimize_for() {
|
| - _has_bits_[0] &= ~0x00004000u;
|
| + _has_bits_[0] &= ~0x00000020u;
|
| }
|
| inline void FileOptions::clear_optimize_for() {
|
| optimize_for_ = 1;
|
| @@ -6476,13 +5965,13 @@ inline void FileOptions::set_optimize_for(::google::protobuf::FileOptions_Optimi
|
|
|
| // optional string go_package = 11;
|
| inline bool FileOptions::has_go_package() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000040u) != 0;
|
| }
|
| inline void FileOptions::set_has_go_package() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000040u;
|
| }
|
| inline void FileOptions::clear_has_go_package() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void FileOptions::clear_go_package() {
|
| go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -6490,7 +5979,7 @@ inline void FileOptions::clear_go_package() {
|
| }
|
| inline const ::std::string& FileOptions::go_package() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package)
|
| - return go_package_.GetNoArena();
|
| + return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_go_package(const ::std::string& value) {
|
| set_has_go_package();
|
| @@ -6530,13 +6019,13 @@ inline void FileOptions::set_allocated_go_package(::std::string* go_package) {
|
|
|
| // optional bool cc_generic_services = 16 [default = false];
|
| inline bool FileOptions::has_cc_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000200u) != 0;
|
| + return (_has_bits_[0] & 0x00000080u) != 0;
|
| }
|
| inline void FileOptions::set_has_cc_generic_services() {
|
| - _has_bits_[0] |= 0x00000200u;
|
| + _has_bits_[0] |= 0x00000080u;
|
| }
|
| inline void FileOptions::clear_has_cc_generic_services() {
|
| - _has_bits_[0] &= ~0x00000200u;
|
| + _has_bits_[0] &= ~0x00000080u;
|
| }
|
| inline void FileOptions::clear_cc_generic_services() {
|
| cc_generic_services_ = false;
|
| @@ -6554,13 +6043,13 @@ inline void FileOptions::set_cc_generic_services(bool value) {
|
|
|
| // optional bool java_generic_services = 17 [default = false];
|
| inline bool FileOptions::has_java_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000400u) != 0;
|
| + return (_has_bits_[0] & 0x00000100u) != 0;
|
| }
|
| inline void FileOptions::set_has_java_generic_services() {
|
| - _has_bits_[0] |= 0x00000400u;
|
| + _has_bits_[0] |= 0x00000100u;
|
| }
|
| inline void FileOptions::clear_has_java_generic_services() {
|
| - _has_bits_[0] &= ~0x00000400u;
|
| + _has_bits_[0] &= ~0x00000100u;
|
| }
|
| inline void FileOptions::clear_java_generic_services() {
|
| java_generic_services_ = false;
|
| @@ -6578,13 +6067,13 @@ inline void FileOptions::set_java_generic_services(bool value) {
|
|
|
| // optional bool py_generic_services = 18 [default = false];
|
| inline bool FileOptions::has_py_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000800u) != 0;
|
| + return (_has_bits_[0] & 0x00000200u) != 0;
|
| }
|
| inline void FileOptions::set_has_py_generic_services() {
|
| - _has_bits_[0] |= 0x00000800u;
|
| + _has_bits_[0] |= 0x00000200u;
|
| }
|
| inline void FileOptions::clear_has_py_generic_services() {
|
| - _has_bits_[0] &= ~0x00000800u;
|
| + _has_bits_[0] &= ~0x00000200u;
|
| }
|
| inline void FileOptions::clear_py_generic_services() {
|
| py_generic_services_ = false;
|
| @@ -6602,13 +6091,13 @@ inline void FileOptions::set_py_generic_services(bool value) {
|
|
|
| // optional bool deprecated = 23 [default = false];
|
| inline bool FileOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00001000u) != 0;
|
| + return (_has_bits_[0] & 0x00000400u) != 0;
|
| }
|
| inline void FileOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00001000u;
|
| + _has_bits_[0] |= 0x00000400u;
|
| }
|
| inline void FileOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00001000u;
|
| + _has_bits_[0] &= ~0x00000400u;
|
| }
|
| inline void FileOptions::clear_deprecated() {
|
| deprecated_ = false;
|
| @@ -6626,13 +6115,13 @@ inline void FileOptions::set_deprecated(bool value) {
|
|
|
| // optional bool cc_enable_arenas = 31 [default = false];
|
| inline bool FileOptions::has_cc_enable_arenas() const {
|
| - return (_has_bits_[0] & 0x00002000u) != 0;
|
| + return (_has_bits_[0] & 0x00000800u) != 0;
|
| }
|
| inline void FileOptions::set_has_cc_enable_arenas() {
|
| - _has_bits_[0] |= 0x00002000u;
|
| + _has_bits_[0] |= 0x00000800u;
|
| }
|
| inline void FileOptions::clear_has_cc_enable_arenas() {
|
| - _has_bits_[0] &= ~0x00002000u;
|
| + _has_bits_[0] &= ~0x00000800u;
|
| }
|
| inline void FileOptions::clear_cc_enable_arenas() {
|
| cc_enable_arenas_ = false;
|
| @@ -6650,13 +6139,13 @@ inline void FileOptions::set_cc_enable_arenas(bool value) {
|
|
|
| // optional string objc_class_prefix = 36;
|
| inline bool FileOptions::has_objc_class_prefix() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| + return (_has_bits_[0] & 0x00001000u) != 0;
|
| }
|
| inline void FileOptions::set_has_objc_class_prefix() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| + _has_bits_[0] |= 0x00001000u;
|
| }
|
| inline void FileOptions::clear_has_objc_class_prefix() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| + _has_bits_[0] &= ~0x00001000u;
|
| }
|
| inline void FileOptions::clear_objc_class_prefix() {
|
| objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -6664,7 +6153,7 @@ inline void FileOptions::clear_objc_class_prefix() {
|
| }
|
| inline const ::std::string& FileOptions::objc_class_prefix() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix)
|
| - return objc_class_prefix_.GetNoArena();
|
| + return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_objc_class_prefix(const ::std::string& value) {
|
| set_has_objc_class_prefix();
|
| @@ -6704,13 +6193,13 @@ inline void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_cla
|
|
|
| // optional string csharp_namespace = 37;
|
| inline bool FileOptions::has_csharp_namespace() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| + return (_has_bits_[0] & 0x00002000u) != 0;
|
| }
|
| inline void FileOptions::set_has_csharp_namespace() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| + _has_bits_[0] |= 0x00002000u;
|
| }
|
| inline void FileOptions::clear_has_csharp_namespace() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| + _has_bits_[0] &= ~0x00002000u;
|
| }
|
| inline void FileOptions::clear_csharp_namespace() {
|
| csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -6718,7 +6207,7 @@ inline void FileOptions::clear_csharp_namespace() {
|
| }
|
| inline const ::std::string& FileOptions::csharp_namespace() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace)
|
| - return csharp_namespace_.GetNoArena();
|
| + return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void FileOptions::set_csharp_namespace(const ::std::string& value) {
|
| set_has_csharp_namespace();
|
| @@ -6756,60 +6245,6 @@ inline void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_na
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
|
| }
|
|
|
| -// optional string swift_prefix = 39;
|
| -inline bool FileOptions::has_swift_prefix() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -inline void FileOptions::set_has_swift_prefix() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -inline void FileOptions::clear_has_swift_prefix() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| -}
|
| -inline void FileOptions::clear_swift_prefix() {
|
| - swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_swift_prefix();
|
| -}
|
| -inline const ::std::string& FileOptions::swift_prefix() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix)
|
| - return swift_prefix_.GetNoArena();
|
| -}
|
| -inline void FileOptions::set_swift_prefix(const ::std::string& value) {
|
| - set_has_swift_prefix();
|
| - swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)
|
| -}
|
| -inline void FileOptions::set_swift_prefix(const char* value) {
|
| - set_has_swift_prefix();
|
| - swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
|
| - // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix)
|
| -}
|
| -inline void FileOptions::set_swift_prefix(const char* value, size_t size) {
|
| - set_has_swift_prefix();
|
| - swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| - ::std::string(reinterpret_cast<const char*>(value), size));
|
| - // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix)
|
| -}
|
| -inline ::std::string* FileOptions::mutable_swift_prefix() {
|
| - set_has_swift_prefix();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix)
|
| - return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| -inline ::std::string* FileOptions::release_swift_prefix() {
|
| - // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
|
| - clear_has_swift_prefix();
|
| - return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| -inline void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) {
|
| - if (swift_prefix != NULL) {
|
| - set_has_swift_prefix();
|
| - } else {
|
| - clear_has_swift_prefix();
|
| - }
|
| - swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix)
|
| -}
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| inline int FileOptions::uninterpreted_option_size() const {
|
| return uninterpreted_option_.size();
|
| @@ -7001,13 +6436,13 @@ inline void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value
|
|
|
| // optional bool packed = 2;
|
| inline bool FieldOptions::has_packed() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| }
|
| inline void FieldOptions::set_has_packed() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000002u;
|
| }
|
| inline void FieldOptions::clear_has_packed() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void FieldOptions::clear_packed() {
|
| packed_ = false;
|
| @@ -7025,13 +6460,13 @@ inline void FieldOptions::set_packed(bool value) {
|
|
|
| // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| inline bool FieldOptions::has_jstype() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void FieldOptions::set_has_jstype() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void FieldOptions::clear_has_jstype() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void FieldOptions::clear_jstype() {
|
| jstype_ = 0;
|
| @@ -7152,40 +6587,6 @@ FieldOptions::uninterpreted_option() const {
|
|
|
| // -------------------------------------------------------------------
|
|
|
| -// OneofOptions
|
| -
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -inline int OneofOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -inline void OneofOptions::clear_uninterpreted_option() {
|
| - uninterpreted_option_.Clear();
|
| -}
|
| -inline const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| -inline ::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Mutable(index);
|
| -}
|
| -inline ::google::protobuf::UninterpretedOption* OneofOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| -}
|
| -inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -OneofOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -OneofOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.OneofOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| -
|
| -// -------------------------------------------------------------------
|
| -
|
| // EnumOptions
|
|
|
| // optional bool allow_alias = 2;
|
| @@ -7410,31 +6811,6 @@ inline void MethodOptions::set_deprecated(bool value) {
|
| // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)
|
| }
|
|
|
| -// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
|
| -inline bool MethodOptions::has_idempotency_level() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -inline void MethodOptions::set_has_idempotency_level() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -inline void MethodOptions::clear_has_idempotency_level() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -inline void MethodOptions::clear_idempotency_level() {
|
| - idempotency_level_ = 0;
|
| - clear_has_idempotency_level();
|
| -}
|
| -inline ::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.idempotency_level)
|
| - return static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(idempotency_level_);
|
| -}
|
| -inline void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) {
|
| - assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value));
|
| - set_has_idempotency_level();
|
| - idempotency_level_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level)
|
| -}
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| inline int MethodOptions::uninterpreted_option_size() const {
|
| return uninterpreted_option_.size();
|
| @@ -7485,7 +6861,7 @@ inline void UninterpretedOption_NamePart::clear_name_part() {
|
| }
|
| inline const ::std::string& UninterpretedOption_NamePart::name_part() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part)
|
| - return name_part_.GetNoArena();
|
| + return name_part_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) {
|
| set_has_name_part();
|
| @@ -7583,13 +6959,13 @@ UninterpretedOption::name() const {
|
|
|
| // optional string identifier_value = 3;
|
| inline bool UninterpretedOption::has_identifier_value() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_identifier_value() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| + _has_bits_[0] |= 0x00000002u;
|
| }
|
| inline void UninterpretedOption::clear_has_identifier_value() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| + _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void UninterpretedOption::clear_identifier_value() {
|
| identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -7597,7 +6973,7 @@ inline void UninterpretedOption::clear_identifier_value() {
|
| }
|
| inline const ::std::string& UninterpretedOption::identifier_value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value)
|
| - return identifier_value_.GetNoArena();
|
| + return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_identifier_value(const ::std::string& value) {
|
| set_has_identifier_value();
|
| @@ -7637,13 +7013,13 @@ inline void UninterpretedOption::set_allocated_identifier_value(::std::string* i
|
|
|
| // optional uint64 positive_int_value = 4;
|
| inline bool UninterpretedOption::has_positive_int_value() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_positive_int_value() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void UninterpretedOption::clear_has_positive_int_value() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void UninterpretedOption::clear_positive_int_value() {
|
| positive_int_value_ = GOOGLE_ULONGLONG(0);
|
| @@ -7661,13 +7037,13 @@ inline void UninterpretedOption::set_positive_int_value(::google::protobuf::uint
|
|
|
| // optional int64 negative_int_value = 5;
|
| inline bool UninterpretedOption::has_negative_int_value() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_negative_int_value() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void UninterpretedOption::clear_has_negative_int_value() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void UninterpretedOption::clear_negative_int_value() {
|
| negative_int_value_ = GOOGLE_LONGLONG(0);
|
| @@ -7685,13 +7061,13 @@ inline void UninterpretedOption::set_negative_int_value(::google::protobuf::int6
|
|
|
| // optional double double_value = 6;
|
| inline bool UninterpretedOption::has_double_value() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| + return (_has_bits_[0] & 0x00000010u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_double_value() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| + _has_bits_[0] |= 0x00000010u;
|
| }
|
| inline void UninterpretedOption::clear_has_double_value() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| + _has_bits_[0] &= ~0x00000010u;
|
| }
|
| inline void UninterpretedOption::clear_double_value() {
|
| double_value_ = 0;
|
| @@ -7709,13 +7085,13 @@ inline void UninterpretedOption::set_double_value(double value) {
|
|
|
| // optional bytes string_value = 7;
|
| inline bool UninterpretedOption::has_string_value() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000020u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_string_value() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000020u;
|
| }
|
| inline void UninterpretedOption::clear_has_string_value() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000020u;
|
| }
|
| inline void UninterpretedOption::clear_string_value() {
|
| string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -7723,7 +7099,7 @@ inline void UninterpretedOption::clear_string_value() {
|
| }
|
| inline const ::std::string& UninterpretedOption::string_value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value)
|
| - return string_value_.GetNoArena();
|
| + return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_string_value(const ::std::string& value) {
|
| set_has_string_value();
|
| @@ -7763,13 +7139,13 @@ inline void UninterpretedOption::set_allocated_string_value(::std::string* strin
|
|
|
| // optional string aggregate_value = 8;
|
| inline bool UninterpretedOption::has_aggregate_value() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000040u) != 0;
|
| }
|
| inline void UninterpretedOption::set_has_aggregate_value() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000040u;
|
| }
|
| inline void UninterpretedOption::clear_has_aggregate_value() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000040u;
|
| }
|
| inline void UninterpretedOption::clear_aggregate_value() {
|
| aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -7777,7 +7153,7 @@ inline void UninterpretedOption::clear_aggregate_value() {
|
| }
|
| inline const ::std::string& UninterpretedOption::aggregate_value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value)
|
| - return aggregate_value_.GetNoArena();
|
| + return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void UninterpretedOption::set_aggregate_value(const ::std::string& value) {
|
| set_has_aggregate_value();
|
| @@ -7881,13 +7257,13 @@ SourceCodeInfo_Location::mutable_span() {
|
|
|
| // optional string leading_comments = 3;
|
| inline bool SourceCodeInfo_Location::has_leading_comments() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void SourceCodeInfo_Location::set_has_leading_comments() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_has_leading_comments() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_leading_comments() {
|
| leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -7895,7 +7271,7 @@ inline void SourceCodeInfo_Location::clear_leading_comments() {
|
| }
|
| inline const ::std::string& SourceCodeInfo_Location::leading_comments() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| - return leading_comments_.GetNoArena();
|
| + return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) {
|
| set_has_leading_comments();
|
| @@ -7935,13 +7311,13 @@ inline void SourceCodeInfo_Location::set_allocated_leading_comments(::std::strin
|
|
|
| // optional string trailing_comments = 4;
|
| inline bool SourceCodeInfo_Location::has_trailing_comments() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void SourceCodeInfo_Location::set_has_trailing_comments() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_has_trailing_comments() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void SourceCodeInfo_Location::clear_trailing_comments() {
|
| trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -7949,7 +7325,7 @@ inline void SourceCodeInfo_Location::clear_trailing_comments() {
|
| }
|
| inline const ::std::string& SourceCodeInfo_Location::trailing_comments() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| - return trailing_comments_.GetNoArena();
|
| + return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) {
|
| set_has_trailing_comments();
|
| @@ -8112,13 +7488,13 @@ GeneratedCodeInfo_Annotation::mutable_path() {
|
|
|
| // optional string source_file = 2;
|
| inline bool GeneratedCodeInfo_Annotation::has_source_file() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| + return (_has_bits_[0] & 0x00000002u) != 0;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::set_has_source_file() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| + _has_bits_[0] |= 0x00000002u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_has_source_file() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| + _has_bits_[0] &= ~0x00000002u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_source_file() {
|
| source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| @@ -8126,7 +7502,7 @@ inline void GeneratedCodeInfo_Annotation::clear_source_file() {
|
| }
|
| inline const ::std::string& GeneratedCodeInfo_Annotation::source_file() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
|
| - return source_file_.GetNoArena();
|
| + return source_file_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| inline void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) {
|
| set_has_source_file();
|
| @@ -8166,13 +7542,13 @@ inline void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::strin
|
|
|
| // optional int32 begin = 3;
|
| inline bool GeneratedCodeInfo_Annotation::has_begin() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| + return (_has_bits_[0] & 0x00000004u) != 0;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::set_has_begin() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| + _has_bits_[0] |= 0x00000004u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_has_begin() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| + _has_bits_[0] &= ~0x00000004u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_begin() {
|
| begin_ = 0;
|
| @@ -8190,13 +7566,13 @@ inline void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 va
|
|
|
| // optional int32 end = 4;
|
| inline bool GeneratedCodeInfo_Annotation::has_end() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| + return (_has_bits_[0] & 0x00000008u) != 0;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::set_has_end() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| + _has_bits_[0] |= 0x00000008u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_has_end() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| + _has_bits_[0] &= ~0x00000008u;
|
| }
|
| inline void GeneratedCodeInfo_Annotation::clear_end() {
|
| end_ = 0;
|
| @@ -8293,12 +7669,9 @@ GeneratedCodeInfo::annotation() const {
|
|
|
| // -------------------------------------------------------------------
|
|
|
| -// -------------------------------------------------------------------
|
| -
|
|
|
| // @@protoc_insertion_point(namespace_scope)
|
|
|
| -
|
| } // namespace protobuf
|
| } // namespace google
|
|
|
| @@ -8331,11 +7704,6 @@ template <>
|
| inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::FieldOptions_JSType>() {
|
| return ::google::protobuf::FieldOptions_JSType_descriptor();
|
| }
|
| -template <> struct is_proto_enum< ::google::protobuf::MethodOptions_IdempotencyLevel> : ::google::protobuf::internal::true_type {};
|
| -template <>
|
| -inline const EnumDescriptor* GetEnumDescriptor< ::google::protobuf::MethodOptions_IdempotencyLevel>() {
|
| - return ::google::protobuf::MethodOptions_IdempotencyLevel_descriptor();
|
| -}
|
|
|
| } // namespace protobuf
|
| } // namespace google
|
|
|
Chromium Code Reviews
Issue 2590803003:
Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
