third_party/protobuf/src/google/protobuf/descriptor.pb.h - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Unified Diff: third_party/protobuf/src/google/protobuf/descriptor.pb.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/protobuf/patches/0011-uninline_internal_default_instance.patch ('K') | « third_party/protobuf/src/google/protobuf/descriptor.proto ('k') | third_party/protobuf/src/google/protobuf/descriptor.pb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 92a0a3a763f0ecbadbc09566b36d8539ebd7e17a..257dd0f76801770da5a9b069db135af6a2d129bc 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 < 3000000

+#if GOOGLE_PROTOBUF_VERSION < 3001000

#error This file was generated by a newer version of protoc which is

#error incompatible with your Protocol Buffer headers. Please update

#error your headers.

#endif

-#if 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION

+#if 3001000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION

#error This file was generated by an older version of protoc which is

#error incompatible with your Protocol Buffer headers. Please

#error regenerate this file with a newer version of protoc.

@@ -35,6 +35,7 @@ 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();

void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

@@ -56,6 +57,7 @@ class MessageOptions;

class MethodDescriptorProto;

class MethodOptions;

class OneofDescriptorProto;

+class OneofOptions;

class ServiceDescriptorProto;

class ServiceOptions;

class SourceCodeInfo;

@@ -180,7 +182,7 @@ inline bool FieldOptions_JSType_Parse(

}

// ===================================================================

-class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorSet) */ {

public:

FileDescriptorSet();

virtual ~FileDescriptorSet();

@@ -203,6 +205,8 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message

static const ::google::protobuf::Descriptor* descriptor();

static const FileDescriptorSet& default_instance();

+ static const FileDescriptorSet* internal_default_instance();

void Swap(FileDescriptorSet* other);

// implements Message ----------------------------------------------

@@ -217,18 +221,23 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(FileDescriptorSet* other);

+ void UnsafeMergeFrom(const FileDescriptorSet& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -260,19 +269,21 @@ class LIBPROTOBUF_EXPORT FileDescriptorSet : public ::google::protobuf::Message

private:

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto > file_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static FileDescriptorSet* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<FileDescriptorSet> FileDescriptorSet_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorProto) */ {

public:

FileDescriptorProto();

virtual ~FileDescriptorProto();

@@ -295,6 +306,8 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag

static const ::google::protobuf::Descriptor* descriptor();

static const FileDescriptorProto& default_instance();

+ static const FileDescriptorProto* internal_default_instance();

void Swap(FileDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -309,18 +322,23 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(FileDescriptorProto* other);

+ void UnsafeMergeFrom(const FileDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -492,10 +510,8 @@ class LIBPROTOBUF_EXPORT FileDescriptorProto : public ::google::protobuf::Messag

inline void clear_has_syntax();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

@@ -503,19 +519,23 @@ 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_;

- ::google::protobuf::internal::ArenaStringPtr syntax_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static FileDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<FileDescriptorProto> FileDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ExtensionRange) */ {

public:

DescriptorProto_ExtensionRange();

virtual ~DescriptorProto_ExtensionRange();

@@ -538,6 +558,8 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto

static const ::google::protobuf::Descriptor* descriptor();

static const DescriptorProto_ExtensionRange& default_instance();

+ static const DescriptorProto_ExtensionRange* internal_default_instance();

void Swap(DescriptorProto_ExtensionRange* other);

// implements Message ----------------------------------------------

@@ -552,18 +574,23 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(DescriptorProto_ExtensionRange* other);

+ void UnsafeMergeFrom(const DescriptorProto_ExtensionRange& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -601,20 +628,22 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ExtensionRange : public ::google::proto

inline void clear_has_end();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::int32 start_;

::google::protobuf::int32 end_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static DescriptorProto_ExtensionRange* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto_ExtensionRange> DescriptorProto_ExtensionRange_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ReservedRange) */ {

public:

DescriptorProto_ReservedRange();

virtual ~DescriptorProto_ReservedRange();

@@ -637,6 +666,8 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protob

static const ::google::protobuf::Descriptor* descriptor();

static const DescriptorProto_ReservedRange& default_instance();

+ static const DescriptorProto_ReservedRange* internal_default_instance();

void Swap(DescriptorProto_ReservedRange* other);

// implements Message ----------------------------------------------

@@ -651,18 +682,23 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protob

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(DescriptorProto_ReservedRange* other);

+ void UnsafeMergeFrom(const DescriptorProto_ReservedRange& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -700,20 +736,22 @@ class LIBPROTOBUF_EXPORT DescriptorProto_ReservedRange : public ::google::protob

inline void clear_has_end();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::int32 start_;

::google::protobuf::int32 end_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static DescriptorProto_ReservedRange* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto_ReservedRange> DescriptorProto_ReservedRange_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto) */ {

public:

DescriptorProto();

virtual ~DescriptorProto();

@@ -736,6 +774,8 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const DescriptorProto& default_instance();

+ static const DescriptorProto* internal_default_instance();

void Swap(DescriptorProto* other);

// implements Message ----------------------------------------------

@@ -750,18 +790,23 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(DescriptorProto* other);

+ void UnsafeMergeFrom(const DescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -909,28 +954,30 @@ class LIBPROTOBUF_EXPORT DescriptorProto : public ::google::protobuf::Message {

inline void clear_has_options();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ ::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 void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static DescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto> DescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldDescriptorProto) */ {

public:

FieldDescriptorProto();

virtual ~FieldDescriptorProto();

@@ -953,6 +1000,8 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa

static const ::google::protobuf::Descriptor* descriptor();

static const FieldDescriptorProto& default_instance();

+ static const FieldDescriptorProto* internal_default_instance();

void Swap(FieldDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -967,18 +1016,23 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(FieldDescriptorProto* other);

+ void UnsafeMergeFrom(const FieldDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1201,28 +1255,30 @@ class LIBPROTOBUF_EXPORT FieldDescriptorProto : public ::google::protobuf::Messa

inline void clear_has_options();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ ::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 void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static FieldDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<FieldDescriptorProto> FieldDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.OneofDescriptorProto) */ {

public:

OneofDescriptorProto();

virtual ~OneofDescriptorProto();

@@ -1245,6 +1301,8 @@ class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Messa

static const ::google::protobuf::Descriptor* descriptor();

static const OneofDescriptorProto& default_instance();

+ static const OneofDescriptorProto* internal_default_instance();

void Swap(OneofDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -1259,18 +1317,23 @@ class LIBPROTOBUF_EXPORT OneofDescriptorProto : public ::google::protobuf::Messa

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(OneofDescriptorProto* other);

+ void UnsafeMergeFrom(const OneofDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1298,25 +1361,39 @@ 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:

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::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::internal::ArenaStringPtr name_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ ::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 void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static OneofDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<OneofDescriptorProto> OneofDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto) */ {

public:

EnumDescriptorProto();

virtual ~EnumDescriptorProto();

@@ -1339,6 +1416,8 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag

static const ::google::protobuf::Descriptor* descriptor();

static const EnumDescriptorProto& default_instance();

+ static const EnumDescriptorProto* internal_default_instance();

void Swap(EnumDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -1353,18 +1432,23 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(EnumDescriptorProto* other);

+ void UnsafeMergeFrom(const EnumDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1421,21 +1505,23 @@ class LIBPROTOBUF_EXPORT EnumDescriptorProto : public ::google::protobuf::Messag

inline void clear_has_options();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

- ::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto > value_;

+ ::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::EnumOptions* options_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static EnumDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<EnumDescriptorProto> EnumDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueDescriptorProto) */ {

public:

EnumValueDescriptorProto();

virtual ~EnumValueDescriptorProto();

@@ -1458,6 +1544,8 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M

static const ::google::protobuf::Descriptor* descriptor();

static const EnumValueDescriptorProto& default_instance();

+ static const EnumValueDescriptorProto* internal_default_instance();

void Swap(EnumValueDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -1472,18 +1560,23 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(EnumValueDescriptorProto* other);

+ void UnsafeMergeFrom(const EnumValueDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1537,21 +1630,23 @@ class LIBPROTOBUF_EXPORT EnumValueDescriptorProto : public ::google::protobuf::M

inline void clear_has_options();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::EnumValueOptions* options_;

::google::protobuf::int32 number_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static EnumValueDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<EnumValueDescriptorProto> EnumValueDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceDescriptorProto) */ {

public:

ServiceDescriptorProto();

virtual ~ServiceDescriptorProto();

@@ -1574,6 +1669,8 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes

static const ::google::protobuf::Descriptor* descriptor();

static const ServiceDescriptorProto& default_instance();

+ static const ServiceDescriptorProto* internal_default_instance();

void Swap(ServiceDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -1588,18 +1685,23 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(ServiceDescriptorProto* other);

+ void UnsafeMergeFrom(const ServiceDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1656,21 +1758,23 @@ class LIBPROTOBUF_EXPORT ServiceDescriptorProto : public ::google::protobuf::Mes

inline void clear_has_options();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

- ::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto > method_;

+ ::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::ServiceOptions* options_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static ServiceDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<ServiceDescriptorProto> ServiceDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodDescriptorProto) */ {

public:

MethodDescriptorProto();

virtual ~MethodDescriptorProto();

@@ -1693,6 +1797,8 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess

static const ::google::protobuf::Descriptor* descriptor();

static const MethodDescriptorProto& default_instance();

+ static const MethodDescriptorProto* internal_default_instance();

void Swap(MethodDescriptorProto* other);

// implements Message ----------------------------------------------

@@ -1707,18 +1813,23 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(MethodDescriptorProto* other);

+ void UnsafeMergeFrom(const MethodDescriptorProto& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1809,7 +1920,7 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess

inline void clear_has_server_streaming();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::internal::ArenaStringPtr name_;

::google::protobuf::internal::ArenaStringPtr input_type_;

@@ -1817,16 +1928,18 @@ class LIBPROTOBUF_EXPORT MethodDescriptorProto : public ::google::protobuf::Mess

::google::protobuf::MethodOptions* options_;

bool client_streaming_;

bool server_streaming_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static MethodDescriptorProto* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<MethodDescriptorProto> MethodDescriptorProto_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileOptions) */ {

public:

FileOptions();

virtual ~FileOptions();

@@ -1849,6 +1962,8 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const FileOptions& default_instance();

+ static const FileOptions* internal_default_instance();

void Swap(FileOptions* other);

// implements Message ----------------------------------------------

@@ -1863,18 +1978,23 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(FileOptions* other);

+ void UnsafeMergeFrom(const FileOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -1949,12 +2069,12 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {

bool java_multiple_files() const;

void set_java_multiple_files(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_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_string_check_utf8 = 27 [default = false];

bool has_java_string_check_utf8() const;

@@ -2088,33 +2208,35 @@ class LIBPROTOBUF_EXPORT FileOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

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_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ 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 void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static FileOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<FileOptions> FileOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MessageOptions) */ {

public:

MessageOptions();

virtual ~MessageOptions();

@@ -2137,6 +2259,8 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const MessageOptions& default_instance();

+ static const MessageOptions* internal_default_instance();

void Swap(MessageOptions* other);

// implements Message ----------------------------------------------

@@ -2151,18 +2275,23 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(MessageOptions* other);

+ void UnsafeMergeFrom(const MessageOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2233,23 +2362,25 @@ class LIBPROTOBUF_EXPORT MessageOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static MessageOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<MessageOptions> MessageOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions) */ {

public:

FieldOptions();

virtual ~FieldOptions();

@@ -2272,6 +2403,8 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const FieldOptions& default_instance();

+ static const FieldOptions* internal_default_instance();

void Swap(FieldOptions* other);

// implements Message ----------------------------------------------

@@ -2286,18 +2419,23 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(FieldOptions* other);

+ void UnsafeMergeFrom(const FieldOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2442,25 +2580,131 @@ class LIBPROTOBUF_EXPORT FieldOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static FieldOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<FieldOptions> FieldOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {

+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 const OneofOptions* internal_default_instance();

+ void Swap(OneofOptions* other);

+ // implements Message ----------------------------------------------

+ inline OneofOptions* New() const { return New(NULL); }

+ OneofOptions* New(::google::protobuf::Arena* arena) const;

+ void CopyFrom(const ::google::protobuf::Message& from);

+ void MergeFrom(const ::google::protobuf::Message& from);

+ void CopyFrom(const OneofOptions& from);

+ void MergeFrom(const OneofOptions& from);

+ void Clear();

+ bool IsInitialized() const;

+ size_t ByteSizeLong() const;

+ bool MergePartialFromCodedStream(

+ ::google::protobuf::io::CodedInputStream* input);

+ void SerializeWithCachedSizes(

+ ::google::protobuf::io::CodedOutputStream* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

+ int GetCachedSize() const { return _cached_size_; }

+ private:

+ void SharedCtor();

+ void SharedDtor();

+ void SetCachedSize(int size) const;

+ void InternalSwap(OneofOptions* other);

+ void UnsafeMergeFrom(const OneofOptions& from);

+ private:

+ inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

+ return _internal_metadata_.arena();

+ }

+ inline void* MaybeArenaPtr() const {

+ return _internal_metadata_.raw_arena_ptr();

+ }

+ public:

+ ::google::protobuf::Metadata GetMetadata() const;

+ // 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 void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

+ void InitAsDefaultInstance();

+};

+extern ::google::protobuf::internal::ExplicitlyConstructed<OneofOptions> OneofOptions_default_instance_;

+// -------------------------------------------------------------------

+class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumOptions) */ {

public:

EnumOptions();

virtual ~EnumOptions();

@@ -2483,6 +2727,8 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const EnumOptions& default_instance();

+ static const EnumOptions* internal_default_instance();

void Swap(EnumOptions* other);

// implements Message ----------------------------------------------

@@ -2497,18 +2743,23 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(EnumOptions* other);

+ void UnsafeMergeFrom(const EnumOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2561,21 +2812,23 @@ class LIBPROTOBUF_EXPORT EnumOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;

bool allow_alias_;

bool deprecated_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static EnumOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<EnumOptions> EnumOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueOptions) */ {

public:

EnumValueOptions();

virtual ~EnumValueOptions();

@@ -2598,6 +2851,8 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const EnumValueOptions& default_instance();

+ static const EnumValueOptions* internal_default_instance();

void Swap(EnumValueOptions* other);

// implements Message ----------------------------------------------

@@ -2612,18 +2867,23 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(EnumValueOptions* other);

+ void UnsafeMergeFrom(const EnumValueOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2667,20 +2927,22 @@ class LIBPROTOBUF_EXPORT EnumValueOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;

bool deprecated_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static EnumValueOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<EnumValueOptions> EnumValueOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceOptions) */ {

public:

ServiceOptions();

virtual ~ServiceOptions();

@@ -2703,6 +2965,8 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const ServiceOptions& default_instance();

+ static const ServiceOptions* internal_default_instance();

void Swap(ServiceOptions* other);

// implements Message ----------------------------------------------

@@ -2717,18 +2981,23 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(ServiceOptions* other);

+ void UnsafeMergeFrom(const ServiceOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2772,20 +3041,22 @@ class LIBPROTOBUF_EXPORT ServiceOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;

bool deprecated_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static ServiceOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<ServiceOptions> ServiceOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodOptions) */ {

public:

MethodOptions();

virtual ~MethodOptions();

@@ -2808,6 +3079,8 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const MethodOptions& default_instance();

+ static const MethodOptions* internal_default_instance();

void Swap(MethodOptions* other);

// implements Message ----------------------------------------------

@@ -2822,18 +3095,23 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(MethodOptions* other);

+ void UnsafeMergeFrom(const MethodOptions& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2877,20 +3155,22 @@ class LIBPROTOBUF_EXPORT MethodOptions : public ::google::protobuf::Message {

::google::protobuf::internal::ExtensionSet _extensions_;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption > uninterpreted_option_;

bool deprecated_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static MethodOptions* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<MethodOptions> MethodOptions_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption.NamePart) */ {

public:

UninterpretedOption_NamePart();

virtual ~UninterpretedOption_NamePart();

@@ -2913,6 +3193,8 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu

static const ::google::protobuf::Descriptor* descriptor();

static const UninterpretedOption_NamePart& default_instance();

+ static const UninterpretedOption_NamePart* internal_default_instance();

void Swap(UninterpretedOption_NamePart* other);

// implements Message ----------------------------------------------

@@ -2927,18 +3209,23 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(UninterpretedOption_NamePart* other);

+ void UnsafeMergeFrom(const UninterpretedOption_NamePart& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -2980,24 +3267,26 @@ class LIBPROTOBUF_EXPORT UninterpretedOption_NamePart : public ::google::protobu

inline void set_has_is_extension();

inline void clear_has_is_extension();

- // helper for ByteSize()

- int RequiredFieldsByteSizeFallback() const;

+ // helper for ByteSizeLong()

+ size_t RequiredFieldsByteSizeFallback() const;

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::internal::ArenaStringPtr name_part_;

bool is_extension_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static UninterpretedOption_NamePart* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<UninterpretedOption_NamePart> UninterpretedOption_NamePart_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption) */ {

public:

UninterpretedOption();

virtual ~UninterpretedOption();

@@ -3020,6 +3309,8 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag

static const ::google::protobuf::Descriptor* descriptor();

static const UninterpretedOption& default_instance();

+ static const UninterpretedOption* internal_default_instance();

void Swap(UninterpretedOption* other);

// implements Message ----------------------------------------------

@@ -3034,18 +3325,23 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(UninterpretedOption* other);

+ void UnsafeMergeFrom(const UninterpretedOption& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -3148,25 +3444,27 @@ class LIBPROTOBUF_EXPORT UninterpretedOption : public ::google::protobuf::Messag

inline void clear_has_aggregate_value();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

- ::google::protobuf::internal::ArenaStringPtr string_value_;

- ::google::protobuf::internal::ArenaStringPtr aggregate_value_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static UninterpretedOption* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<UninterpretedOption> UninterpretedOption_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo.Location) */ {

public:

SourceCodeInfo_Location();

virtual ~SourceCodeInfo_Location();

@@ -3189,6 +3487,8 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me

static const ::google::protobuf::Descriptor* descriptor();

static const SourceCodeInfo_Location& default_instance();

+ static const SourceCodeInfo_Location* internal_default_instance();

void Swap(SourceCodeInfo_Location* other);

// implements Message ----------------------------------------------

@@ -3203,18 +3503,23 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(SourceCodeInfo_Location* other);

+ void UnsafeMergeFrom(const SourceCodeInfo_Location& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -3302,25 +3607,27 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo_Location : public ::google::protobuf::Me

inline void clear_has_trailing_comments();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_;

- ::google::protobuf::RepeatedPtrField< ::std::string> leading_detached_comments_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static SourceCodeInfo_Location* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<SourceCodeInfo_Location> SourceCodeInfo_Location_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo) */ {

public:

SourceCodeInfo();

virtual ~SourceCodeInfo();

@@ -3343,6 +3650,8 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {

static const ::google::protobuf::Descriptor* descriptor();

static const SourceCodeInfo& default_instance();

+ static const SourceCodeInfo* internal_default_instance();

void Swap(SourceCodeInfo* other);

// implements Message ----------------------------------------------

@@ -3357,18 +3666,23 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(SourceCodeInfo* other);

+ void UnsafeMergeFrom(const SourceCodeInfo& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -3402,19 +3716,21 @@ class LIBPROTOBUF_EXPORT SourceCodeInfo : public ::google::protobuf::Message {

private:

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location > location_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static SourceCodeInfo* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<SourceCodeInfo> SourceCodeInfo_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo.Annotation) */ {

public:

GeneratedCodeInfo_Annotation();

virtual ~GeneratedCodeInfo_Annotation();

@@ -3437,6 +3753,8 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobu

static const ::google::protobuf::Descriptor* descriptor();

static const GeneratedCodeInfo_Annotation& default_instance();

+ static const GeneratedCodeInfo_Annotation* internal_default_instance();

void Swap(GeneratedCodeInfo_Annotation* other);

// implements Message ----------------------------------------------

@@ -3451,18 +3769,23 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobu

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(GeneratedCodeInfo_Annotation* other);

+ void UnsafeMergeFrom(const GeneratedCodeInfo_Annotation& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -3526,23 +3849,25 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo_Annotation : public ::google::protobu

inline void clear_has_end();

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

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_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static GeneratedCodeInfo_Annotation* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<GeneratedCodeInfo_Annotation> GeneratedCodeInfo_Annotation_default_instance_;

// -------------------------------------------------------------------

-class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message {

+class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo) */ {

public:

GeneratedCodeInfo();

virtual ~GeneratedCodeInfo();

@@ -3565,6 +3890,8 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message

static const ::google::protobuf::Descriptor* descriptor();

static const GeneratedCodeInfo& default_instance();

+ static const GeneratedCodeInfo* internal_default_instance();

void Swap(GeneratedCodeInfo* other);

// implements Message ----------------------------------------------

@@ -3579,18 +3906,23 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message

void Clear();

bool IsInitialized() const;

- int ByteSize() const;

+ size_t ByteSizeLong() const;

bool MergePartialFromCodedStream(

::google::protobuf::io::CodedInputStream* input);

void SerializeWithCachedSizes(

::google::protobuf::io::CodedOutputStream* output) const;

- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(

+ bool deterministic, ::google::protobuf::uint8* output) const;

+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const {

+ return InternalSerializeWithCachedSizesToArray(false, output);

+ }

int GetCachedSize() const { return _cached_size_; }

private:

void SharedCtor();

void SharedDtor();

void SetCachedSize(int size) const;

void InternalSwap(GeneratedCodeInfo* other);

+ void UnsafeMergeFrom(const GeneratedCodeInfo& from);

private:

inline ::google::protobuf::Arena* GetArenaNoVirtual() const {

return _internal_metadata_.arena();

@@ -3624,16 +3956,18 @@ class LIBPROTOBUF_EXPORT GeneratedCodeInfo : public ::google::protobuf::Message

private:

::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;

- ::google::protobuf::uint32 _has_bits_[1];

+ ::google::protobuf::internal::HasBits<1> _has_bits_;

mutable int _cached_size_;

::google::protobuf::RepeatedPtrField< ::google::protobuf::GeneratedCodeInfo_Annotation > annotation_;

- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl();

+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl();

friend void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto();

friend void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto();

void InitAsDefaultInstance();

- static GeneratedCodeInfo* default_instance_;

};

+extern ::google::protobuf::internal::ExplicitlyConstructed<GeneratedCodeInfo> GeneratedCodeInfo_default_instance_;

// ===================================================================

@@ -3672,6 +4006,9 @@ FileDescriptorSet::file() const {

return file_;

}

+inline const FileDescriptorSet* FileDescriptorSet::internal_default_instance() {

+ return &FileDescriptorSet_default_instance_.get();

// -------------------------------------------------------------------

// FileDescriptorProto

@@ -4035,7 +4372,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::FileOptions::internal_default_instance();

}

inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() {

set_has_options();

@@ -4079,7 +4417,8 @@ 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_ : *default_instance_->source_code_info_;

+ return source_code_info_ != NULL ? *source_code_info_

+ : *::google::protobuf::SourceCodeInfo::internal_default_instance();

}

inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() {

set_has_source_code_info();

@@ -4161,6 +4500,9 @@ inline void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) {

// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.syntax)

}

+inline const FileDescriptorProto* FileDescriptorProto::internal_default_instance() {

+ return &FileDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// DescriptorProto_ExtensionRange

@@ -4213,6 +4555,9 @@ inline void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 va

// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end)

}

+inline const DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::internal_default_instance() {

+ return &DescriptorProto_ExtensionRange_default_instance_.get();

// -------------------------------------------------------------------

// DescriptorProto_ReservedRange

@@ -4265,6 +4610,9 @@ inline void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 val

// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end)

}

+inline const DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::internal_default_instance() {

+ return &DescriptorProto_ReservedRange_default_instance_.get();

// -------------------------------------------------------------------

// DescriptorProto

@@ -4519,7 +4867,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::MessageOptions::internal_default_instance();

}

inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() {

set_has_options();

@@ -4632,6 +4981,9 @@ DescriptorProto::mutable_reserved_name() {

return &reserved_name_;

}

+inline const DescriptorProto* DescriptorProto::internal_default_instance() {

+ return &DescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// FieldDescriptorProto

@@ -5020,7 +5372,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::FieldOptions::internal_default_instance();

}

inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() {

set_has_options();

@@ -5048,6 +5401,9 @@ inline void FieldDescriptorProto::set_allocated_options(::google::protobuf::Fiel

// @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.options)

}

+inline const FieldDescriptorProto* FieldDescriptorProto::internal_default_instance() {

+ return &FieldDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// OneofDescriptorProto

@@ -5106,6 +5462,54 @@ 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)

+inline const OneofDescriptorProto* OneofDescriptorProto::internal_default_instance() {

+ return &OneofDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// EnumDescriptorProto

@@ -5210,7 +5614,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::EnumOptions::internal_default_instance();

}

inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() {

set_has_options();

@@ -5238,6 +5643,9 @@ inline void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumO

// @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.options)

}

+inline const EnumDescriptorProto* EnumDescriptorProto::internal_default_instance() {

+ return &EnumDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// EnumValueDescriptorProto

@@ -5336,7 +5744,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::EnumValueOptions::internal_default_instance();

}

inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() {

set_has_options();

@@ -5364,6 +5773,9 @@ inline void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::

// @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.options)

}

+inline const EnumValueDescriptorProto* EnumValueDescriptorProto::internal_default_instance() {

+ return &EnumValueDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// ServiceDescriptorProto

@@ -5468,7 +5880,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::ServiceOptions::internal_default_instance();

}

inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() {

set_has_options();

@@ -5496,6 +5909,9 @@ inline void ServiceDescriptorProto::set_allocated_options(::google::protobuf::Se

// @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.options)

}

+inline const ServiceDescriptorProto* ServiceDescriptorProto::internal_default_instance() {

+ return &ServiceDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// MethodDescriptorProto

@@ -5678,7 +6094,8 @@ 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_ : *default_instance_->options_;

+ return options_ != NULL ? *options_

+ : *::google::protobuf::MethodOptions::internal_default_instance();

}

inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() {

set_has_options();

@@ -5754,6 +6171,9 @@ inline void MethodDescriptorProto::set_server_streaming(bool value) {

// @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)

}

+inline const MethodDescriptorProto* MethodDescriptorProto::internal_default_instance() {

+ return &MethodDescriptorProto_default_instance_.get();

// -------------------------------------------------------------------

// FileOptions

@@ -5890,7 +6310,7 @@ 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 [default = false];

+// optional bool java_generate_equals_and_hash = 20 [deprecated = true];

inline bool FileOptions::has_java_generate_equals_and_hash() const {

return (_has_bits_[0] & 0x00000008u) != 0;

}

@@ -6275,6 +6695,9 @@ FileOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const FileOptions* FileOptions::internal_default_instance() {

+ return &FileOptions_default_instance_.get();

// -------------------------------------------------------------------

// MessageOptions

@@ -6405,6 +6828,9 @@ MessageOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const MessageOptions* MessageOptions::internal_default_instance() {

+ return &MessageOptions_default_instance_.get();

// -------------------------------------------------------------------

// FieldOptions

@@ -6585,6 +7011,46 @@ FieldOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const FieldOptions* FieldOptions::internal_default_instance() {

+ return &FieldOptions_default_instance_.get();

+// -------------------------------------------------------------------

+// 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_;

+inline const OneofOptions* OneofOptions::internal_default_instance() {

+ return &OneofOptions_default_instance_.get();

// -------------------------------------------------------------------

// EnumOptions

@@ -6667,6 +7133,9 @@ EnumOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const EnumOptions* EnumOptions::internal_default_instance() {

+ return &EnumOptions_default_instance_.get();

// -------------------------------------------------------------------

// EnumValueOptions

@@ -6725,6 +7194,9 @@ EnumValueOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const EnumValueOptions* EnumValueOptions::internal_default_instance() {

+ return &EnumValueOptions_default_instance_.get();

// -------------------------------------------------------------------

// ServiceOptions

@@ -6783,6 +7255,9 @@ ServiceOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const ServiceOptions* ServiceOptions::internal_default_instance() {

+ return &ServiceOptions_default_instance_.get();

// -------------------------------------------------------------------

// MethodOptions

@@ -6841,6 +7316,9 @@ MethodOptions::uninterpreted_option() const {

return uninterpreted_option_;

}

+inline const MethodOptions* MethodOptions::internal_default_instance() {

+ return &MethodOptions_default_instance_.get();

// -------------------------------------------------------------------

// UninterpretedOption_NamePart

@@ -6923,6 +7401,9 @@ inline void UninterpretedOption_NamePart::set_is_extension(bool value) {

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension)

}

+inline const UninterpretedOption_NamePart* UninterpretedOption_NamePart::internal_default_instance() {

+ return &UninterpretedOption_NamePart_default_instance_.get();

// -------------------------------------------------------------------

// UninterpretedOption

@@ -7191,6 +7672,9 @@ inline void UninterpretedOption::set_allocated_aggregate_value(::std::string* ag

// @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value)

}

+inline const UninterpretedOption* UninterpretedOption::internal_default_instance() {

+ return &UninterpretedOption_default_instance_.get();

// -------------------------------------------------------------------

// SourceCodeInfo_Location

@@ -7418,6 +7902,9 @@ SourceCodeInfo_Location::mutable_leading_detached_comments() {

return &leading_detached_comments_;

}

+inline const SourceCodeInfo_Location* SourceCodeInfo_Location::internal_default_instance() {

+ return &SourceCodeInfo_Location_default_instance_.get();

// -------------------------------------------------------------------

// SourceCodeInfo

@@ -7452,6 +7939,9 @@ SourceCodeInfo::location() const {

return location_;

}

+inline const SourceCodeInfo* SourceCodeInfo::internal_default_instance() {

+ return &SourceCodeInfo_default_instance_.get();

// -------------------------------------------------------------------

// GeneratedCodeInfo_Annotation

@@ -7588,6 +8078,9 @@ inline void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 valu

// @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end)

}

+inline const GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::internal_default_instance() {

+ return &GeneratedCodeInfo_Annotation_default_instance_.get();

// -------------------------------------------------------------------

// GeneratedCodeInfo

@@ -7622,6 +8115,9 @@ GeneratedCodeInfo::annotation() const {

return annotation_;

}

+inline const GeneratedCodeInfo* GeneratedCodeInfo::internal_default_instance() {

+ return &GeneratedCodeInfo_default_instance_.get();

#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS

// -------------------------------------------------------------------

@@ -7669,6 +8165,8 @@ GeneratedCodeInfo::annotation() const {

// -------------------------------------------------------------------

+// -------------------------------------------------------------------

// @@protoc_insertion_point(namespace_scope)