third_party/protobuf/src/google/protobuf/descriptor.pb.cc - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

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

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years 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

« no previous file with comments | « third_party/protobuf/src/google/protobuf/descriptor.pb.h ('k') | third_party/protobuf/src/google/protobuf/descriptor_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/descriptor.pb.cc

diff --git a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

index 7c72a5a1dfb5b4a0431b559e3bbcd278c8f31473..4d5c4d99d406b1126a97ca7b8ca520be037e9d49 100644

--- a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

+++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

@@ -19,78 +19,113 @@

namespace google {

namespace protobuf {

-class FileDescriptorSetDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FileDescriptorSet> {};

-FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;

-class FileDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FileDescriptorProto> {};

-FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;

-class DescriptorProto_ExtensionRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto_ExtensionRange> {};

-DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;

-class DescriptorProto_ReservedRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto_ReservedRange> {};

-DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;

-class DescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<DescriptorProto> {};

-DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;

-class FieldDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FieldDescriptorProto> {};

-FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;

-class OneofDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<OneofDescriptorProto> {};

-OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;

-class EnumDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<EnumDescriptorProto> {};

-EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;

-class EnumValueDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<EnumValueDescriptorProto> {};

-EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;

-class ServiceDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<ServiceDescriptorProto> {};

-ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;

-class MethodDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<MethodDescriptorProto> {};

-MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;

-class FileOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FileOptions> {};

-FileOptionsDefaultTypeInternal _FileOptions_default_instance_;

-class MessageOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<MessageOptions> {};

-MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;

-class FieldOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FieldOptions> {};

-FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;

-class OneofOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<OneofOptions> {};

-OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;

-class EnumOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<EnumOptions> {};

-EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;

-class EnumValueOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<EnumValueOptions> {};

-EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;

-class ServiceOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<ServiceOptions> {};

-ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;

-class MethodOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<MethodOptions> {};

-MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;

-class UninterpretedOption_NamePartDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<UninterpretedOption_NamePart> {};

-UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;

-class UninterpretedOptionDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<UninterpretedOption> {};

-UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;

-class SourceCodeInfo_LocationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<SourceCodeInfo_Location> {};

-SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;

-class SourceCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<SourceCodeInfo> {};

-SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;

-class GeneratedCodeInfo_AnnotationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<GeneratedCodeInfo_Annotation> {};

-GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;

-class GeneratedCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<GeneratedCodeInfo> {};

-GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;

namespace {

-::google::protobuf::Metadata file_level_metadata[25];

-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[6];

+const ::google::protobuf::Descriptor* FileDescriptorSet_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ FileDescriptorSet_reflection_ = NULL;

+const ::google::protobuf::Descriptor* FileDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ FileDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* DescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ DescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ DescriptorProto_ExtensionRange_reflection_ = NULL;

+const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ DescriptorProto_ReservedRange_reflection_ = NULL;

+const ::google::protobuf::Descriptor* FieldDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ FieldDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor_ = NULL;

+const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor_ = NULL;

+const ::google::protobuf::Descriptor* OneofDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ OneofDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* EnumDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ EnumDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* EnumValueDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ EnumValueDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* ServiceDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ ServiceDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* MethodDescriptorProto_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ MethodDescriptorProto_reflection_ = NULL;

+const ::google::protobuf::Descriptor* FileOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ FileOptions_reflection_ = NULL;

+const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor_ = NULL;

+const ::google::protobuf::Descriptor* MessageOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ MessageOptions_reflection_ = NULL;

+const ::google::protobuf::Descriptor* FieldOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ FieldOptions_reflection_ = NULL;

+const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor_ = NULL;

+const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor_ = NULL;

+const ::google::protobuf::Descriptor* EnumOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ EnumOptions_reflection_ = NULL;

+const ::google::protobuf::Descriptor* EnumValueOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ EnumValueOptions_reflection_ = NULL;

+const ::google::protobuf::Descriptor* ServiceOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ ServiceOptions_reflection_ = NULL;

+const ::google::protobuf::Descriptor* MethodOptions_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ MethodOptions_reflection_ = NULL;

+const ::google::protobuf::Descriptor* UninterpretedOption_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ UninterpretedOption_reflection_ = NULL;

+const ::google::protobuf::Descriptor* UninterpretedOption_NamePart_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ UninterpretedOption_NamePart_reflection_ = NULL;

+const ::google::protobuf::Descriptor* SourceCodeInfo_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ SourceCodeInfo_reflection_ = NULL;

+const ::google::protobuf::Descriptor* SourceCodeInfo_Location_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ SourceCodeInfo_Location_reflection_ = NULL;

+const ::google::protobuf::Descriptor* GeneratedCodeInfo_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ GeneratedCodeInfo_reflection_ = NULL;

+const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation_descriptor_ = NULL;

+const ::google::protobuf::internal::GeneratedMessageReflection*

+ GeneratedCodeInfo_Annotation_reflection_ = NULL;

} // namespace

-const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() GOOGLE_ATTRIBUTE_COLD;

-const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() {

- static const ::google::protobuf::uint32 offsets[] = {

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {

+ protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ const ::google::protobuf::FileDescriptor* file =

+ ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(

+ "google/protobuf/descriptor.proto");

+ GOOGLE_CHECK(file != NULL);

+ FileDescriptorSet_descriptor_ = file->message_type(0);

+ static const int FileDescriptorSet_offsets_[1] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, file_),

- 0,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ FileDescriptorSet_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ FileDescriptorSet_descriptor_,

+ FileDescriptorSet::default_instance_,

+ FileDescriptorSet_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_[0]),

+ -1,

+ sizeof(FileDescriptorSet),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_),

+ -1);

+ FileDescriptorProto_descriptor_ = file->message_type(1);

+ static const int FileDescriptorProto_offsets_[12] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, package_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, dependency_),

@@ -103,38 +138,20 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, source_code_info_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, syntax_),

- 0,

- 1,

- 5,

- 6,

- 7,

- 8,

- 9,

- 10,

- 11,

- 3,

- 4,

- 2,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ FileDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ FileDescriptorProto_descriptor_,

+ FileDescriptorProto::default_instance_,

+ FileDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(FileDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_),

+ -1);

+ DescriptorProto_descriptor_ = file->message_type(2);

+ static const int DescriptorProto_offsets_[10] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, field_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, extension_),

@@ -145,20 +162,52 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_range_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_name_),

- 0,

- 2,

- 3,

- 4,

- 5,

- 6,

- 7,

- 1,

- 8,

- 9,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ DescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ DescriptorProto_descriptor_,

+ DescriptorProto::default_instance_,

+ DescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(DescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_),

+ -1);

+ DescriptorProto_ExtensionRange_descriptor_ = DescriptorProto_descriptor_->nested_type(0);

+ static const int DescriptorProto_ExtensionRange_offsets_[2] = {

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_),

+ };

+ DescriptorProto_ExtensionRange_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ DescriptorProto_ExtensionRange_descriptor_,

+ DescriptorProto_ExtensionRange::default_instance_,

+ DescriptorProto_ExtensionRange_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_[0]),

+ -1,

+ sizeof(DescriptorProto_ExtensionRange),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_),

+ -1);

+ DescriptorProto_ReservedRange_descriptor_ = DescriptorProto_descriptor_->nested_type(1);

+ static const int DescriptorProto_ReservedRange_offsets_[2] = {

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_),

+ };

+ DescriptorProto_ReservedRange_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ DescriptorProto_ReservedRange_descriptor_,

+ DescriptorProto_ReservedRange::default_instance_,

+ DescriptorProto_ReservedRange_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_[0]),

+ -1,

+ sizeof(DescriptorProto_ReservedRange),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_),

+ -1);

+ FieldDescriptorProto_descriptor_ = file->message_type(3);

+ static const int FieldDescriptorProto_offsets_[10] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, number_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, label_),

@@ -169,74 +218,108 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, oneof_index_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, json_name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, options_),

- 0,

- 6,

- 8,

- 9,

- 1,

- 2,

- 3,

- 7,

- 4,

- 5,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ FieldDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ FieldDescriptorProto_descriptor_,

+ FieldDescriptorProto::default_instance_,

+ FieldDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(FieldDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_),

+ -1);

+ FieldDescriptorProto_Type_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(0);

+ FieldDescriptorProto_Label_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(1);

+ OneofDescriptorProto_descriptor_ = file->message_type(4);

+ static const int OneofDescriptorProto_offsets_[1] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, name_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, options_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ OneofDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ OneofDescriptorProto_descriptor_,

+ OneofDescriptorProto::default_instance_,

+ OneofDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(OneofDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_),

+ -1);

+ EnumDescriptorProto_descriptor_ = file->message_type(5);

+ static const int EnumDescriptorProto_offsets_[3] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, value_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, options_),

- 0,

- 2,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ EnumDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ EnumDescriptorProto_descriptor_,

+ EnumDescriptorProto::default_instance_,

+ EnumDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(EnumDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_),

+ -1);

+ EnumValueDescriptorProto_descriptor_ = file->message_type(6);

+ static const int EnumValueDescriptorProto_offsets_[3] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, number_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, options_),

- 0,

- 2,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ EnumValueDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ EnumValueDescriptorProto_descriptor_,

+ EnumValueDescriptorProto::default_instance_,

+ EnumValueDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(EnumValueDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_),

+ -1);

+ ServiceDescriptorProto_descriptor_ = file->message_type(7);

+ static const int ServiceDescriptorProto_offsets_[3] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, method_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, options_),

- 0,

- 2,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ ServiceDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ ServiceDescriptorProto_descriptor_,

+ ServiceDescriptorProto::default_instance_,

+ ServiceDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(ServiceDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_),

+ -1);

+ MethodDescriptorProto_descriptor_ = file->message_type(8);

+ static const int MethodDescriptorProto_offsets_[6] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, input_type_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, output_type_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, client_streaming_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, server_streaming_),

- 0,

- 1,

- 2,

- 3,

- 4,

- 5,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ MethodDescriptorProto_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ MethodDescriptorProto_descriptor_,

+ MethodDescriptorProto::default_instance_,

+ MethodDescriptorProto_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_[0]),

+ -1,

+ sizeof(MethodDescriptorProto),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_),

+ -1);

+ FileOptions_descriptor_ = file->message_type(9);

+ static const int FileOptions_offsets_[15] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_package_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_outer_classname_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_multiple_files_),

@@ -251,42 +334,41 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, cc_enable_arenas_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, objc_class_prefix_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, csharp_namespace_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, swift_prefix_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_),

- 0,

- 1,

- 6,

- 7,

- 8,

- 14,

- 2,

- 9,

- 10,

- 11,

- 12,

- 13,

- 3,

- 4,

- 5,

- 15,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ FileOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ FileOptions_descriptor_,

+ FileOptions::default_instance_,

+ FileOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_),

+ sizeof(FileOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_),

+ -1);

+ FileOptions_OptimizeMode_descriptor_ = FileOptions_descriptor_->enum_type(0);

+ MessageOptions_descriptor_ = file->message_type(10);

+ static const int MessageOptions_offsets_[5] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, message_set_wire_format_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, no_standard_descriptor_accessor_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, deprecated_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, map_entry_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, uninterpreted_option_),

- 0,

- 1,

- 2,

- 3,

- 4,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ MessageOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ MessageOptions_descriptor_,

+ MessageOptions::default_instance_,

+ MessageOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_),

+ sizeof(MessageOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_),

+ -1);

+ FieldOptions_descriptor_ = file->message_type(11);

+ static const int FieldOptions_offsets_[7] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, ctype_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, packed_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, jstype_),

@@ -294,67 +376,87 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, deprecated_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, weak_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, uninterpreted_option_),

- 0,

- 2,

- 1,

- 3,

- 4,

- 5,

- 6,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _extensions_),

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, uninterpreted_option_),

- 0,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ FieldOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ FieldOptions_descriptor_,

+ FieldOptions::default_instance_,

+ FieldOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_),

+ sizeof(FieldOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_),

+ -1);

+ FieldOptions_CType_descriptor_ = FieldOptions_descriptor_->enum_type(0);

+ FieldOptions_JSType_descriptor_ = FieldOptions_descriptor_->enum_type(1);

+ EnumOptions_descriptor_ = file->message_type(12);

+ static const int EnumOptions_offsets_[3] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, allow_alias_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, deprecated_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, uninterpreted_option_),

- 0,

- 1,

- 2,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ EnumOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ EnumOptions_descriptor_,

+ EnumOptions::default_instance_,

+ EnumOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_),

+ sizeof(EnumOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_),

+ -1);

+ EnumValueOptions_descriptor_ = file->message_type(13);

+ static const int EnumValueOptions_offsets_[2] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, deprecated_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, uninterpreted_option_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ EnumValueOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ EnumValueOptions_descriptor_,

+ EnumValueOptions::default_instance_,

+ EnumValueOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_),

+ sizeof(EnumValueOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_),

+ -1);

+ ServiceOptions_descriptor_ = file->message_type(14);

+ static const int ServiceOptions_offsets_[2] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, deprecated_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, uninterpreted_option_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_),

- ~0u, // no _oneof_case_

+ };

+ ServiceOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ ServiceOptions_descriptor_,

+ ServiceOptions::default_instance_,

+ ServiceOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_),

+ sizeof(ServiceOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_),

+ -1);

+ MethodOptions_descriptor_ = file->message_type(15);

+ static const int MethodOptions_offsets_[2] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, deprecated_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, idempotency_level_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, uninterpreted_option_),

- 0,

- 1,

- 2,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_),

- 0,

- 1,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ MethodOptions_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ MethodOptions_descriptor_,

+ MethodOptions::default_instance_,

+ MethodOptions_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_[0]),

+ -1,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_),

+ sizeof(MethodOptions),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_),

+ -1);

+ UninterpretedOption_descriptor_ = file->message_type(16);

+ static const int UninterpretedOption_offsets_[7] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, identifier_value_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, positive_int_value_),

@@ -362,569 +464,421 @@ const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescripto

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, double_value_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, string_value_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, aggregate_value_),

- 6,

- 0,

- 3,

- 4,

- 5,

- 1,

- 2,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ UninterpretedOption_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ UninterpretedOption_descriptor_,

+ UninterpretedOption::default_instance_,

+ UninterpretedOption_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_[0]),

+ -1,

+ sizeof(UninterpretedOption),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_),

+ -1);

+ UninterpretedOption_NamePart_descriptor_ = UninterpretedOption_descriptor_->nested_type(0);

+ static const int UninterpretedOption_NamePart_offsets_[2] = {

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_),

+ };

+ UninterpretedOption_NamePart_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ UninterpretedOption_NamePart_descriptor_,

+ UninterpretedOption_NamePart::default_instance_,

+ UninterpretedOption_NamePart_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_[0]),

+ -1,

+ sizeof(UninterpretedOption_NamePart),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_),

+ -1);

+ SourceCodeInfo_descriptor_ = file->message_type(17);

+ static const int SourceCodeInfo_offsets_[1] = {

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_),

+ };

+ SourceCodeInfo_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ SourceCodeInfo_descriptor_,

+ SourceCodeInfo::default_instance_,

+ SourceCodeInfo_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_[0]),

+ -1,

+ sizeof(SourceCodeInfo),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_),

+ -1);

+ SourceCodeInfo_Location_descriptor_ = SourceCodeInfo_descriptor_->nested_type(0);

+ static const int SourceCodeInfo_Location_offsets_[5] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, path_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, span_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_comments_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, trailing_comments_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_detached_comments_),

- 2,

- 3,

- 0,

- 1,

- 4,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_),

- 0,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

+ };

+ SourceCodeInfo_Location_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ SourceCodeInfo_Location_descriptor_,

+ SourceCodeInfo_Location::default_instance_,

+ SourceCodeInfo_Location_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_[0]),

+ -1,

+ sizeof(SourceCodeInfo_Location),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_),

+ -1);

+ GeneratedCodeInfo_descriptor_ = file->message_type(18);

+ static const int GeneratedCodeInfo_offsets_[1] = {

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_),

+ };

+ GeneratedCodeInfo_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ GeneratedCodeInfo_descriptor_,

+ GeneratedCodeInfo::default_instance_,

+ GeneratedCodeInfo_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_[0]),

+ -1,

+ sizeof(GeneratedCodeInfo),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_),

+ -1);

+ GeneratedCodeInfo_Annotation_descriptor_ = GeneratedCodeInfo_descriptor_->nested_type(0);

+ static const int GeneratedCodeInfo_Annotation_offsets_[4] = {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, path_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, source_file_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, begin_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, end_),

- 3,

- 0,

- 1,

- 2,

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_),

- ~0u, // no _extensions_

- ~0u, // no _oneof_case_

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_),

- 0,

};

- return offsets;

-static const ::google::protobuf::internal::MigrationSchema schemas[] = {

- { 0, 5, sizeof(FileDescriptorSet)},

- { 6, 22, sizeof(FileDescriptorProto)},

- { 34, 40, sizeof(DescriptorProto_ExtensionRange)},

- { 42, 48, sizeof(DescriptorProto_ReservedRange)},

- { 50, 64, sizeof(DescriptorProto)},

- { 74, 88, sizeof(FieldDescriptorProto)},

- { 98, 104, sizeof(OneofDescriptorProto)},

- { 106, 113, sizeof(EnumDescriptorProto)},

- { 116, 123, sizeof(EnumValueDescriptorProto)},

- { 126, 133, sizeof(ServiceDescriptorProto)},

- { 136, 146, sizeof(MethodDescriptorProto)},

- { 152, 172, sizeof(FileOptions)},

- { 188, 197, sizeof(MessageOptions)},

- { 202, 213, sizeof(FieldOptions)},

- { 220, 225, sizeof(OneofOptions)},

- { 226, 233, sizeof(EnumOptions)},

- { 236, 242, sizeof(EnumValueOptions)},

- { 244, 250, sizeof(ServiceOptions)},

- { 252, 259, sizeof(MethodOptions)},

- { 262, 268, sizeof(UninterpretedOption_NamePart)},

- { 270, 281, sizeof(UninterpretedOption)},

- { 288, 297, sizeof(SourceCodeInfo_Location)},

- { 302, 307, sizeof(SourceCodeInfo)},

- { 308, 316, sizeof(GeneratedCodeInfo_Annotation)},

- { 320, 325, sizeof(GeneratedCodeInfo)},

-};

-static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = {

- {reinterpret_cast<const ::google::protobuf::Message*>(&_FileDescriptorSet_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_FileDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_DescriptorProto_ExtensionRange_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_DescriptorProto_ReservedRange_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_DescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_FieldDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_OneofDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_EnumDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_EnumValueDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_ServiceDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_MethodDescriptorProto_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_FileOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_MessageOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_FieldOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_OneofOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_EnumOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_EnumValueOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_ServiceOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_MethodOptions_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_UninterpretedOption_NamePart_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_UninterpretedOption_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_SourceCodeInfo_Location_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_SourceCodeInfo_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_GeneratedCodeInfo_Annotation_default_instance_), NULL},

- {reinterpret_cast<const ::google::protobuf::Message*>(&_GeneratedCodeInfo_default_instance_), NULL},

-};

+ GeneratedCodeInfo_Annotation_reflection_ =

+ ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

+ GeneratedCodeInfo_Annotation_descriptor_,

+ GeneratedCodeInfo_Annotation::default_instance_,

+ GeneratedCodeInfo_Annotation_offsets_,

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_[0]),

+ -1,

+ sizeof(GeneratedCodeInfo_Annotation),

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_),

+ -1);

namespace {

-void protobuf_AssignDescriptors() {

- protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

- ::google::protobuf::MessageFactory* factory = NULL;

- AssignDescriptors(

- "google/protobuf/descriptor.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto(), factory,

- file_level_metadata, file_level_enum_descriptors, NULL);

-void protobuf_AssignDescriptorsOnce() {

- static GOOGLE_PROTOBUF_DECLARE_ONCE(once);

- ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors);

+GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);

+inline void protobuf_AssignDescriptorsOnce() {

+ ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,

+ &protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto);

}

-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD;

void protobuf_RegisterTypes(const ::std::string&) {

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 25);

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ FileDescriptorSet_descriptor_, &FileDescriptorSet::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ FileDescriptorProto_descriptor_, &FileDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ DescriptorProto_descriptor_, &DescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ DescriptorProto_ExtensionRange_descriptor_, &DescriptorProto_ExtensionRange::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ DescriptorProto_ReservedRange_descriptor_, &DescriptorProto_ReservedRange::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ FieldDescriptorProto_descriptor_, &FieldDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ OneofDescriptorProto_descriptor_, &OneofDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ EnumDescriptorProto_descriptor_, &EnumDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ EnumValueDescriptorProto_descriptor_, &EnumValueDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ ServiceDescriptorProto_descriptor_, &ServiceDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ MethodDescriptorProto_descriptor_, &MethodDescriptorProto::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ FileOptions_descriptor_, &FileOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ MessageOptions_descriptor_, &MessageOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ FieldOptions_descriptor_, &FieldOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ EnumOptions_descriptor_, &EnumOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ EnumValueOptions_descriptor_, &EnumValueOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ ServiceOptions_descriptor_, &ServiceOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ MethodOptions_descriptor_, &MethodOptions::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ UninterpretedOption_descriptor_, &UninterpretedOption::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ UninterpretedOption_NamePart_descriptor_, &UninterpretedOption_NamePart::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ SourceCodeInfo_descriptor_, &SourceCodeInfo::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ SourceCodeInfo_Location_descriptor_, &SourceCodeInfo_Location::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ GeneratedCodeInfo_descriptor_, &GeneratedCodeInfo::default_instance());

+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

+ GeneratedCodeInfo_Annotation_descriptor_, &GeneratedCodeInfo_Annotation::default_instance());

}

} // namespace

void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto() {

- _FileDescriptorSet_default_instance_.Shutdown();

- delete file_level_metadata[0].reflection;

- _FileDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[1].reflection;

- _DescriptorProto_ExtensionRange_default_instance_.Shutdown();

- delete file_level_metadata[2].reflection;

- _DescriptorProto_ReservedRange_default_instance_.Shutdown();

- delete file_level_metadata[3].reflection;

- _DescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[4].reflection;

- _FieldDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[5].reflection;

- _OneofDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[6].reflection;

- _EnumDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[7].reflection;

- _EnumValueDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[8].reflection;

- _ServiceDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[9].reflection;

- _MethodDescriptorProto_default_instance_.Shutdown();

- delete file_level_metadata[10].reflection;

- _FileOptions_default_instance_.Shutdown();

- delete file_level_metadata[11].reflection;

- _MessageOptions_default_instance_.Shutdown();

- delete file_level_metadata[12].reflection;

- _FieldOptions_default_instance_.Shutdown();

- delete file_level_metadata[13].reflection;

- _OneofOptions_default_instance_.Shutdown();

- delete file_level_metadata[14].reflection;

- _EnumOptions_default_instance_.Shutdown();

- delete file_level_metadata[15].reflection;

- _EnumValueOptions_default_instance_.Shutdown();

- delete file_level_metadata[16].reflection;

- _ServiceOptions_default_instance_.Shutdown();

- delete file_level_metadata[17].reflection;

- _MethodOptions_default_instance_.Shutdown();

- delete file_level_metadata[18].reflection;

- _UninterpretedOption_NamePart_default_instance_.Shutdown();

- delete file_level_metadata[19].reflection;

- _UninterpretedOption_default_instance_.Shutdown();

- delete file_level_metadata[20].reflection;

- _SourceCodeInfo_Location_default_instance_.Shutdown();

- delete file_level_metadata[21].reflection;

- _SourceCodeInfo_default_instance_.Shutdown();

- delete file_level_metadata[22].reflection;

- _GeneratedCodeInfo_Annotation_default_instance_.Shutdown();

- delete file_level_metadata[23].reflection;

- _GeneratedCodeInfo_default_instance_.Shutdown();

- delete file_level_metadata[24].reflection;

-void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl() {

+ delete FileDescriptorSet::default_instance_;

+ delete FileDescriptorSet_reflection_;

+ delete FileDescriptorProto::default_instance_;

+ delete FileDescriptorProto_reflection_;

+ delete DescriptorProto::default_instance_;

+ delete DescriptorProto_reflection_;

+ delete DescriptorProto_ExtensionRange::default_instance_;

+ delete DescriptorProto_ExtensionRange_reflection_;

+ delete DescriptorProto_ReservedRange::default_instance_;

+ delete DescriptorProto_ReservedRange_reflection_;

+ delete FieldDescriptorProto::default_instance_;

+ delete FieldDescriptorProto_reflection_;

+ delete OneofDescriptorProto::default_instance_;

+ delete OneofDescriptorProto_reflection_;

+ delete EnumDescriptorProto::default_instance_;

+ delete EnumDescriptorProto_reflection_;

+ delete EnumValueDescriptorProto::default_instance_;

+ delete EnumValueDescriptorProto_reflection_;

+ delete ServiceDescriptorProto::default_instance_;

+ delete ServiceDescriptorProto_reflection_;

+ delete MethodDescriptorProto::default_instance_;

+ delete MethodDescriptorProto_reflection_;

+ delete FileOptions::default_instance_;

+ delete FileOptions_reflection_;

+ delete MessageOptions::default_instance_;

+ delete MessageOptions_reflection_;

+ delete FieldOptions::default_instance_;

+ delete FieldOptions_reflection_;

+ delete EnumOptions::default_instance_;

+ delete EnumOptions_reflection_;

+ delete EnumValueOptions::default_instance_;

+ delete EnumValueOptions_reflection_;

+ delete ServiceOptions::default_instance_;

+ delete ServiceOptions_reflection_;

+ delete MethodOptions::default_instance_;

+ delete MethodOptions_reflection_;

+ delete UninterpretedOption::default_instance_;

+ delete UninterpretedOption_reflection_;

+ delete UninterpretedOption_NamePart::default_instance_;

+ delete UninterpretedOption_NamePart_reflection_;

+ delete SourceCodeInfo::default_instance_;

+ delete SourceCodeInfo_reflection_;

+ delete SourceCodeInfo_Location::default_instance_;

+ delete SourceCodeInfo_Location_reflection_;

+ delete GeneratedCodeInfo::default_instance_;

+ delete GeneratedCodeInfo_reflection_;

+ delete GeneratedCodeInfo_Annotation::default_instance_;

+ delete GeneratedCodeInfo_Annotation_reflection_;

+void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {

+ static bool already_here = false;

+ if (already_here) return;

+ already_here = true;

GOOGLE_PROTOBUF_VERIFY_VERSION;

- ::google::protobuf::internal::InitProtobufDefaults();

- _FileDescriptorSet_default_instance_.DefaultConstruct();

- _FileDescriptorProto_default_instance_.DefaultConstruct();

- _DescriptorProto_ExtensionRange_default_instance_.DefaultConstruct();

- _DescriptorProto_ReservedRange_default_instance_.DefaultConstruct();

- _DescriptorProto_default_instance_.DefaultConstruct();

- _FieldDescriptorProto_default_instance_.DefaultConstruct();

- _OneofDescriptorProto_default_instance_.DefaultConstruct();

- _EnumDescriptorProto_default_instance_.DefaultConstruct();

- _EnumValueDescriptorProto_default_instance_.DefaultConstruct();

- _ServiceDescriptorProto_default_instance_.DefaultConstruct();

- _MethodDescriptorProto_default_instance_.DefaultConstruct();

- _FileOptions_default_instance_.DefaultConstruct();

- _MessageOptions_default_instance_.DefaultConstruct();

- _FieldOptions_default_instance_.DefaultConstruct();

- _OneofOptions_default_instance_.DefaultConstruct();

- _EnumOptions_default_instance_.DefaultConstruct();

- _EnumValueOptions_default_instance_.DefaultConstruct();

- _ServiceOptions_default_instance_.DefaultConstruct();

- _MethodOptions_default_instance_.DefaultConstruct();

- _UninterpretedOption_NamePart_default_instance_.DefaultConstruct();

- _UninterpretedOption_default_instance_.DefaultConstruct();

- _SourceCodeInfo_Location_default_instance_.DefaultConstruct();

- _SourceCodeInfo_default_instance_.DefaultConstruct();

- _GeneratedCodeInfo_Annotation_default_instance_.DefaultConstruct();

- _GeneratedCodeInfo_default_instance_.DefaultConstruct();

- _FileDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FileOptions*>(

- ::google::protobuf::FileOptions::internal_default_instance());

- _FileDescriptorProto_default_instance_.get_mutable()->source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>(

- ::google::protobuf::SourceCodeInfo::internal_default_instance());

- _DescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MessageOptions*>(

- ::google::protobuf::MessageOptions::internal_default_instance());

- _FieldDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FieldOptions*>(

- ::google::protobuf::FieldOptions::internal_default_instance());

- _OneofDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::OneofOptions*>(

- ::google::protobuf::OneofOptions::internal_default_instance());

- _EnumDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumOptions*>(

- ::google::protobuf::EnumOptions::internal_default_instance());

- _EnumValueDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumValueOptions*>(

- ::google::protobuf::EnumValueOptions::internal_default_instance());

- _ServiceDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::ServiceOptions*>(

- ::google::protobuf::ServiceOptions::internal_default_instance());

- _MethodDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MethodOptions*>(

- ::google::protobuf::MethodOptions::internal_default_instance());

-void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto() {

- static GOOGLE_PROTOBUF_DECLARE_ONCE(once);

- ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl);

-void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- static const char descriptor[] = {

- "\n google/protobuf/descriptor.proto\022\017goog"

- "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file"

- "\030\001 \003(\0132$.google.protobuf.FileDescriptorP"

- "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001"

- "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022"

- "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen"

- "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog"

- "le.protobuf.DescriptorProto\0227\n\tenum_type"

- "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP"

- "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf."

- "ServiceDescriptorProto\0228\n\textension\030\007 \003("

- "\0132%.google.protobuf.FieldDescriptorProto"

- "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File"

- "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog"

- "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001"

- "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005"

- "field\030\002 \003(\0132%.google.protobuf.FieldDescr"

- "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p"

- "rotobuf.FieldDescriptorProto\0225\n\013nested_t"

- "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr"

- "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf"

- ".EnumDescriptorProto\022H\n\017extension_range\030"

- "\005 \003(\0132/.google.protobuf.DescriptorProto."

- "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo"

- "gle.protobuf.OneofDescriptorProto\0220\n\007opt"

- "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti"

- "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro"

- "tobuf.DescriptorProto.ReservedRange\022\025\n\rr"

- "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005"

- "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang"

- "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD"

- "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003"

- " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi"

- "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*"

- ".google.protobuf.FieldDescriptorProto.Ty"

- "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022"

- "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t "

- "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132"

- "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022"

- "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE"

- "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020"

- "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n"

- "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR"

- "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022"

- "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_"

- "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI"

- "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE"

- "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE"

- "L_REPEATED\020\003\"T\n\024OneofDescriptorProto\022\014\n\004"

- "name\030\001 \001(\t\022.\n\007options\030\002 \001(\0132\035.google.pro"

- "tobuf.OneofOptions\"\214\001\n\023EnumDescriptorPro"

- "to\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google"

- ".protobuf.EnumValueDescriptorProto\022-\n\007op"

- "tions\030\003 \001(\0132\034.google.protobuf.EnumOption"

- "s\"l\n\030EnumValueDescriptorProto\022\014\n\004name\030\001 "

- "\001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.g"

- "oogle.protobuf.EnumValueOptions\"\220\001\n\026Serv"

- "iceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006meth"

- "od\030\002 \003(\0132&.google.protobuf.MethodDescrip"

- "torProto\0220\n\007options\030\003 \001(\0132\037.google.proto"

- "buf.ServiceOptions\"\301\001\n\025MethodDescriptorP"

- "roto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023"

- "\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g"

- "oogle.protobuf.MethodOptions\022\037\n\020client_s"

- "treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin"

- "g\030\006 \001(\010:\005false\"\232\005\n\013FileOptions\022\024\n\014java_p"

- "ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001"

- "(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)"

- "\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030"

- "\001\022%\n\026java_string_check_utf8\030\033 \001(\010:\005false"

- "\022F\n\014optimize_for\030\t \001(\0162).google.protobuf"

- ".FileOptions.OptimizeMode:\005SPEED\022\022\n\ngo_p"

- "ackage\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001("

- "\010:\005false\022$\n\025java_generic_services\030\021 \001(\010:"

- "\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal"

- "se\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enab"

- "le_arenas\030\037 \001(\010:\005false\022\031\n\021objc_class_pre"

- "fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014s"

- "wift_prefix\030\' \001(\t\022C\n\024uninterpreted_optio"

- "n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted"

- "Option\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCOD"

- "E_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010"

- "&\020\'\"\354\001\n\016MessageOptions\022&\n\027message_set_wi"

- "re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de"

- "scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec"

- "ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024"

- "uninterpreted_option\030\347\007 \003(\0132$.google.pro"

- "tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\010"

- "\020\t\"\236\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.goo"

- "gle.protobuf.FieldOptions.CType:\006STRING\022"

- "\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google"

- ".protobuf.FieldOptions.JSType:\tJS_NORMAL"

- "\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001("

- "\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninter"

- "preted_option\030\347\007 \003(\0132$.google.protobuf.U"

- "ninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000\022"

- "\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n"

- "\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER"

- "\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014OneofOptions\022C\n\024u"

- "ninterpreted_option\030\347\007 \003(\0132$.google.prot"

- "obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013"

- "EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr"

- "ecated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opt"

- "ion\030\347\007 \003(\0132$.google.protobuf.Uninterpret"

- "edOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022"

- "\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpre"

- "ted_option\030\347\007 \003(\0132$.google.protobuf.Unin"

- "terpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpt"

- "ions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024unint"

- "erpreted_option\030\347\007 \003(\0132$.google.protobuf"

- ".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMeth"

- "odOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021"

- "idempotency_level\030\" \001(\0162/.google.protobu"

- "f.MethodOptions.IdempotencyLevel:\023IDEMPO"

- "TENCY_UNKNOWN\022C\n\024uninterpreted_option\030\347\007"

- " \003(\0132$.google.protobuf.UninterpretedOpti"

- "on\"P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UN"

- "KNOWN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTE"

- "NT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022"

- ";\n\004name\030\002 \003(\0132-.google.protobuf.Uninterp"

- "retedOption.NamePart\022\030\n\020identifier_value"

- "\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022ne"

- "gative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006"

- " \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_"

- "value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002"

- "(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeI"

- "nfo\022:\n\010location\030\001 \003(\0132(.google.protobuf."

- "SourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004"

- "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead"

- "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030"

- "\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t"

- "\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003"

- "(\0132-.google.protobuf.GeneratedCodeInfo.A"

- "nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020"

- "\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n"

- "\003end\030\004 \001(\005B\214\001\n\023com.google.protobufB\020Desc"

- "riptorProtosH\001Z>github.com/golang/protob"

- "uf/protoc-gen-go/descriptor;descriptor\242\002"

- "\003GPB\252\002\032Google.Protobuf.Reflection"

- };

::google::protobuf::DescriptorPool::InternalAddGeneratedFile(

- descriptor, 5553);

+ "\n google/protobuf/descriptor.proto\022\017goog"

+ "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file"

+ "\030\001 \003(\0132$.google.protobuf.FileDescriptorP"

+ "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001"

+ "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022"

+ "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen"

+ "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog"

+ "le.protobuf.DescriptorProto\0227\n\tenum_type"

+ "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP"

+ "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf."

+ "ServiceDescriptorProto\0228\n\textension\030\007 \003("

+ "\0132%.google.protobuf.FieldDescriptorProto"

+ "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File"

+ "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog"

+ "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001"

+ "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005"

+ "field\030\002 \003(\0132%.google.protobuf.FieldDescr"

+ "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p"

+ "rotobuf.FieldDescriptorProto\0225\n\013nested_t"

+ "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr"

+ "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf"

+ ".EnumDescriptorProto\022H\n\017extension_range\030"

+ "\005 \003(\0132/.google.protobuf.DescriptorProto."

+ "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo"

+ "gle.protobuf.OneofDescriptorProto\0220\n\007opt"

+ "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti"

+ "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro"

+ "tobuf.DescriptorProto.ReservedRange\022\025\n\rr"

+ "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005"

+ "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang"

+ "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD"

+ "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003"

+ " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi"

+ "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*"

+ ".google.protobuf.FieldDescriptorProto.Ty"

+ "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022"

+ "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t "

+ "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132"

+ "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022"

+ "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE"

+ "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020"

+ "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n"

+ "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR"

+ "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022"

+ "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_"

+ "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI"

+ "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE"

+ "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE"

+ "L_REPEATED\020\003\"$\n\024OneofDescriptorProto\022\014\n\004"

+ "name\030\001 \001(\t\"\214\001\n\023EnumDescriptorProto\022\014\n\004na"

+ "me\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google.protobu"

+ "f.EnumValueDescriptorProto\022-\n\007options\030\003 "

+ "\001(\0132\034.google.protobuf.EnumOptions\"l\n\030Enu"

+ "mValueDescriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006n"

+ "umber\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.google.pr"

+ "otobuf.EnumValueOptions\"\220\001\n\026ServiceDescr"

+ "iptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006method\030\002 \003(\013"

+ "2&.google.protobuf.MethodDescriptorProto"

+ "\0220\n\007options\030\003 \001(\0132\037.google.protobuf.Serv"

+ "iceOptions\"\301\001\n\025MethodDescriptorProto\022\014\n\004"

+ "name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023\n\013output"

+ "_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.google.pr"

+ "otobuf.MethodOptions\022\037\n\020client_streaming"

+ "\030\005 \001(\010:\005false\022\037\n\020server_streaming\030\006 \001(\010:"

+ "\005false\"\207\005\n\013FileOptions\022\024\n\014java_package\030\001"

+ " \001(\t\022\034\n\024java_outer_classname\030\010 \001(\t\022\"\n\023ja"

+ "va_multiple_files\030\n \001(\010:\005false\022,\n\035java_g"

+ "enerate_equals_and_hash\030\024 \001(\010:\005false\022%\n\026"

+ "java_string_check_utf8\030\033 \001(\010:\005false\022F\n\014o"

+ "ptimize_for\030\t \001(\0162).google.protobuf.File"

+ "Options.OptimizeMode:\005SPEED\022\022\n\ngo_packag"

+ "e\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(\010:\005fa"

+ "lse\022$\n\025java_generic_services\030\021 \001(\010:\005fals"

+ "e\022\"\n\023py_generic_services\030\022 \001(\010:\005false\022\031\n"

+ "\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enable_ar"

+ "enas\030\037 \001(\010:\005false\022\031\n\021objc_class_prefix\030$"

+ " \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024uninte"

+ "rpreted_option\030\347\007 \003(\0132$.google.protobuf."

+ "UninterpretedOption\":\n\014OptimizeMode\022\t\n\005S"

+ "PEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*"

+ "\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\346\001\n\016MessageOptions\022&\n\027m"

+ "essage_set_wire_format\030\001 \001(\010:\005false\022.\n\037n"

+ "o_standard_descriptor_accessor\030\002 \001(\010:\005fa"

+ "lse\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tmap_en"

+ "try\030\007 \001(\010\022C\n\024uninterpreted_option\030\347\007 \003(\013"

+ "2$.google.protobuf.UninterpretedOption*\t"

+ "\010\350\007\020\200\200\200\200\002\"\230\003\n\014FieldOptions\022:\n\005ctype\030\001 \001("

+ "\0162#.google.protobuf.FieldOptions.CType:\006"

+ "STRING\022\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$"

+ ".google.protobuf.FieldOptions.JSType:\tJS"

+ "_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecat"

+ "ed\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024"

+ "uninterpreted_option\030\347\007 \003(\0132$.google.pro"

+ "tobuf.UninterpretedOption\"/\n\005CType\022\n\n\006ST"

+ "RING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JS"

+ "Type\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS"

+ "_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013"

+ "allow_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005f"

+ "alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go"

+ "ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200"

+ "\200\200\200\002\"}\n\020EnumValueOptions\022\031\n\ndeprecated\030\001"

+ " \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003"

+ "(\0132$.google.protobuf.UninterpretedOption"

+ "*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndepreca"

+ "ted\030! \001(\010:\005false\022C\n\024uninterpreted_option"

+ "\030\347\007 \003(\0132$.google.protobuf.UninterpretedO"

+ "ption*\t\010\350\007\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndep"

+ "recated\030! \001(\010:\005false\022C\n\024uninterpreted_op"

+ "tion\030\347\007 \003(\0132$.google.protobuf.Uninterpre"

+ "tedOption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOp"

+ "tion\022;\n\004name\030\002 \003(\0132-.google.protobuf.Uni"

+ "nterpretedOption.NamePart\022\030\n\020identifier_"

+ "value\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022"

+ "\032\n\022negative_int_value\030\005 \001(\003\022\024\n\014double_va"

+ "lue\030\006 \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggre"

+ "gate_value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_par"

+ "t\030\001 \002(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016Source"

+ "CodeInfo\022:\n\010location\030\001 \003(\0132(.google.prot"

+ "obuf.SourceCodeInfo.Location\032\206\001\n\010Locatio"

+ "n\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n"

+ "\020leading_comments\030\003 \001(\t\022\031\n\021trailing_comm"

+ "ents\030\004 \001(\t\022!\n\031leading_detached_comments\030"

+ "\006 \003(\t\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotatio"

+ "n\030\001 \003(\0132-.google.protobuf.GeneratedCodeI"

+ "nfo.Annotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003"

+ "(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001"

+ "(\005\022\013\n\003end\030\004 \001(\005BX\n\023com.google.protobufB\020"

+ "DescriptorProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032G"

+ "oogle.Protobuf.Reflection", 5145);

::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(

"google/protobuf/descriptor.proto", &protobuf_RegisterTypes);

+ FileDescriptorSet::default_instance_ = new FileDescriptorSet();

+ FileDescriptorProto::default_instance_ = new FileDescriptorProto();

+ DescriptorProto::default_instance_ = new DescriptorProto();

+ DescriptorProto_ExtensionRange::default_instance_ = new DescriptorProto_ExtensionRange();

+ DescriptorProto_ReservedRange::default_instance_ = new DescriptorProto_ReservedRange();

+ FieldDescriptorProto::default_instance_ = new FieldDescriptorProto();

+ OneofDescriptorProto::default_instance_ = new OneofDescriptorProto();

+ EnumDescriptorProto::default_instance_ = new EnumDescriptorProto();

+ EnumValueDescriptorProto::default_instance_ = new EnumValueDescriptorProto();

+ ServiceDescriptorProto::default_instance_ = new ServiceDescriptorProto();

+ MethodDescriptorProto::default_instance_ = new MethodDescriptorProto();

+ FileOptions::default_instance_ = new FileOptions();

+ MessageOptions::default_instance_ = new MessageOptions();

+ FieldOptions::default_instance_ = new FieldOptions();

+ EnumOptions::default_instance_ = new EnumOptions();

+ EnumValueOptions::default_instance_ = new EnumValueOptions();

+ ServiceOptions::default_instance_ = new ServiceOptions();

+ MethodOptions::default_instance_ = new MethodOptions();

+ UninterpretedOption::default_instance_ = new UninterpretedOption();

+ UninterpretedOption_NamePart::default_instance_ = new UninterpretedOption_NamePart();

+ SourceCodeInfo::default_instance_ = new SourceCodeInfo();

+ SourceCodeInfo_Location::default_instance_ = new SourceCodeInfo_Location();

+ GeneratedCodeInfo::default_instance_ = new GeneratedCodeInfo();

+ GeneratedCodeInfo_Annotation::default_instance_ = new GeneratedCodeInfo_Annotation();

+ FileDescriptorSet::default_instance_->InitAsDefaultInstance();

+ FileDescriptorProto::default_instance_->InitAsDefaultInstance();

+ DescriptorProto::default_instance_->InitAsDefaultInstance();

+ DescriptorProto_ExtensionRange::default_instance_->InitAsDefaultInstance();

+ DescriptorProto_ReservedRange::default_instance_->InitAsDefaultInstance();

+ FieldDescriptorProto::default_instance_->InitAsDefaultInstance();

+ OneofDescriptorProto::default_instance_->InitAsDefaultInstance();

+ EnumDescriptorProto::default_instance_->InitAsDefaultInstance();

+ EnumValueDescriptorProto::default_instance_->InitAsDefaultInstance();

+ ServiceDescriptorProto::default_instance_->InitAsDefaultInstance();

+ MethodDescriptorProto::default_instance_->InitAsDefaultInstance();

+ FileOptions::default_instance_->InitAsDefaultInstance();

+ MessageOptions::default_instance_->InitAsDefaultInstance();

+ FieldOptions::default_instance_->InitAsDefaultInstance();

+ EnumOptions::default_instance_->InitAsDefaultInstance();

+ EnumValueOptions::default_instance_->InitAsDefaultInstance();

+ ServiceOptions::default_instance_->InitAsDefaultInstance();

+ MethodOptions::default_instance_->InitAsDefaultInstance();

+ UninterpretedOption::default_instance_->InitAsDefaultInstance();

+ UninterpretedOption_NamePart::default_instance_->InitAsDefaultInstance();

+ SourceCodeInfo::default_instance_->InitAsDefaultInstance();

+ SourceCodeInfo_Location::default_instance_->InitAsDefaultInstance();

+ GeneratedCodeInfo::default_instance_->InitAsDefaultInstance();

+ GeneratedCodeInfo_Annotation::default_instance_->InitAsDefaultInstance();

::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto);

}

-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_);

-void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {

- ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_,

- &protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl);

// Force AddDescriptors() to be called at static initialization time.

struct StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto {

StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto() {

protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

}

} static_descriptor_initializer_google_2fprotobuf_2fdescriptor_2eproto_;

-const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[0];

-bool FieldDescriptorProto_Type_IsValid(int value) {

- switch (value) {

- case 1:

- case 2:

- case 3:

- case 4:

- case 5:

- case 6:

- case 7:

- case 8:

- case 9:

- case 10:

- case 11:

- case 12:

- case 13:

- case 14:

- case 15:

- case 16:

- case 17:

- case 18:

- return true;

- default:

- return false;

- }

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32;

-const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64;

-const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN;

-const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX;

-const int FieldDescriptorProto::Type_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[1];

-bool FieldDescriptorProto_Label_IsValid(int value) {

- switch (value) {

- case 1:

- case 2:

- case 3:

- return true;

- default:

- return false;

- }

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL;

-const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED;

-const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED;

-const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN;

-const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX;

-const int FieldDescriptorProto::Label_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[2];

-bool FileOptions_OptimizeMode_IsValid(int value) {

- switch (value) {

- case 1:

- case 2:

- case 3:

- return true;

- default:

- return false;

- }

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const FileOptions_OptimizeMode FileOptions::SPEED;

-const FileOptions_OptimizeMode FileOptions::CODE_SIZE;

-const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME;

-const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN;

-const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX;

-const int FileOptions::OptimizeMode_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[3];

-bool FieldOptions_CType_IsValid(int value) {

- switch (value) {

- case 0:

- case 1:

- case 2:

- return true;

- default:

- return false;

- }

+namespace {

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const FieldOptions_CType FieldOptions::STRING;

-const FieldOptions_CType FieldOptions::CORD;

-const FieldOptions_CType FieldOptions::STRING_PIECE;

-const FieldOptions_CType FieldOptions::CType_MIN;

-const FieldOptions_CType FieldOptions::CType_MAX;

-const int FieldOptions::CType_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[4];

-bool FieldOptions_JSType_IsValid(int value) {

- switch (value) {

- case 0:

- case 1:

- case 2:

- return true;

- default:

- return false;

- }

+static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;

+static void MergeFromFail(int line) {

+ GOOGLE_CHECK(false) << __FILE__ << ":" << line;

}

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const FieldOptions_JSType FieldOptions::JS_NORMAL;

-const FieldOptions_JSType FieldOptions::JS_STRING;

-const FieldOptions_JSType FieldOptions::JS_NUMBER;

-const FieldOptions_JSType FieldOptions::JSType_MIN;

-const FieldOptions_JSType FieldOptions::JSType_MAX;

-const int FieldOptions::JSType_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-const ::google::protobuf::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_enum_descriptors[5];

-bool MethodOptions_IdempotencyLevel_IsValid(int value) {

- switch (value) {

- case 0:

- case 1:

- case 2:

- return true;

- default:

- return false;

- }

+} // namespace

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENCY_UNKNOWN;

-const MethodOptions_IdempotencyLevel MethodOptions::NO_SIDE_EFFECTS;

-const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENT;

-const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MIN;

-const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MAX;

-const int MethodOptions::IdempotencyLevel_ARRAYSIZE;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

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

@@ -934,24 +888,24 @@ const int FileDescriptorSet::kFileFieldNumber;

FileDescriptorSet::FileDescriptorSet()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorSet)

}

+void FileDescriptorSet::InitAsDefaultInstance() {

FileDescriptorSet::FileDescriptorSet(const FileDescriptorSet& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- file_(from.file_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet)

}

void FileDescriptorSet::SharedCtor() {

_cached_size_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

FileDescriptorSet::~FileDescriptorSet() {

@@ -960,6 +914,8 @@ FileDescriptorSet::~FileDescriptorSet() {

}

void FileDescriptorSet::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void FileDescriptorSet::SetCachedSize(int size) const {

@@ -969,14 +925,16 @@ void FileDescriptorSet::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* FileDescriptorSet::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[0].descriptor;

+ return FileDescriptorSet_descriptor_;

}

const FileDescriptorSet& FileDescriptorSet::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+FileDescriptorSet* FileDescriptorSet::default_instance_ = NULL;

FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) const {

FileDescriptorSet* n = new FileDescriptorSet;

if (arena != NULL) {

@@ -988,8 +946,10 @@ FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) cons

void FileDescriptorSet::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet)

file_.Clear();

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool FileDescriptorSet::MergePartialFromCodedStream(

@@ -998,20 +958,23 @@ bool FileDescriptorSet::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorSet)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// repeated .google.protobuf.FileDescriptorProto file = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_file:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_file()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(10)) goto parse_loop_file;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -1053,15 +1016,14 @@ void FileDescriptorSet::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorSet)

}

-::google::protobuf::uint8* FileDescriptorSet::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* FileDescriptorSet::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorSet)

// repeated .google.protobuf.FileDescriptorProto file = 1;

for (unsigned int i = 0, n = this->file_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 1, this->file(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 1, this->file(i), target);

}

if (_internal_metadata_.have_unknown_fields()) {

@@ -1072,37 +1034,33 @@ void FileDescriptorSet::SerializeWithCachedSizes(

return target;

}

-size_t FileDescriptorSet::ByteSizeLong() const {

+int FileDescriptorSet::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorSet)

- size_t total_size = 0;

+ int total_size = 0;

+ // repeated .google.protobuf.FileDescriptorProto file = 1;

+ total_size += 1 * this->file_size();

+ for (int i = 0; i < this->file_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->file(i));

+ }

if (_internal_metadata_.have_unknown_fields()) {

total_size +=

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.FileDescriptorProto file = 1;

- {

- unsigned int count = this->file_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->file(i));

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorSet)

- GOOGLE_DCHECK_NE(&from, this);

- const FileDescriptorSet* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const FileDescriptorSet* source =

::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorSet>(

&from);

if (source == NULL) {

@@ -1116,9 +1074,11 @@ void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) {

void FileDescriptorSet::MergeFrom(const FileDescriptorSet& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorSet)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

file_.MergeFrom(from.file_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void FileDescriptorSet::CopyFrom(const ::google::protobuf::Message& from) {

@@ -1136,6 +1096,7 @@ void FileDescriptorSet::CopyFrom(const FileDescriptorSet& from) {

}

bool FileDescriptorSet::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->file())) return false;

return true;

}

@@ -1153,7 +1114,10 @@ void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) {

::google::protobuf::Metadata FileDescriptorSet::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[0];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = FileDescriptorSet_descriptor_;

+ metadata.reflection = FileDescriptorSet_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -1210,57 +1174,32 @@ const int FileDescriptorProto::kSyntaxFieldNumber;

FileDescriptorProto::FileDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorProto)

}

+void FileDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::FileOptions*>(&::google::protobuf::FileOptions::default_instance());

+ source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>(&::google::protobuf::SourceCodeInfo::default_instance());

FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- dependency_(from.dependency_),

- public_dependency_(from.public_dependency_),

- weak_dependency_(from.weak_dependency_),

- message_type_(from.message_type_),

- enum_type_(from.enum_type_),

- service_(from.service_),

- extension_(from.extension_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_package()) {

- package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_);

- }

- syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_syntax()) {

- syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::FileOptions(*from.options_);

- } else {

- options_ = NULL;

- }

- if (from.has_source_code_info()) {

- source_code_info_ = new ::google::protobuf::SourceCodeInfo(*from.source_code_info_);

- } else {

- source_code_info_ = NULL;

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorProto)

}

void FileDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ options_ = NULL;

+ source_code_info_ = NULL;

syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&options_, 0, reinterpret_cast<char*>(&source_code_info_) -

- reinterpret_cast<char*>(&options_) + sizeof(source_code_info_));

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

FileDescriptorProto::~FileDescriptorProto() {

@@ -1272,10 +1211,8 @@ void FileDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

syntax_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

- }

- if (this != internal_default_instance()) {

delete source_code_info_;

}

@@ -1287,14 +1224,16 @@ void FileDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* FileDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[1].descriptor;

+ return FileDescriptorProto_descriptor_;

}

const FileDescriptorProto& FileDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+FileDescriptorProto* FileDescriptorProto::default_instance_ = NULL;

FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) const {

FileDescriptorProto* n = new FileDescriptorProto;

if (arena != NULL) {

@@ -1305,52 +1244,51 @@ FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena)

void FileDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto)

- dependency_.Clear();

- public_dependency_.Clear();

- weak_dependency_.Clear();

- message_type_.Clear();

- enum_type_.Clear();

- service_.Clear();

- extension_.Clear();

- if (_has_bits_[0 / 32] & 31u) {

+ if (_has_bits_[0 / 32] & 3u) {

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_package()) {

- GOOGLE_DCHECK(!package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*package_.UnsafeRawStringPointer())->clear();

- }

- if (has_syntax()) {

- GOOGLE_DCHECK(!syntax_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*syntax_.UnsafeRawStringPointer())->clear();

+ package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ }

+ if (_has_bits_[8 / 32] & 3584u) {

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::FileOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();

}

if (has_source_code_info()) {

- GOOGLE_DCHECK(source_code_info_ != NULL);

- source_code_info_->::google::protobuf::SourceCodeInfo::Clear();

+ if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();

+ }

+ if (has_syntax()) {

+ syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

-bool FileDescriptorProto::MergePartialFromCodedStream(

- ::google::protobuf::io::CodedInputStream* input) {

-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

- ::google::protobuf::uint32 tag;

+ dependency_.Clear();

+ public_dependency_.Clear();

+ weak_dependency_.Clear();

+ message_type_.Clear();

+ enum_type_.Clear();

+ service_.Clear();

+ extension_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

+bool FileDescriptorProto::MergePartialFromCodedStream(

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

+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

+ ::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -1360,12 +1298,14 @@ bool FileDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_package;

break;

}

// optional string package = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_package:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_package()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -1375,12 +1315,14 @@ bool FileDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_dependency;

break;

}

// repeated string dependency = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_dependency:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->add_dependency()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -1391,118 +1333,144 @@ bool FileDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_dependency;

+ if (input->ExpectTag(34)) goto parse_message_type;

break;

}

// repeated .google.protobuf.DescriptorProto message_type = 4;

case 4: {

- if (tag == 34u) {

+ if (tag == 34) {

+ parse_message_type:

DO_(input->IncrementRecursionDepth());

+ parse_loop_message_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_message_type()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(34)) goto parse_loop_message_type;

+ if (input->ExpectTag(42)) goto parse_loop_enum_type;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;

case 5: {

- if (tag == 42u) {

+ if (tag == 42) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_enum_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_enum_type()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(42)) goto parse_loop_enum_type;

+ if (input->ExpectTag(50)) goto parse_loop_service;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.ServiceDescriptorProto service = 6;

case 6: {

- if (tag == 50u) {

+ if (tag == 50) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_service:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_service()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(50)) goto parse_loop_service;

+ if (input->ExpectTag(58)) goto parse_loop_extension;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.FieldDescriptorProto extension = 7;

case 7: {

- if (tag == 58u) {

+ if (tag == 58) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_extension:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_extension()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(58)) goto parse_loop_extension;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(66)) goto parse_options;

break;

}

// optional .google.protobuf.FileOptions options = 8;

case 8: {

- if (tag == 66u) {

+ if (tag == 66) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(74)) goto parse_source_code_info;

break;

}

// optional .google.protobuf.SourceCodeInfo source_code_info = 9;

case 9: {

- if (tag == 74u) {

+ if (tag == 74) {

+ parse_source_code_info:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_source_code_info()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(80)) goto parse_public_dependency;

break;

}

// repeated int32 public_dependency = 10;

case 10: {

- if (tag == 80u) {

+ if (tag == 80) {

+ parse_public_dependency:

DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

- 1, 80u, input, this->mutable_public_dependency())));

- } else if (tag == 82u) {

+ 1, 80, input, this->mutable_public_dependency())));

+ } else if (tag == 82) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, this->mutable_public_dependency())));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(80)) goto parse_public_dependency;

+ if (input->ExpectTag(88)) goto parse_weak_dependency;

break;

}

// repeated int32 weak_dependency = 11;

case 11: {

- if (tag == 88u) {

+ if (tag == 88) {

+ parse_weak_dependency:

DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

- 1, 88u, input, this->mutable_weak_dependency())));

- } else if (tag == 90u) {

+ 1, 88, input, this->mutable_weak_dependency())));

+ } else if (tag == 90) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, this->mutable_weak_dependency())));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(88)) goto parse_weak_dependency;

+ if (input->ExpectTag(98)) goto parse_syntax;

break;

}

// optional string syntax = 12;

case 12: {

- if (tag == 98u) {

+ if (tag == 98) {

+ parse_syntax:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_syntax()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -1512,6 +1480,7 @@ bool FileDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -1635,9 +1604,8 @@ void FileDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorProto)

}

-::google::protobuf::uint8* FileDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -1674,43 +1642,43 @@ void FileDescriptorProto::SerializeWithCachedSizes(

// repeated .google.protobuf.DescriptorProto message_type = 4;

for (unsigned int i = 0, n = this->message_type_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 4, this->message_type(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 4, this->message_type(i), target);

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;

for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 5, this->enum_type(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 5, this->enum_type(i), target);

}

// repeated .google.protobuf.ServiceDescriptorProto service = 6;

for (unsigned int i = 0, n = this->service_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 6, this->service(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 6, this->service(i), target);

}

// repeated .google.protobuf.FieldDescriptorProto extension = 7;

for (unsigned int i = 0, n = this->extension_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 7, this->extension(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 7, this->extension(i), target);

}

// optional .google.protobuf.FileOptions options = 8;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 8, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 8, *this->options_, target);

}

// optional .google.protobuf.SourceCodeInfo source_code_info = 9;

if (has_source_code_info()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 9, *this->source_code_info_, false, target);

+ WriteMessageNoVirtualToArray(

+ 9, *this->source_code_info_, target);

}

// repeated int32 public_dependency = 10;

@@ -1744,18 +1712,51 @@ void FileDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t FileDescriptorProto::ByteSizeLong() const {

+int FileDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

+ if (_has_bits_[0 / 32] & 3u) {

+ // optional string name = 1;

+ if (has_name()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->name());

+ }

+ // optional string package = 2;

+ if (has_package()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->package());

+ }

+ if (_has_bits_[9 / 32] & 3584u) {

+ // optional .google.protobuf.FileOptions options = 8;

+ if (has_options()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ *this->options_);

+ }

+ // optional .google.protobuf.SourceCodeInfo source_code_info = 9;

+ if (has_source_code_info()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ *this->source_code_info_);

+ }

+ // optional string syntax = 12;

+ if (has_syntax()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->syntax());

+ }

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

}

// repeated string dependency = 3;

- total_size += 1 *

- ::google::protobuf::internal::FromIntSize(this->dependency_size());

+ total_size += 1 * this->dependency_size();

for (int i = 0; i < this->dependency_size(); i++) {

total_size += ::google::protobuf::internal::WireFormatLite::StringSize(

this->dependency(i));

@@ -1763,122 +1764,71 @@ size_t FileDescriptorProto::ByteSizeLong() const {

// repeated int32 public_dependency = 10;

{

- size_t data_size = 0;

- unsigned int count = this->public_dependency_size();

- for (unsigned int i = 0; i < count; i++) {

+ int data_size = 0;

+ for (int i = 0; i < this->public_dependency_size(); i++) {

data_size += ::google::protobuf::internal::WireFormatLite::

Int32Size(this->public_dependency(i));

}

- total_size += 1 *

- ::google::protobuf::internal::FromIntSize(this->public_dependency_size());

- total_size += data_size;

+ total_size += 1 * this->public_dependency_size() + data_size;

}

// repeated int32 weak_dependency = 11;

{

- size_t data_size = 0;

- unsigned int count = this->weak_dependency_size();

- for (unsigned int i = 0; i < count; i++) {

+ int data_size = 0;

+ for (int i = 0; i < this->weak_dependency_size(); i++) {

data_size += ::google::protobuf::internal::WireFormatLite::

Int32Size(this->weak_dependency(i));

}

- total_size += 1 *

- ::google::protobuf::internal::FromIntSize(this->weak_dependency_size());

- total_size += data_size;

+ total_size += 1 * this->weak_dependency_size() + data_size;

}

// repeated .google.protobuf.DescriptorProto message_type = 4;

- {

- unsigned int count = this->message_type_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->message_type(i));

- }

+ total_size += 1 * this->message_type_size();

+ for (int i = 0; i < this->message_type_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->message_type(i));

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;

- {

- unsigned int count = this->enum_type_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->enum_type(i));

- }

+ total_size += 1 * this->enum_type_size();

+ for (int i = 0; i < this->enum_type_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->enum_type(i));

}

// repeated .google.protobuf.ServiceDescriptorProto service = 6;

- {

- unsigned int count = this->service_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->service(i));

- }

+ total_size += 1 * this->service_size();

+ for (int i = 0; i < this->service_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->service(i));

}

// repeated .google.protobuf.FieldDescriptorProto extension = 7;

- {

- unsigned int count = this->extension_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->extension(i));

- }

+ total_size += 1 * this->extension_size();

+ for (int i = 0; i < this->extension_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->extension(i));

}

- if (_has_bits_[0 / 32] & 31u) {

- // optional string name = 1;

- if (has_name()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->name());

- }

- // optional string package = 2;

- if (has_package()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->package());

- }

- // optional string syntax = 12;

- if (has_syntax()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->syntax());

- }

- // optional .google.protobuf.FileOptions options = 8;

- if (has_options()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->options_);

- }

- // optional .google.protobuf.SourceCodeInfo source_code_info = 9;

- if (has_source_code_info()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->source_code_info_);

- }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const FileDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const FileDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorProto>(

&from);

if (source == NULL) {

@@ -1892,8 +1842,7 @@ void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

dependency_.MergeFrom(from.dependency_);

public_dependency_.MergeFrom(from.public_dependency_);

weak_dependency_.MergeFrom(from.weak_dependency_);

@@ -1901,7 +1850,7 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {

enum_type_.MergeFrom(from.enum_type_);

service_.MergeFrom(from.service_);

extension_.MergeFrom(from.extension_);

- if (from._has_bits_[0 / 32] & 31u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

@@ -1910,16 +1859,21 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {

set_has_package();

package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_);

}

- if (from.has_syntax()) {

- set_has_syntax();

- syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_);

- }

+ }

+ if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {

if (from.has_options()) {

mutable_options()->::google::protobuf::FileOptions::MergeFrom(from.options());

}

if (from.has_source_code_info()) {

mutable_source_code_info()->::google::protobuf::SourceCodeInfo::MergeFrom(from.source_code_info());

}

+ if (from.has_syntax()) {

+ set_has_syntax();

+ syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_);

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

@@ -1938,6 +1892,7 @@ void FileDescriptorProto::CopyFrom(const FileDescriptorProto& from) {

}

bool FileDescriptorProto::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->message_type())) return false;

if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false;

if (!::google::protobuf::internal::AllAreInitialized(this->service())) return false;

@@ -1953,6 +1908,8 @@ void FileDescriptorProto::Swap(FileDescriptorProto* other) {

InternalSwap(other);

}

void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) {

+ name_.Swap(&other->name_);

+ package_.Swap(&other->package_);

dependency_.UnsafeArenaSwap(&other->dependency_);

public_dependency_.UnsafeArenaSwap(&other->public_dependency_);

weak_dependency_.UnsafeArenaSwap(&other->weak_dependency_);

@@ -1960,11 +1917,9 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) {

enum_type_.UnsafeArenaSwap(&other->enum_type_);

service_.UnsafeArenaSwap(&other->service_);

extension_.UnsafeArenaSwap(&other->extension_);

- name_.Swap(&other->name_);

- package_.Swap(&other->package_);

- syntax_.Swap(&other->syntax_);

std::swap(options_, other->options_);

std::swap(source_code_info_, other->source_code_info_);

+ syntax_.Swap(&other->syntax_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -1972,7 +1927,10 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) {

::google::protobuf::Metadata FileDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[1];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = FileDescriptorProto_descriptor_;

+ metadata.reflection = FileDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -1992,37 +1950,37 @@ void FileDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& FileDescriptorProto::name() const {

+ const ::std::string& FileDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_name(const ::std::string& value) {

+ void FileDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name)

}

-void FileDescriptorProto::set_name(const char* value) {

+ void FileDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.name)

}

-void FileDescriptorProto::set_name(const char* value, size_t size) {

+ void FileDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.name)

}

-::std::string* FileDescriptorProto::mutable_name() {

+ ::std::string* FileDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileDescriptorProto::release_name() {

+ ::std::string* FileDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_allocated_name(::std::string* name) {

+ void FileDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -2046,37 +2004,37 @@ void FileDescriptorProto::clear_package() {

package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_package();

}

-const ::std::string& FileDescriptorProto::package() const {

+ const ::std::string& FileDescriptorProto::package() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package)

- return package_.GetNoArena();

+ return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_package(const ::std::string& value) {

+ void FileDescriptorProto::set_package(const ::std::string& value) {

set_has_package();

package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package)

}

-void FileDescriptorProto::set_package(const char* value) {

+ void FileDescriptorProto::set_package(const char* value) {

set_has_package();

package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.package)

}

-void FileDescriptorProto::set_package(const char* value, size_t size) {

+ void FileDescriptorProto::set_package(const char* value, size_t size) {

set_has_package();

package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.package)

}

-::std::string* FileDescriptorProto::mutable_package() {

+ ::std::string* FileDescriptorProto::mutable_package() {

set_has_package();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package)

return package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileDescriptorProto::release_package() {

+ ::std::string* FileDescriptorProto::release_package() {

// @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package)

clear_has_package();

return package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_allocated_package(::std::string* package) {

+ void FileDescriptorProto::set_allocated_package(::std::string* package) {

if (package != NULL) {

set_has_package();

} else {

@@ -2093,49 +2051,49 @@ int FileDescriptorProto::dependency_size() const {

void FileDescriptorProto::clear_dependency() {

dependency_.Clear();

}

-const ::std::string& FileDescriptorProto::dependency(int index) const {

+ const ::std::string& FileDescriptorProto::dependency(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.dependency)

return dependency_.Get(index);

}

-::std::string* FileDescriptorProto::mutable_dependency(int index) {

+ ::std::string* FileDescriptorProto::mutable_dependency(int index) {

// @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency)

return dependency_.Mutable(index);

}

-void FileDescriptorProto::set_dependency(int index, const ::std::string& value) {

+ void FileDescriptorProto::set_dependency(int index, const ::std::string& value) {

// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency)

dependency_.Mutable(index)->assign(value);

}

-void FileDescriptorProto::set_dependency(int index, const char* value) {

+ void FileDescriptorProto::set_dependency(int index, const char* value) {

dependency_.Mutable(index)->assign(value);

// @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.dependency)

}

-void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) {

+ void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) {

dependency_.Mutable(index)->assign(

reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.dependency)

}

-::std::string* FileDescriptorProto::add_dependency() {

+ ::std::string* FileDescriptorProto::add_dependency() {

// @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency)

return dependency_.Add();

}

-void FileDescriptorProto::add_dependency(const ::std::string& value) {

+ void FileDescriptorProto::add_dependency(const ::std::string& value) {

dependency_.Add()->assign(value);

// @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)

}

-void FileDescriptorProto::add_dependency(const char* value) {

+ void FileDescriptorProto::add_dependency(const char* value) {

dependency_.Add()->assign(value);

// @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency)

}

-void FileDescriptorProto::add_dependency(const char* value, size_t size) {

+ void FileDescriptorProto::add_dependency(const char* value, size_t size) {

dependency_.Add()->assign(reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency)

}

-const ::google::protobuf::RepeatedPtrField< ::std::string>&

+ const ::google::protobuf::RepeatedPtrField< ::std::string>&

FileDescriptorProto::dependency() const {

// @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency)

return dependency_;

}

-::google::protobuf::RepeatedPtrField< ::std::string>*

+ ::google::protobuf::RepeatedPtrField< ::std::string>*

FileDescriptorProto::mutable_dependency() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency)

return &dependency_;

@@ -2148,24 +2106,24 @@ int FileDescriptorProto::public_dependency_size() const {

void FileDescriptorProto::clear_public_dependency() {

public_dependency_.Clear();

}

-::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const {

+ ::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency)

return public_dependency_.Get(index);

}

-void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) {

+ void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) {

public_dependency_.Set(index, value);

// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency)

}

-void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) {

+ void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) {

public_dependency_.Add(value);

// @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency)

}

-const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

+ const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

FileDescriptorProto::public_dependency() const {

// @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency)

return public_dependency_;

}

-::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

FileDescriptorProto::mutable_public_dependency() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency)

return &public_dependency_;

@@ -2178,24 +2136,24 @@ int FileDescriptorProto::weak_dependency_size() const {

void FileDescriptorProto::clear_weak_dependency() {

weak_dependency_.Clear();

}

-::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const {

+ ::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency)

return weak_dependency_.Get(index);

}

-void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) {

+ void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) {

weak_dependency_.Set(index, value);

// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency)

}

-void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) {

+ void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) {

weak_dependency_.Add(value);

// @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency)

}

-const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

+ const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

FileDescriptorProto::weak_dependency() const {

// @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency)

return weak_dependency_;

}

-::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

FileDescriptorProto::mutable_weak_dependency() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency)

return &weak_dependency_;

@@ -2323,13 +2281,13 @@ FileDescriptorProto::extension() const {

// optional .google.protobuf.FileOptions options = 8;

bool FileDescriptorProto::has_options() const {

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

+ return (_has_bits_[0] & 0x00000200u) != 0;

}

void FileDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000008u;

+ _has_bits_[0] |= 0x00000200u;

}

void FileDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000008u;

+ _has_bits_[0] &= ~0x00000200u;

}

void FileDescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();

@@ -2337,8 +2295,7 @@ void FileDescriptorProto::clear_options() {

}

const ::google::protobuf::FileOptions& FileDescriptorProto::options() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -2368,13 +2325,13 @@ void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions*

// optional .google.protobuf.SourceCodeInfo source_code_info = 9;

bool FileDescriptorProto::has_source_code_info() const {

- return (_has_bits_[0] & 0x00000010u) != 0;

+ return (_has_bits_[0] & 0x00000400u) != 0;

}

void FileDescriptorProto::set_has_source_code_info() {

- _has_bits_[0] |= 0x00000010u;

+ _has_bits_[0] |= 0x00000400u;

}

void FileDescriptorProto::clear_has_source_code_info() {

- _has_bits_[0] &= ~0x00000010u;

+ _has_bits_[0] &= ~0x00000400u;

}

void FileDescriptorProto::clear_source_code_info() {

if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();

@@ -2382,8 +2339,7 @@ void FileDescriptorProto::clear_source_code_info() {

}

const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info)

- return source_code_info_ != NULL ? *source_code_info_

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

+ return source_code_info_ != NULL ? *source_code_info_ : *default_instance_->source_code_info_;

}

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

set_has_source_code_info();

@@ -2413,49 +2369,49 @@ void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::Sou

// optional string syntax = 12;

bool FileDescriptorProto::has_syntax() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000800u) != 0;

}

void FileDescriptorProto::set_has_syntax() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000800u;

}

void FileDescriptorProto::clear_has_syntax() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000800u;

}

void FileDescriptorProto::clear_syntax() {

syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_syntax();

}

-const ::std::string& FileDescriptorProto::syntax() const {

+ const ::std::string& FileDescriptorProto::syntax() const {

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

- return syntax_.GetNoArena();

+ return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_syntax(const ::std::string& value) {

+ void FileDescriptorProto::set_syntax(const ::std::string& value) {

set_has_syntax();

syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

}

-void FileDescriptorProto::set_syntax(const char* value) {

+ void FileDescriptorProto::set_syntax(const char* value) {

set_has_syntax();

syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

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

}

-void FileDescriptorProto::set_syntax(const char* value, size_t size) {

+ void FileDescriptorProto::set_syntax(const char* value, size_t size) {

set_has_syntax();

syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

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

}

-::std::string* FileDescriptorProto::mutable_syntax() {

+ ::std::string* FileDescriptorProto::mutable_syntax() {

set_has_syntax();

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

return syntax_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileDescriptorProto::release_syntax() {

+ ::std::string* FileDescriptorProto::release_syntax() {

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

clear_has_syntax();

return syntax_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) {

+ void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) {

if (syntax != NULL) {

set_has_syntax();

} else {

@@ -2476,28 +2432,26 @@ const int DescriptorProto_ExtensionRange::kEndFieldNumber;

DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ExtensionRange)

}

+void DescriptorProto_ExtensionRange::InitAsDefaultInstance() {

DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- ::memcpy(&start_, &from.start_,

- reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange)

}

void DescriptorProto_ExtensionRange::SharedCtor() {

_cached_size_ = 0;

- ::memset(&start_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+ start_ = 0;

+ end_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() {

@@ -2506,6 +2460,8 @@ DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() {

}

void DescriptorProto_ExtensionRange::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void DescriptorProto_ExtensionRange::SetCachedSize(int size) const {

@@ -2515,14 +2471,16 @@ void DescriptorProto_ExtensionRange::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[2].descriptor;

+ return DescriptorProto_ExtensionRange_descriptor_;

}

const DescriptorProto_ExtensionRange& DescriptorProto_ExtensionRange::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::default_instance_ = NULL;

DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::protobuf::Arena* arena) const {

DescriptorProto_ExtensionRange* n = new DescriptorProto_ExtensionRange;

if (arena != NULL) {

@@ -2533,12 +2491,31 @@ DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::pr

void DescriptorProto_ExtensionRange::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange)

- if (_has_bits_[0 / 32] & 3u) {

- ::memset(&start_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(DescriptorProto_ExtensionRange, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<DescriptorProto_ExtensionRange*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ ZR_(start_, end_);

+#undef ZR_HELPER_

+#undef ZR_

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream(

@@ -2547,33 +2524,36 @@ bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ExtensionRange)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional int32 start = 1;

case 1: {

- if (tag == 8u) {

- set_has_start();

+ if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &start_)));

+ set_has_start();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_end;

break;

}

// optional int32 end = 2;

case 2: {

- if (tag == 16u) {

- set_has_end();

+ if (tag == 16) {

+ parse_end:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &end_)));

+ set_has_end();

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -2619,9 +2599,8 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ExtensionRange)

}

-::google::protobuf::uint8* DescriptorProto_ExtensionRange::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* DescriptorProto_ExtensionRange::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ExtensionRange)

// optional int32 start = 1;

if (has_start()) {

@@ -2641,15 +2620,10 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes(

return target;

}

-size_t DescriptorProto_ExtensionRange::ByteSizeLong() const {

+int DescriptorProto_ExtensionRange::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ExtensionRange)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (_has_bits_[0 / 32] & 3u) {

// optional int32 start = 1;

if (has_start()) {

@@ -2666,17 +2640,21 @@ size_t DescriptorProto_ExtensionRange::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange)

- GOOGLE_DCHECK_NE(&from, this);

- const DescriptorProto_ExtensionRange* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const DescriptorProto_ExtensionRange* source =

::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto_ExtensionRange>(

&from);

if (source == NULL) {

@@ -2690,9 +2668,8 @@ void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message

void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRange& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_start()) {

set_start(from.start());

}

@@ -2700,6 +2677,9 @@ void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRa

set_end(from.end());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void DescriptorProto_ExtensionRange::CopyFrom(const ::google::protobuf::Message& from) {

@@ -2717,6 +2697,7 @@ void DescriptorProto_ExtensionRange::CopyFrom(const DescriptorProto_ExtensionRan

}

bool DescriptorProto_ExtensionRange::IsInitialized() const {

return true;

}

@@ -2734,63 +2715,14 @@ void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange

::google::protobuf::Metadata DescriptorProto_ExtensionRange::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[2];

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// DescriptorProto_ExtensionRange

-// optional int32 start = 1;

-bool DescriptorProto_ExtensionRange::has_start() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

-void DescriptorProto_ExtensionRange::set_has_start() {

- _has_bits_[0] |= 0x00000001u;

-void DescriptorProto_ExtensionRange::clear_has_start() {

- _has_bits_[0] &= ~0x00000001u;

-void DescriptorProto_ExtensionRange::clear_start() {

- start_ = 0;

- clear_has_start();

-::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const {

- // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start)

- return start_;

-void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) {

- set_has_start();

- start_ = value;

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

-// optional int32 end = 2;

-bool DescriptorProto_ExtensionRange::has_end() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void DescriptorProto_ExtensionRange::set_has_end() {

- _has_bits_[0] |= 0x00000002u;

-void DescriptorProto_ExtensionRange::clear_has_end() {

- _has_bits_[0] &= ~0x00000002u;

-void DescriptorProto_ExtensionRange::clear_end() {

- end_ = 0;

- clear_has_end();

-::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const {

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

- return end_;

-void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) {

- set_has_end();

- end_ = value;

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

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = DescriptorProto_ExtensionRange_descriptor_;

+ metadata.reflection = DescriptorProto_ExtensionRange_reflection_;

+ return metadata;

}

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int DescriptorProto_ReservedRange::kStartFieldNumber;

@@ -2799,28 +2731,26 @@ const int DescriptorProto_ReservedRange::kEndFieldNumber;

DescriptorProto_ReservedRange::DescriptorProto_ReservedRange()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ReservedRange)

}

+void DescriptorProto_ReservedRange::InitAsDefaultInstance() {

DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- ::memcpy(&start_, &from.start_,

- reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ReservedRange)

}

void DescriptorProto_ReservedRange::SharedCtor() {

_cached_size_ = 0;

- ::memset(&start_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+ start_ = 0;

+ end_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() {

@@ -2829,6 +2759,8 @@ DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() {

}

void DescriptorProto_ReservedRange::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void DescriptorProto_ReservedRange::SetCachedSize(int size) const {

@@ -2838,14 +2770,16 @@ void DescriptorProto_ReservedRange::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[3].descriptor;

+ return DescriptorProto_ReservedRange_descriptor_;

}

const DescriptorProto_ReservedRange& DescriptorProto_ReservedRange::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::default_instance_ = NULL;

DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::protobuf::Arena* arena) const {

DescriptorProto_ReservedRange* n = new DescriptorProto_ReservedRange;

if (arena != NULL) {

@@ -2856,12 +2790,31 @@ DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::prot

void DescriptorProto_ReservedRange::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange)

- if (_has_bits_[0 / 32] & 3u) {

- ::memset(&start_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&start_) + sizeof(end_));

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(DescriptorProto_ReservedRange, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<DescriptorProto_ReservedRange*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ ZR_(start_, end_);

+#undef ZR_HELPER_

+#undef ZR_

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool DescriptorProto_ReservedRange::MergePartialFromCodedStream(

@@ -2870,33 +2823,36 @@ bool DescriptorProto_ReservedRange::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ReservedRange)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional int32 start = 1;

case 1: {

- if (tag == 8u) {

- set_has_start();

+ if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &start_)));

+ set_has_start();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_end;

break;

}

// optional int32 end = 2;

case 2: {

- if (tag == 16u) {

- set_has_end();

+ if (tag == 16) {

+ parse_end:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &end_)));

+ set_has_end();

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -2942,9 +2898,8 @@ void DescriptorProto_ReservedRange::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ReservedRange)

}

-::google::protobuf::uint8* DescriptorProto_ReservedRange::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* DescriptorProto_ReservedRange::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ReservedRange)

// optional int32 start = 1;

if (has_start()) {

@@ -2964,15 +2919,10 @@ void DescriptorProto_ReservedRange::SerializeWithCachedSizes(

return target;

}

-size_t DescriptorProto_ReservedRange::ByteSizeLong() const {

+int DescriptorProto_ReservedRange::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ReservedRange)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (_has_bits_[0 / 32] & 3u) {

// optional int32 start = 1;

if (has_start()) {

@@ -2989,17 +2939,21 @@ size_t DescriptorProto_ReservedRange::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ReservedRange)

- GOOGLE_DCHECK_NE(&from, this);

- const DescriptorProto_ReservedRange* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const DescriptorProto_ReservedRange* source =

::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto_ReservedRange>(

&from);

if (source == NULL) {

@@ -3013,9 +2967,8 @@ void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message&

void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRange& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ReservedRange)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_start()) {

set_start(from.start());

}

@@ -3023,6 +2976,9 @@ void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRang

set_end(from.end());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void DescriptorProto_ReservedRange::CopyFrom(const ::google::protobuf::Message& from) {

@@ -3040,6 +2996,7 @@ void DescriptorProto_ReservedRange::CopyFrom(const DescriptorProto_ReservedRange

}

bool DescriptorProto_ReservedRange::IsInitialized() const {

return true;

}

@@ -3057,63 +3014,14 @@ void DescriptorProto_ReservedRange::InternalSwap(DescriptorProto_ReservedRange*

::google::protobuf::Metadata DescriptorProto_ReservedRange::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[3];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = DescriptorProto_ReservedRange_descriptor_;

+ metadata.reflection = DescriptorProto_ReservedRange_reflection_;

+ return metadata;

}

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// DescriptorProto_ReservedRange

-// optional int32 start = 1;

-bool DescriptorProto_ReservedRange::has_start() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

-void DescriptorProto_ReservedRange::set_has_start() {

- _has_bits_[0] |= 0x00000001u;

-void DescriptorProto_ReservedRange::clear_has_start() {

- _has_bits_[0] &= ~0x00000001u;

-void DescriptorProto_ReservedRange::clear_start() {

- start_ = 0;

- clear_has_start();

-::google::protobuf::int32 DescriptorProto_ReservedRange::start() const {

- // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start)

- return start_;

-void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) {

- set_has_start();

- start_ = value;

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

-// optional int32 end = 2;

-bool DescriptorProto_ReservedRange::has_end() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void DescriptorProto_ReservedRange::set_has_end() {

- _has_bits_[0] |= 0x00000002u;

-void DescriptorProto_ReservedRange::clear_has_end() {

- _has_bits_[0] &= ~0x00000002u;

-void DescriptorProto_ReservedRange::clear_end() {

- end_ = 0;

- clear_has_end();

-::google::protobuf::int32 DescriptorProto_ReservedRange::end() const {

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

- return end_;

-void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) {

- set_has_end();

- end_ = value;

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

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int DescriptorProto::kNameFieldNumber;

@@ -3130,42 +3038,28 @@ const int DescriptorProto::kReservedNameFieldNumber;

DescriptorProto::DescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto)

}

+void DescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::MessageOptions*>(&::google::protobuf::MessageOptions::default_instance());

DescriptorProto::DescriptorProto(const DescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- field_(from.field_),

- extension_(from.extension_),

- nested_type_(from.nested_type_),

- enum_type_(from.enum_type_),

- extension_range_(from.extension_range_),

- oneof_decl_(from.oneof_decl_),

- reserved_range_(from.reserved_range_),

- reserved_name_(from.reserved_name_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::MessageOptions(*from.options_);

- } else {

- options_ = NULL;

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto)

}

void DescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

DescriptorProto::~DescriptorProto() {

@@ -3175,7 +3069,7 @@ DescriptorProto::~DescriptorProto() {

void DescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -3187,14 +3081,16 @@ void DescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* DescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[4].descriptor;

+ return DescriptorProto_descriptor_;

}

const DescriptorProto& DescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+DescriptorProto* DescriptorProto::default_instance_ = NULL;

DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const {

DescriptorProto* n = new DescriptorProto;

if (arena != NULL) {

@@ -3205,6 +3101,14 @@ DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const {

void DescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto)

+ if (_has_bits_[0 / 32] & 129u) {

+ if (has_name()) {

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ }

+ if (has_options()) {

+ if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();

+ }

field_.Clear();

extension_.Clear();

nested_type_.Clear();

@@ -3213,18 +3117,10 @@ void DescriptorProto::Clear() {

oneof_decl_.Clear();

reserved_range_.Clear();

reserved_name_.Clear();

- if (_has_bits_[0 / 32] & 3u) {

- if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

- }

- if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::MessageOptions::Clear();

- }

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool DescriptorProto::MergePartialFromCodedStream(

@@ -3233,13 +3129,13 @@ bool DescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -3249,114 +3145,141 @@ bool DescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_field;

break;

}

// repeated .google.protobuf.FieldDescriptorProto field = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_field:

DO_(input->IncrementRecursionDepth());

+ parse_loop_field:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_field()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_loop_field;

+ if (input->ExpectTag(26)) goto parse_loop_nested_type;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.DescriptorProto nested_type = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_nested_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_nested_type()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_loop_nested_type;

+ if (input->ExpectTag(34)) goto parse_loop_enum_type;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;

case 4: {

- if (tag == 34u) {

+ if (tag == 34) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_enum_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_enum_type()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(34)) goto parse_loop_enum_type;

+ if (input->ExpectTag(42)) goto parse_loop_extension_range;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;

case 5: {

- if (tag == 42u) {

+ if (tag == 42) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_extension_range:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_extension_range()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(42)) goto parse_loop_extension_range;

+ if (input->ExpectTag(50)) goto parse_loop_extension;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.FieldDescriptorProto extension = 6;

case 6: {

- if (tag == 50u) {

+ if (tag == 50) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_extension:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_extension()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(50)) goto parse_loop_extension;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(58)) goto parse_options;

break;

}

// optional .google.protobuf.MessageOptions options = 7;

case 7: {

- if (tag == 58u) {

+ if (tag == 58) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(66)) goto parse_oneof_decl;

break;

}

// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;

case 8: {

- if (tag == 66u) {

+ if (tag == 66) {

+ parse_oneof_decl:

DO_(input->IncrementRecursionDepth());

+ parse_loop_oneof_decl:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_oneof_decl()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(66)) goto parse_loop_oneof_decl;

+ if (input->ExpectTag(74)) goto parse_loop_reserved_range;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;

case 9: {

- if (tag == 74u) {

+ if (tag == 74) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_reserved_range:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_reserved_range()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(74)) goto parse_loop_reserved_range;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(82)) goto parse_reserved_name;

break;

}

// repeated string reserved_name = 10;

case 10: {

- if (tag == 82u) {

+ if (tag == 82) {

+ parse_reserved_name:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->add_reserved_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -3367,6 +3290,8 @@ bool DescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(82)) goto parse_reserved_name;

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -3470,9 +3395,8 @@ void DescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto)

}

-::google::protobuf::uint8* DescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -3488,57 +3412,57 @@ void DescriptorProto::SerializeWithCachedSizes(

// repeated .google.protobuf.FieldDescriptorProto field = 2;

for (unsigned int i = 0, n = this->field_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 2, this->field(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 2, this->field(i), target);

}

// repeated .google.protobuf.DescriptorProto nested_type = 3;

for (unsigned int i = 0, n = this->nested_type_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 3, this->nested_type(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 3, this->nested_type(i), target);

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;

for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 4, this->enum_type(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 4, this->enum_type(i), target);

}

// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;

for (unsigned int i = 0, n = this->extension_range_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 5, this->extension_range(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 5, this->extension_range(i), target);

}

// repeated .google.protobuf.FieldDescriptorProto extension = 6;

for (unsigned int i = 0, n = this->extension_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 6, this->extension(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 6, this->extension(i), target);

}

// optional .google.protobuf.MessageOptions options = 7;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 7, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 7, *this->options_, target);

}

// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;

for (unsigned int i = 0, n = this->oneof_decl_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 8, this->oneof_decl(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 8, this->oneof_decl(i), target);

}

// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;

for (unsigned int i = 0, n = this->reserved_range_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 9, this->reserved_range(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 9, this->reserved_range(i), target);

}

// repeated string reserved_name = 10;

@@ -3559,127 +3483,104 @@ void DescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t DescriptorProto::ByteSizeLong() const {

+int DescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.FieldDescriptorProto field = 2;

- {

- unsigned int count = this->field_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

+ if (_has_bits_[0 / 32] & 129u) {

+ // optional string name = 1;

+ if (has_name()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->name());

+ }

+ // optional .google.protobuf.MessageOptions options = 7;

+ if (has_options()) {

+ total_size += 1 +

::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->field(i));

+ *this->options_);

}

+ }

+ // repeated .google.protobuf.FieldDescriptorProto field = 2;

+ total_size += 1 * this->field_size();

+ for (int i = 0; i < this->field_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->field(i));

}

// repeated .google.protobuf.FieldDescriptorProto extension = 6;

- {

- unsigned int count = this->extension_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->extension(i));

- }

+ total_size += 1 * this->extension_size();

+ for (int i = 0; i < this->extension_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->extension(i));

}

// repeated .google.protobuf.DescriptorProto nested_type = 3;

- {

- unsigned int count = this->nested_type_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->nested_type(i));

- }

+ total_size += 1 * this->nested_type_size();

+ for (int i = 0; i < this->nested_type_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->nested_type(i));

}

// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;

- {

- unsigned int count = this->enum_type_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->enum_type(i));

- }

+ total_size += 1 * this->enum_type_size();

+ for (int i = 0; i < this->enum_type_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->enum_type(i));

}

// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;

- {

- unsigned int count = this->extension_range_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->extension_range(i));

- }

+ total_size += 1 * this->extension_range_size();

+ for (int i = 0; i < this->extension_range_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->extension_range(i));

}

// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;

- {

- unsigned int count = this->oneof_decl_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->oneof_decl(i));

- }

+ total_size += 1 * this->oneof_decl_size();

+ for (int i = 0; i < this->oneof_decl_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->oneof_decl(i));

}

// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;

- {

- unsigned int count = this->reserved_range_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->reserved_range(i));

- }

+ total_size += 1 * this->reserved_range_size();

+ for (int i = 0; i < this->reserved_range_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->reserved_range(i));

}

// repeated string reserved_name = 10;

- total_size += 1 *

- ::google::protobuf::internal::FromIntSize(this->reserved_name_size());

+ total_size += 1 * this->reserved_name_size();

for (int i = 0; i < this->reserved_name_size(); i++) {

total_size += ::google::protobuf::internal::WireFormatLite::StringSize(

this->reserved_name(i));

}

- if (_has_bits_[0 / 32] & 3u) {

- // optional string name = 1;

- if (has_name()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->name());

- }

- // optional .google.protobuf.MessageOptions options = 7;

- if (has_options()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->options_);

- }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const DescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const DescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto>(

&from);

if (source == NULL) {

@@ -3693,8 +3594,7 @@ void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void DescriptorProto::MergeFrom(const DescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

field_.MergeFrom(from.field_);

extension_.MergeFrom(from.extension_);

nested_type_.MergeFrom(from.nested_type_);

@@ -3703,7 +3603,7 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) {

oneof_decl_.MergeFrom(from.oneof_decl_);

reserved_range_.MergeFrom(from.reserved_range_);

reserved_name_.MergeFrom(from.reserved_name_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

@@ -3712,6 +3612,9 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) {

mutable_options()->::google::protobuf::MessageOptions::MergeFrom(from.options());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void DescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {

@@ -3729,11 +3632,11 @@ void DescriptorProto::CopyFrom(const DescriptorProto& from) {

}

bool DescriptorProto::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->field())) return false;

if (!::google::protobuf::internal::AllAreInitialized(this->extension())) return false;

if (!::google::protobuf::internal::AllAreInitialized(this->nested_type())) return false;

if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false;

- if (!::google::protobuf::internal::AllAreInitialized(this->oneof_decl())) return false;

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

}

@@ -3745,16 +3648,16 @@ void DescriptorProto::Swap(DescriptorProto* other) {

InternalSwap(other);

}

void DescriptorProto::InternalSwap(DescriptorProto* other) {

+ name_.Swap(&other->name_);

field_.UnsafeArenaSwap(&other->field_);

extension_.UnsafeArenaSwap(&other->extension_);

nested_type_.UnsafeArenaSwap(&other->nested_type_);

enum_type_.UnsafeArenaSwap(&other->enum_type_);

extension_range_.UnsafeArenaSwap(&other->extension_range_);

oneof_decl_.UnsafeArenaSwap(&other->oneof_decl_);

+ std::swap(options_, other->options_);

reserved_range_.UnsafeArenaSwap(&other->reserved_range_);

reserved_name_.UnsafeArenaSwap(&other->reserved_name_);

- name_.Swap(&other->name_);

- std::swap(options_, other->options_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -3762,10 +3665,117 @@ void DescriptorProto::InternalSwap(DescriptorProto* other) {

::google::protobuf::Metadata DescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[4];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = DescriptorProto_descriptor_;

+ metadata.reflection = DescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

+// DescriptorProto_ExtensionRange

+// optional int32 start = 1;

+bool DescriptorProto_ExtensionRange::has_start() const {

+ return (_has_bits_[0] & 0x00000001u) != 0;

+void DescriptorProto_ExtensionRange::set_has_start() {

+ _has_bits_[0] |= 0x00000001u;

+void DescriptorProto_ExtensionRange::clear_has_start() {

+ _has_bits_[0] &= ~0x00000001u;

+void DescriptorProto_ExtensionRange::clear_start() {

+ start_ = 0;

+ clear_has_start();

+ ::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start)

+ return start_;

+ void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) {

+ set_has_start();

+ start_ = value;

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

+// optional int32 end = 2;

+bool DescriptorProto_ExtensionRange::has_end() const {

+ return (_has_bits_[0] & 0x00000002u) != 0;

+void DescriptorProto_ExtensionRange::set_has_end() {

+ _has_bits_[0] |= 0x00000002u;

+void DescriptorProto_ExtensionRange::clear_has_end() {

+ _has_bits_[0] &= ~0x00000002u;

+void DescriptorProto_ExtensionRange::clear_end() {

+ end_ = 0;

+ clear_has_end();

+ ::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const {

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

+ return end_;

+ void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) {

+ set_has_end();

+ end_ = value;

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

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

+// DescriptorProto_ReservedRange

+// optional int32 start = 1;

+bool DescriptorProto_ReservedRange::has_start() const {

+ return (_has_bits_[0] & 0x00000001u) != 0;

+void DescriptorProto_ReservedRange::set_has_start() {

+ _has_bits_[0] |= 0x00000001u;

+void DescriptorProto_ReservedRange::clear_has_start() {

+ _has_bits_[0] &= ~0x00000001u;

+void DescriptorProto_ReservedRange::clear_start() {

+ start_ = 0;

+ clear_has_start();

+ ::google::protobuf::int32 DescriptorProto_ReservedRange::start() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start)

+ return start_;

+ void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) {

+ set_has_start();

+ start_ = value;

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

+// optional int32 end = 2;

+bool DescriptorProto_ReservedRange::has_end() const {

+ return (_has_bits_[0] & 0x00000002u) != 0;

+void DescriptorProto_ReservedRange::set_has_end() {

+ _has_bits_[0] |= 0x00000002u;

+void DescriptorProto_ReservedRange::clear_has_end() {

+ _has_bits_[0] &= ~0x00000002u;

+void DescriptorProto_ReservedRange::clear_end() {

+ end_ = 0;

+ clear_has_end();

+ ::google::protobuf::int32 DescriptorProto_ReservedRange::end() const {

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

+ return end_;

+ void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) {

+ set_has_end();

+ end_ = value;

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

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

// DescriptorProto

// optional string name = 1;

@@ -3782,37 +3792,37 @@ void DescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& DescriptorProto::name() const {

+ const ::std::string& DescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void DescriptorProto::set_name(const ::std::string& value) {

+ void DescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name)

}

-void DescriptorProto::set_name(const char* value) {

+ void DescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.name)

}

-void DescriptorProto::set_name(const char* value, size_t size) {

+ void DescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.name)

}

-::std::string* DescriptorProto::mutable_name() {

+ ::std::string* DescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* DescriptorProto::release_name() {

+ ::std::string* DescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void DescriptorProto::set_allocated_name(::std::string* name) {

+ void DescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -4004,13 +4014,13 @@ DescriptorProto::oneof_decl() const {

// optional .google.protobuf.MessageOptions options = 7;

bool DescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000080u) != 0;

}

void DescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000080u;

}

void DescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000080u;

}

void DescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();

@@ -4018,8 +4028,7 @@ void DescriptorProto::clear_options() {

}

const ::google::protobuf::MessageOptions& DescriptorProto::options() const {

// @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -4084,49 +4093,49 @@ int DescriptorProto::reserved_name_size() const {

void DescriptorProto::clear_reserved_name() {

reserved_name_.Clear();

}

-const ::std::string& DescriptorProto::reserved_name(int index) const {

+ const ::std::string& DescriptorProto::reserved_name(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_name)

return reserved_name_.Get(index);

}

-::std::string* DescriptorProto::mutable_reserved_name(int index) {

+ ::std::string* DescriptorProto::mutable_reserved_name(int index) {

// @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_name)

return reserved_name_.Mutable(index);

}

-void DescriptorProto::set_reserved_name(int index, const ::std::string& value) {

+ void DescriptorProto::set_reserved_name(int index, const ::std::string& value) {

// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name)

reserved_name_.Mutable(index)->assign(value);

}

-void DescriptorProto::set_reserved_name(int index, const char* value) {

+ void DescriptorProto::set_reserved_name(int index, const char* value) {

reserved_name_.Mutable(index)->assign(value);

// @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.reserved_name)

}

-void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) {

+ void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) {

reserved_name_.Mutable(index)->assign(

reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.reserved_name)

}

-::std::string* DescriptorProto::add_reserved_name() {

+ ::std::string* DescriptorProto::add_reserved_name() {

// @@protoc_insertion_point(field_add_mutable:google.protobuf.DescriptorProto.reserved_name)

return reserved_name_.Add();

}

-void DescriptorProto::add_reserved_name(const ::std::string& value) {

+ void DescriptorProto::add_reserved_name(const ::std::string& value) {

reserved_name_.Add()->assign(value);

// @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)

}

-void DescriptorProto::add_reserved_name(const char* value) {

+ void DescriptorProto::add_reserved_name(const char* value) {

reserved_name_.Add()->assign(value);

// @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name)

}

-void DescriptorProto::add_reserved_name(const char* value, size_t size) {

+ void DescriptorProto::add_reserved_name(const char* value, size_t size) {

reserved_name_.Add()->assign(reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name)

}

-const ::google::protobuf::RepeatedPtrField< ::std::string>&

+ const ::google::protobuf::RepeatedPtrField< ::std::string>&

DescriptorProto::reserved_name() const {

// @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name)

return reserved_name_;

}

-::google::protobuf::RepeatedPtrField< ::std::string>*

+ ::google::protobuf::RepeatedPtrField< ::std::string>*

DescriptorProto::mutable_reserved_name() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name)

return &reserved_name_;

@@ -4136,75 +4145,127 @@ DescriptorProto::mutable_reserved_name() {

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

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int FieldDescriptorProto::kNameFieldNumber;

-const int FieldDescriptorProto::kNumberFieldNumber;

-const int FieldDescriptorProto::kLabelFieldNumber;

-const int FieldDescriptorProto::kTypeFieldNumber;

-const int FieldDescriptorProto::kTypeNameFieldNumber;

-const int FieldDescriptorProto::kExtendeeFieldNumber;

-const int FieldDescriptorProto::kDefaultValueFieldNumber;

-const int FieldDescriptorProto::kOneofIndexFieldNumber;

-const int FieldDescriptorProto::kJsonNameFieldNumber;

-const int FieldDescriptorProto::kOptionsFieldNumber;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-FieldDescriptorProto::FieldDescriptorProto()

- : ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

- SharedCtor();

+const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return FieldDescriptorProto_Type_descriptor_;

+bool FieldDescriptorProto_Type_IsValid(int value) {

+ switch(value) {

+ case 1:

+ case 2:

+ case 3:

+ case 4:

+ case 5:

+ case 6:

+ case 7:

+ case 8:

+ case 9:

+ case 10:

+ case 11:

+ case 12:

+ case 13:

+ case 14:

+ case 15:

+ case 16:

+ case 17:

+ case 18:

+ return true;

+ default:

+ return false;

+ }

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32;

+const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64;

+const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN;

+const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX;

+const int FieldDescriptorProto::Type_ARRAYSIZE;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

+const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return FieldDescriptorProto_Label_descriptor_;

+bool FieldDescriptorProto_Label_IsValid(int value) {

+ switch(value) {

+ case 1:

+ case 2:

+ case 3:

+ return true;

+ default:

+ return false;

+ }

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL;

+const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED;

+const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED;

+const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN;

+const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX;

+const int FieldDescriptorProto::Label_ARRAYSIZE;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const int FieldDescriptorProto::kNameFieldNumber;

+const int FieldDescriptorProto::kNumberFieldNumber;

+const int FieldDescriptorProto::kLabelFieldNumber;

+const int FieldDescriptorProto::kTypeFieldNumber;

+const int FieldDescriptorProto::kTypeNameFieldNumber;

+const int FieldDescriptorProto::kExtendeeFieldNumber;

+const int FieldDescriptorProto::kDefaultValueFieldNumber;

+const int FieldDescriptorProto::kOneofIndexFieldNumber;

+const int FieldDescriptorProto::kJsonNameFieldNumber;

+const int FieldDescriptorProto::kOptionsFieldNumber;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

+FieldDescriptorProto::FieldDescriptorProto()

+ : ::google::protobuf::Message(), _internal_metadata_(NULL) {

+ SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.FieldDescriptorProto)

}

+void FieldDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::FieldOptions*>(&::google::protobuf::FieldOptions::default_instance());

FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_type_name()) {

- type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_);

- }

- extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_extendee()) {

- extendee_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.extendee_);

- }

- default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_default_value()) {

- default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_);

- }

- json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_json_name()) {

- json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::FieldOptions(*from.options_);

- } else {

- options_ = NULL;

- }

- ::memcpy(&number_, &from.number_,

- reinterpret_cast<char*>(&type_) -

- reinterpret_cast<char*>(&number_) + sizeof(type_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldDescriptorProto)

}

void FieldDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ number_ = 0;

+ label_ = 1;

+ type_ = 1;

type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ oneof_index_ = 0;

json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&options_, 0, reinterpret_cast<char*>(&oneof_index_) -

- reinterpret_cast<char*>(&options_) + sizeof(oneof_index_));

- label_ = 1;

- type_ = 1;

+ options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

FieldDescriptorProto::~FieldDescriptorProto() {

@@ -4218,7 +4279,7 @@ void FieldDescriptorProto::SharedDtor() {

extendee_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

default_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

json_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -4230,14 +4291,16 @@ void FieldDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* FieldDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[5].descriptor;

+ return FieldDescriptorProto_descriptor_;

}

const FieldDescriptorProto& FieldDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+FieldDescriptorProto* FieldDescriptorProto::default_instance_ = NULL;

FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena) const {

FieldDescriptorProto* n = new FieldDescriptorProto;

if (arena != NULL) {

@@ -4248,42 +4311,36 @@ FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena

void FieldDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto)

- if (_has_bits_[0 / 32] & 63u) {

+ if (_has_bits_[0 / 32] & 255u) {

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ number_ = 0;

+ label_ = 1;

+ type_ = 1;

if (has_type_name()) {

- GOOGLE_DCHECK(!type_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*type_name_.UnsafeRawStringPointer())->clear();

+ type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_extendee()) {

- GOOGLE_DCHECK(!extendee_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*extendee_.UnsafeRawStringPointer())->clear();

+ extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_default_value()) {

- GOOGLE_DCHECK(!default_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*default_value_.UnsafeRawStringPointer())->clear();

+ default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ oneof_index_ = 0;

+ }

+ if (_has_bits_[8 / 32] & 768u) {

if (has_json_name()) {

- GOOGLE_DCHECK(!json_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*json_name_.UnsafeRawStringPointer())->clear();

+ json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::FieldOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();

}

- if (_has_bits_[0 / 32] & 192u) {

- ::memset(&number_, 0, reinterpret_cast<char*>(&oneof_index_) -

- reinterpret_cast<char*>(&number_) + sizeof(oneof_index_));

- }

- if (_has_bits_[8 / 32] & 768u) {

- label_ = 1;

- type_ = 1;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool FieldDescriptorProto::MergePartialFromCodedStream(

@@ -4292,13 +4349,13 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.FieldDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -4308,12 +4365,14 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_extendee;

break;

}

// optional string extendee = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_extendee:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_extendee()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -4323,25 +4382,29 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(24)) goto parse_number;

break;

}

// optional int32 number = 3;

case 3: {

- if (tag == 24u) {

- set_has_number();

+ if (tag == 24) {

+ parse_number:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &number_)));

+ set_has_number();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(32)) goto parse_label;

break;

}

// optional .google.protobuf.FieldDescriptorProto.Label label = 4;

case 4: {

- if (tag == 32u) {

+ if (tag == 32) {

+ parse_label:

int value;

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -4354,12 +4417,14 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(40)) goto parse_type;

break;

}

// optional .google.protobuf.FieldDescriptorProto.Type type = 5;

case 5: {

- if (tag == 40u) {

+ if (tag == 40) {

+ parse_type:

int value;

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -4372,12 +4437,14 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(50)) goto parse_type_name;

break;

}

// optional string type_name = 6;

case 6: {

- if (tag == 50u) {

+ if (tag == 50) {

+ parse_type_name:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_type_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -4387,12 +4454,14 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(58)) goto parse_default_value;

break;

}

// optional string default_value = 7;

case 7: {

- if (tag == 58u) {

+ if (tag == 58) {

+ parse_default_value:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_default_value()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -4402,36 +4471,42 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(66)) goto parse_options;

break;

}

// optional .google.protobuf.FieldOptions options = 8;

case 8: {

- if (tag == 66u) {

+ if (tag == 66) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(72)) goto parse_oneof_index;

break;

}

// optional int32 oneof_index = 9;

case 9: {

- if (tag == 72u) {

- set_has_oneof_index();

+ if (tag == 72) {

+ parse_oneof_index:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &oneof_index_)));

+ set_has_oneof_index();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(82)) goto parse_json_name;

break;

}

// optional string json_name = 10;

case 10: {

- if (tag == 82u) {

+ if (tag == 82) {

+ parse_json_name:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_json_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -4441,6 +4516,7 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -4554,9 +4630,8 @@ void FieldDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.FieldDescriptorProto)

}

-::google::protobuf::uint8* FieldDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -4622,8 +4697,8 @@ void FieldDescriptorProto::SerializeWithCachedSizes(

// optional .google.protobuf.FieldOptions options = 8;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 8, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 8, *this->options_, target);

}

// optional int32 oneof_index = 9;

@@ -4650,15 +4725,10 @@ void FieldDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t FieldDescriptorProto::ByteSizeLong() const {

+int FieldDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (_has_bits_[0 / 32] & 255u) {

// optional string name = 1;

if (has_name()) {

@@ -4667,6 +4737,25 @@ size_t FieldDescriptorProto::ByteSizeLong() const {

this->name());

}

+ // optional int32 number = 3;

+ if (has_number()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::Int32Size(

+ this->number());

+ }

+ // optional .google.protobuf.FieldDescriptorProto.Label label = 4;

+ if (has_label()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->label());

+ }

+ // optional .google.protobuf.FieldDescriptorProto.Type type = 5;

+ if (has_type()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());

+ }

// optional string type_name = 6;

if (has_type_name()) {

total_size += 1 +

@@ -4688,27 +4777,6 @@ size_t FieldDescriptorProto::ByteSizeLong() const {

this->default_value());

}

- // optional string json_name = 10;

- if (has_json_name()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->json_name());

- }

- // optional .google.protobuf.FieldOptions options = 8;

- if (has_options()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->options_);

- }

- // optional int32 number = 3;

- if (has_number()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::Int32Size(

- this->number());

- }

// optional int32 oneof_index = 9;

if (has_oneof_index()) {

total_size += 1 +

@@ -4718,30 +4786,36 @@ size_t FieldDescriptorProto::ByteSizeLong() const {

}

if (_has_bits_[8 / 32] & 768u) {

- // optional .google.protobuf.FieldDescriptorProto.Label label = 4;

- if (has_label()) {

+ // optional string json_name = 10;

+ if (has_json_name()) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->label());

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->json_name());

}

- // optional .google.protobuf.FieldDescriptorProto.Type type = 5;

- if (has_type()) {

+ // optional .google.protobuf.FieldOptions options = 8;

+ if (has_options()) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ *this->options_);

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const FieldDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const FieldDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const FieldDescriptorProto>(

&from);

if (source == NULL) {

@@ -4755,13 +4829,21 @@ void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 255u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

}

+ if (from.has_number()) {

+ set_number(from.number());

+ }

+ if (from.has_label()) {

+ set_label(from.label());

+ }

+ if (from.has_type()) {

+ set_type(from.type());

+ }

if (from.has_type_name()) {

set_has_type_name();

type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_);

@@ -4774,6 +4856,11 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) {

set_has_default_value();

default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_);

}

+ if (from.has_oneof_index()) {

+ set_oneof_index(from.oneof_index());

+ }

+ if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {

if (from.has_json_name()) {

set_has_json_name();

json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_);

@@ -4781,20 +4868,9 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) {

if (from.has_options()) {

mutable_options()->::google::protobuf::FieldOptions::MergeFrom(from.options());

}

- if (from.has_number()) {

- set_number(from.number());

- }

- if (from.has_oneof_index()) {

- set_oneof_index(from.oneof_index());

- }

}

- if (from._has_bits_[8 / 32] & 768u) {

- if (from.has_label()) {

- set_label(from.label());

- }

- if (from.has_type()) {

- set_type(from.type());

- }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

@@ -4813,6 +4889,7 @@ void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) {

}

bool FieldDescriptorProto::IsInitialized() const {

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

}

@@ -4825,15 +4902,15 @@ void FieldDescriptorProto::Swap(FieldDescriptorProto* other) {

}

void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) {

name_.Swap(&other->name_);

+ std::swap(number_, other->number_);

+ std::swap(label_, other->label_);

+ std::swap(type_, other->type_);

type_name_.Swap(&other->type_name_);

extendee_.Swap(&other->extendee_);

default_value_.Swap(&other->default_value_);

+ std::swap(oneof_index_, other->oneof_index_);

json_name_.Swap(&other->json_name_);

std::swap(options_, other->options_);

- std::swap(number_, other->number_);

- std::swap(oneof_index_, other->oneof_index_);

- std::swap(label_, other->label_);

- std::swap(type_, other->type_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -4841,7 +4918,10 @@ void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) {

::google::protobuf::Metadata FieldDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[5];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = FieldDescriptorProto_descriptor_;

+ metadata.reflection = FieldDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -4861,37 +4941,37 @@ void FieldDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& FieldDescriptorProto::name() const {

+ const ::std::string& FieldDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_name(const ::std::string& value) {

+ void FieldDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name)

}

-void FieldDescriptorProto::set_name(const char* value) {

+ void FieldDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.name)

}

-void FieldDescriptorProto::set_name(const char* value, size_t size) {

+ void FieldDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.name)

}

-::std::string* FieldDescriptorProto::mutable_name() {

+ ::std::string* FieldDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FieldDescriptorProto::release_name() {

+ ::std::string* FieldDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_allocated_name(::std::string* name) {

+ void FieldDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -4903,23 +4983,23 @@ void FieldDescriptorProto::set_allocated_name(::std::string* name) {

// optional int32 number = 3;

bool FieldDescriptorProto::has_number() const {

- return (_has_bits_[0] & 0x00000040u) != 0;

+ return (_has_bits_[0] & 0x00000002u) != 0;

}

void FieldDescriptorProto::set_has_number() {

- _has_bits_[0] |= 0x00000040u;

+ _has_bits_[0] |= 0x00000002u;

}

void FieldDescriptorProto::clear_has_number() {

- _has_bits_[0] &= ~0x00000040u;

+ _has_bits_[0] &= ~0x00000002u;

}

void FieldDescriptorProto::clear_number() {

number_ = 0;

clear_has_number();

}

-::google::protobuf::int32 FieldDescriptorProto::number() const {

+ ::google::protobuf::int32 FieldDescriptorProto::number() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.number)

return number_;

}

-void FieldDescriptorProto::set_number(::google::protobuf::int32 value) {

+ void FieldDescriptorProto::set_number(::google::protobuf::int32 value) {

set_has_number();

number_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)

@@ -4927,23 +5007,23 @@ void FieldDescriptorProto::set_number(::google::protobuf::int32 value) {

// optional .google.protobuf.FieldDescriptorProto.Label label = 4;

bool FieldDescriptorProto::has_label() const {

- return (_has_bits_[0] & 0x00000100u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void FieldDescriptorProto::set_has_label() {

- _has_bits_[0] |= 0x00000100u;

+ _has_bits_[0] |= 0x00000004u;

}

void FieldDescriptorProto::clear_has_label() {

- _has_bits_[0] &= ~0x00000100u;

+ _has_bits_[0] &= ~0x00000004u;

}

void FieldDescriptorProto::clear_label() {

label_ = 1;

clear_has_label();

}

-::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const {

+ ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.label)

return static_cast< ::google::protobuf::FieldDescriptorProto_Label >(label_);

}

-void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) {

+ void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) {

assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));

set_has_label();

label_ = value;

@@ -4952,23 +5032,23 @@ void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_La

// optional .google.protobuf.FieldDescriptorProto.Type type = 5;

bool FieldDescriptorProto::has_type() const {

- return (_has_bits_[0] & 0x00000200u) != 0;

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

}

void FieldDescriptorProto::set_has_type() {

- _has_bits_[0] |= 0x00000200u;

+ _has_bits_[0] |= 0x00000008u;

}

void FieldDescriptorProto::clear_has_type() {

- _has_bits_[0] &= ~0x00000200u;

+ _has_bits_[0] &= ~0x00000008u;

}

void FieldDescriptorProto::clear_type() {

type_ = 1;

clear_has_type();

}

-::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const {

+ ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type)

return static_cast< ::google::protobuf::FieldDescriptorProto_Type >(type_);

}

-void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) {

+ void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) {

assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));

set_has_type();

type_ = value;

@@ -4977,49 +5057,49 @@ void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Typ

// optional string type_name = 6;

bool FieldDescriptorProto::has_type_name() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000010u) != 0;

}

void FieldDescriptorProto::set_has_type_name() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000010u;

}

void FieldDescriptorProto::clear_has_type_name() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000010u;

}

void FieldDescriptorProto::clear_type_name() {

type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_type_name();

}

-const ::std::string& FieldDescriptorProto::type_name() const {

+ const ::std::string& FieldDescriptorProto::type_name() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name)

- return type_name_.GetNoArena();

+ return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_type_name(const ::std::string& value) {

+ void FieldDescriptorProto::set_type_name(const ::std::string& value) {

set_has_type_name();

type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name)

}

-void FieldDescriptorProto::set_type_name(const char* value) {

+ void FieldDescriptorProto::set_type_name(const char* value) {

set_has_type_name();

type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.type_name)

}

-void FieldDescriptorProto::set_type_name(const char* value, size_t size) {

+ void FieldDescriptorProto::set_type_name(const char* value, size_t size) {

set_has_type_name();

type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.type_name)

}

-::std::string* FieldDescriptorProto::mutable_type_name() {

+ ::std::string* FieldDescriptorProto::mutable_type_name() {

set_has_type_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.type_name)

return type_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FieldDescriptorProto::release_type_name() {

+ ::std::string* FieldDescriptorProto::release_type_name() {

// @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name)

clear_has_type_name();

return type_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) {

+ void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) {

if (type_name != NULL) {

set_has_type_name();

} else {

@@ -5031,49 +5111,49 @@ void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) {

// optional string extendee = 2;

bool FieldDescriptorProto::has_extendee() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000020u) != 0;

}

void FieldDescriptorProto::set_has_extendee() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000020u;

}

void FieldDescriptorProto::clear_has_extendee() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000020u;

}

void FieldDescriptorProto::clear_extendee() {

extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_extendee();

}

-const ::std::string& FieldDescriptorProto::extendee() const {

+ const ::std::string& FieldDescriptorProto::extendee() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee)

- return extendee_.GetNoArena();

+ return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_extendee(const ::std::string& value) {

+ void FieldDescriptorProto::set_extendee(const ::std::string& value) {

set_has_extendee();

extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee)

}

-void FieldDescriptorProto::set_extendee(const char* value) {

+ void FieldDescriptorProto::set_extendee(const char* value) {

set_has_extendee();

extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.extendee)

}

-void FieldDescriptorProto::set_extendee(const char* value, size_t size) {

+ void FieldDescriptorProto::set_extendee(const char* value, size_t size) {

set_has_extendee();

extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.extendee)

}

-::std::string* FieldDescriptorProto::mutable_extendee() {

+ ::std::string* FieldDescriptorProto::mutable_extendee() {

set_has_extendee();

// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee)

return extendee_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FieldDescriptorProto::release_extendee() {

+ ::std::string* FieldDescriptorProto::release_extendee() {

// @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee)

clear_has_extendee();

return extendee_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) {

+ void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) {

if (extendee != NULL) {

set_has_extendee();

} else {

@@ -5085,49 +5165,49 @@ void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) {

// optional string default_value = 7;

bool FieldDescriptorProto::has_default_value() const {

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

+ return (_has_bits_[0] & 0x00000040u) != 0;

}

void FieldDescriptorProto::set_has_default_value() {

- _has_bits_[0] |= 0x00000008u;

+ _has_bits_[0] |= 0x00000040u;

}

void FieldDescriptorProto::clear_has_default_value() {

- _has_bits_[0] &= ~0x00000008u;

+ _has_bits_[0] &= ~0x00000040u;

}

void FieldDescriptorProto::clear_default_value() {

default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_default_value();

}

-const ::std::string& FieldDescriptorProto::default_value() const {

+ const ::std::string& FieldDescriptorProto::default_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value)

- return default_value_.GetNoArena();

+ return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_default_value(const ::std::string& value) {

+ void FieldDescriptorProto::set_default_value(const ::std::string& value) {

set_has_default_value();

default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value)

}

-void FieldDescriptorProto::set_default_value(const char* value) {

+ void FieldDescriptorProto::set_default_value(const char* value) {

set_has_default_value();

default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.default_value)

}

-void FieldDescriptorProto::set_default_value(const char* value, size_t size) {

+ void FieldDescriptorProto::set_default_value(const char* value, size_t size) {

set_has_default_value();

default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.default_value)

}

-::std::string* FieldDescriptorProto::mutable_default_value() {

+ ::std::string* FieldDescriptorProto::mutable_default_value() {

set_has_default_value();

// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.default_value)

return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FieldDescriptorProto::release_default_value() {

+ ::std::string* FieldDescriptorProto::release_default_value() {

// @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value)

clear_has_default_value();

return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) {

+ void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) {

if (default_value != NULL) {

set_has_default_value();

} else {

@@ -5151,11 +5231,11 @@ void FieldDescriptorProto::clear_oneof_index() {

oneof_index_ = 0;

clear_has_oneof_index();

}

-::google::protobuf::int32 FieldDescriptorProto::oneof_index() const {

+ ::google::protobuf::int32 FieldDescriptorProto::oneof_index() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.oneof_index)

return oneof_index_;

}

-void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) {

+ void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) {

set_has_oneof_index();

oneof_index_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)

@@ -5163,49 +5243,49 @@ void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) {

// optional string json_name = 10;

bool FieldDescriptorProto::has_json_name() const {

- return (_has_bits_[0] & 0x00000010u) != 0;

+ return (_has_bits_[0] & 0x00000100u) != 0;

}

void FieldDescriptorProto::set_has_json_name() {

- _has_bits_[0] |= 0x00000010u;

+ _has_bits_[0] |= 0x00000100u;

}

void FieldDescriptorProto::clear_has_json_name() {

- _has_bits_[0] &= ~0x00000010u;

+ _has_bits_[0] &= ~0x00000100u;

}

void FieldDescriptorProto::clear_json_name() {

json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_json_name();

}

-const ::std::string& FieldDescriptorProto::json_name() const {

+ const ::std::string& FieldDescriptorProto::json_name() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name)

- return json_name_.GetNoArena();

+ return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_json_name(const ::std::string& value) {

+ void FieldDescriptorProto::set_json_name(const ::std::string& value) {

set_has_json_name();

json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name)

}

-void FieldDescriptorProto::set_json_name(const char* value) {

+ void FieldDescriptorProto::set_json_name(const char* value) {

set_has_json_name();

json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.json_name)

}

-void FieldDescriptorProto::set_json_name(const char* value, size_t size) {

+ void FieldDescriptorProto::set_json_name(const char* value, size_t size) {

set_has_json_name();

json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.json_name)

}

-::std::string* FieldDescriptorProto::mutable_json_name() {

+ ::std::string* FieldDescriptorProto::mutable_json_name() {

set_has_json_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.json_name)

return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FieldDescriptorProto::release_json_name() {

+ ::std::string* FieldDescriptorProto::release_json_name() {

// @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name)

clear_has_json_name();

return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) {

+ void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) {

if (json_name != NULL) {

set_has_json_name();

} else {

@@ -5217,13 +5297,13 @@ void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) {

// optional .google.protobuf.FieldOptions options = 8;

bool FieldDescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000020u) != 0;

+ return (_has_bits_[0] & 0x00000200u) != 0;

}

void FieldDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000020u;

+ _has_bits_[0] |= 0x00000200u;

}

void FieldDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000020u;

+ _has_bits_[0] &= ~0x00000200u;

}

void FieldDescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();

@@ -5231,8 +5311,7 @@ void FieldDescriptorProto::clear_options() {

}

const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const {

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

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -5266,39 +5345,30 @@ void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOption

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int OneofDescriptorProto::kNameFieldNumber;

-const int OneofDescriptorProto::kOptionsFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

OneofDescriptorProto::OneofDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.OneofDescriptorProto)

}

+void OneofDescriptorProto::InitAsDefaultInstance() {

OneofDescriptorProto::OneofDescriptorProto(const OneofDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::OneofOptions(*from.options_);

- } else {

- options_ = NULL;

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.OneofDescriptorProto)

}

void OneofDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

OneofDescriptorProto::~OneofDescriptorProto() {

@@ -5308,8 +5378,7 @@ OneofDescriptorProto::~OneofDescriptorProto() {

void OneofDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

- delete options_;

+ if (this != default_instance_) {

}

@@ -5320,14 +5389,16 @@ void OneofDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* OneofDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[6].descriptor;

+ return OneofDescriptorProto_descriptor_;

}

const OneofDescriptorProto& OneofDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+OneofDescriptorProto* OneofDescriptorProto::default_instance_ = NULL;

OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena) const {

OneofDescriptorProto* n = new OneofDescriptorProto;

if (arena != NULL) {

@@ -5338,18 +5409,13 @@ OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena

void OneofDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto)

- if (_has_bits_[0 / 32] & 3u) {

- if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

- }

- if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::OneofOptions::Clear();

- }

+ if (has_name()) {

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ }

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool OneofDescriptorProto::MergePartialFromCodedStream(

@@ -5358,13 +5424,13 @@ bool OneofDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.OneofDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -5374,17 +5440,7 @@ bool OneofDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- break;

- }

- // optional .google.protobuf.OneofOptions options = 2;

- case 2: {

- if (tag == 18u) {

- DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

- input, mutable_options()));

- } else {

- goto handle_unusual;

- }

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -5423,12 +5479,6 @@ void OneofDescriptorProto::SerializeWithCachedSizes(

1, this->name(), output);

}

- // optional .google.protobuf.OneofOptions options = 2;

- if (has_options()) {

- ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

- 2, *this->options_, output);

- }

if (_internal_metadata_.have_unknown_fields()) {

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

@@ -5436,9 +5486,8 @@ void OneofDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.OneofDescriptorProto)

}

-::google::protobuf::uint8* OneofDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -5451,13 +5500,6 @@ void OneofDescriptorProto::SerializeWithCachedSizes(

1, this->name(), target);

}

- // optional .google.protobuf.OneofOptions options = 2;

- if (has_options()) {

- target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 2, *this->options_, false, target);

- }

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

@@ -5466,42 +5508,32 @@ void OneofDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t OneofDescriptorProto::ByteSizeLong() const {

+int OneofDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

+ // optional string name = 1;

+ if (has_name()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->name());

+ }

if (_internal_metadata_.have_unknown_fields()) {

total_size +=

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- if (_has_bits_[0 / 32] & 3u) {

- // optional string name = 1;

- if (has_name()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->name());

- }

- // optional .google.protobuf.OneofOptions options = 2;

- if (has_options()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->options_);

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const OneofDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const OneofDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const OneofDescriptorProto>(

&from);

if (source == NULL) {

@@ -5515,16 +5547,15 @@ void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void OneofDescriptorProto::MergeFrom(const OneofDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

}

- if (from.has_options()) {

- mutable_options()->::google::protobuf::OneofOptions::MergeFrom(from.options());

- }

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

@@ -5543,9 +5574,7 @@ void OneofDescriptorProto::CopyFrom(const OneofDescriptorProto& from) {

}

bool OneofDescriptorProto::IsInitialized() const {

- if (has_options()) {

- if (!this->options_->IsInitialized()) return false;

- }

return true;

}

@@ -5555,7 +5584,6 @@ void OneofDescriptorProto::Swap(OneofDescriptorProto* other) {

}

void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) {

name_.Swap(&other->name_);

- std::swap(options_, other->options_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -5563,7 +5591,10 @@ void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) {

::google::protobuf::Metadata OneofDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[6];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = OneofDescriptorProto_descriptor_;

+ metadata.reflection = OneofDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -5583,37 +5614,37 @@ void OneofDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& OneofDescriptorProto::name() const {

+ const ::std::string& OneofDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void OneofDescriptorProto::set_name(const ::std::string& value) {

+ void OneofDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name)

}

-void OneofDescriptorProto::set_name(const char* value) {

+ void OneofDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.OneofDescriptorProto.name)

}

-void OneofDescriptorProto::set_name(const char* value, size_t size) {

+ void OneofDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.OneofDescriptorProto.name)

}

-::std::string* OneofDescriptorProto::mutable_name() {

+ ::std::string* OneofDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* OneofDescriptorProto::release_name() {

+ ::std::string* OneofDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void OneofDescriptorProto::set_allocated_name(::std::string* name) {

+ void OneofDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -5623,51 +5654,6 @@ void OneofDescriptorProto::set_allocated_name(::std::string* name) {

// @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name)

}

-// optional .google.protobuf.OneofOptions options = 2;

-bool OneofDescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void OneofDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000002u;

-void OneofDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000002u;

-void OneofDescriptorProto::clear_options() {

- if (options_ != NULL) options_->::google::protobuf::OneofOptions::Clear();

- clear_has_options();

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

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

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

-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)

#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

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

@@ -5680,35 +5666,28 @@ const int EnumDescriptorProto::kOptionsFieldNumber;

EnumDescriptorProto::EnumDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.EnumDescriptorProto)

}

+void EnumDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::EnumOptions*>(&::google::protobuf::EnumOptions::default_instance());

EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- value_(from.value_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::EnumOptions(*from.options_);

- } else {

- options_ = NULL;

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto)

}

void EnumDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

EnumDescriptorProto::~EnumDescriptorProto() {

@@ -5718,7 +5697,7 @@ EnumDescriptorProto::~EnumDescriptorProto() {

void EnumDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -5730,14 +5709,16 @@ void EnumDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* EnumDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[7].descriptor;

+ return EnumDescriptorProto_descriptor_;

}

const EnumDescriptorProto& EnumDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+EnumDescriptorProto* EnumDescriptorProto::default_instance_ = NULL;

EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) const {

EnumDescriptorProto* n = new EnumDescriptorProto;

if (arena != NULL) {

@@ -5748,19 +5729,19 @@ EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena)

void EnumDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto)

- value_.Clear();

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 5u) {

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::EnumOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ value_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool EnumDescriptorProto::MergePartialFromCodedStream(

@@ -5769,13 +5750,13 @@ bool EnumDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.EnumDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -5785,30 +5766,37 @@ bool EnumDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_value;

break;

}

// repeated .google.protobuf.EnumValueDescriptorProto value = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_value:

DO_(input->IncrementRecursionDepth());

+ parse_loop_value:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_value()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_loop_value;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(26)) goto parse_options;

break;

}

// optional .google.protobuf.EnumOptions options = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -5866,9 +5854,8 @@ void EnumDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.EnumDescriptorProto)

}

-::google::protobuf::uint8* EnumDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -5884,15 +5871,15 @@ void EnumDescriptorProto::SerializeWithCachedSizes(

// repeated .google.protobuf.EnumValueDescriptorProto value = 2;

for (unsigned int i = 0, n = this->value_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 2, this->value(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 2, this->value(i), target);

}

// optional .google.protobuf.EnumOptions options = 3;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 3, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 3, *this->options_, target);

}

if (_internal_metadata_.have_unknown_fields()) {

@@ -5903,27 +5890,11 @@ void EnumDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t EnumDescriptorProto::ByteSizeLong() const {

+int EnumDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.EnumValueDescriptorProto value = 2;

- {

- unsigned int count = this->value_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->value(i));

- }

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 5u) {

// optional string name = 1;

if (has_name()) {

total_size += 1 +

@@ -5939,17 +5910,29 @@ size_t EnumDescriptorProto::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ // repeated .google.protobuf.EnumValueDescriptorProto value = 2;

+ total_size += 1 * this->value_size();

+ for (int i = 0; i < this->value_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->value(i));

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const EnumDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const EnumDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const EnumDescriptorProto>(

&from);

if (source == NULL) {

@@ -5963,10 +5946,9 @@ void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

value_.MergeFrom(from.value_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

@@ -5975,6 +5957,9 @@ void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) {

mutable_options()->::google::protobuf::EnumOptions::MergeFrom(from.options());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void EnumDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {

@@ -5992,6 +5977,7 @@ void EnumDescriptorProto::CopyFrom(const EnumDescriptorProto& from) {

}

bool EnumDescriptorProto::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->value())) return false;

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

@@ -6004,8 +5990,8 @@ void EnumDescriptorProto::Swap(EnumDescriptorProto* other) {

InternalSwap(other);

}

void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) {

- value_.UnsafeArenaSwap(&other->value_);

name_.Swap(&other->name_);

+ value_.UnsafeArenaSwap(&other->value_);

std::swap(options_, other->options_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

@@ -6014,7 +6000,10 @@ void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) {

::google::protobuf::Metadata EnumDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[7];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = EnumDescriptorProto_descriptor_;

+ metadata.reflection = EnumDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -6034,37 +6023,37 @@ void EnumDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& EnumDescriptorProto::name() const {

+ const ::std::string& EnumDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void EnumDescriptorProto::set_name(const ::std::string& value) {

+ void EnumDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name)

}

-void EnumDescriptorProto::set_name(const char* value) {

+ void EnumDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.EnumDescriptorProto.name)

}

-void EnumDescriptorProto::set_name(const char* value, size_t size) {

+ void EnumDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumDescriptorProto.name)

}

-::std::string* EnumDescriptorProto::mutable_name() {

+ ::std::string* EnumDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* EnumDescriptorProto::release_name() {

+ ::std::string* EnumDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void EnumDescriptorProto::set_allocated_name(::std::string* name) {

+ void EnumDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -6106,13 +6095,13 @@ EnumDescriptorProto::value() const {

// optional .google.protobuf.EnumOptions options = 3;

bool EnumDescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void EnumDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000004u;

}

void EnumDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000004u;

}

void EnumDescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear();

@@ -6120,8 +6109,7 @@ void EnumDescriptorProto::clear_options() {

}

const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const {

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

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -6161,36 +6149,29 @@ const int EnumValueDescriptorProto::kOptionsFieldNumber;

EnumValueDescriptorProto::EnumValueDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.EnumValueDescriptorProto)

}

+void EnumValueDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::EnumValueOptions*>(&::google::protobuf::EnumValueOptions::default_instance());

EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::EnumValueOptions(*from.options_);

- } else {

- options_ = NULL;

- }

- number_ = from.number_;

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueDescriptorProto)

}

void EnumValueDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&options_, 0, reinterpret_cast<char*>(&number_) -

- reinterpret_cast<char*>(&options_) + sizeof(number_));

+ number_ = 0;

+ options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

EnumValueDescriptorProto::~EnumValueDescriptorProto() {

@@ -6200,7 +6181,7 @@ EnumValueDescriptorProto::~EnumValueDescriptorProto() {

void EnumValueDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -6212,14 +6193,16 @@ void EnumValueDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* EnumValueDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[8].descriptor;

+ return EnumValueDescriptorProto_descriptor_;

}

const EnumValueDescriptorProto& EnumValueDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+EnumValueDescriptorProto* EnumValueDescriptorProto::default_instance_ = NULL;

EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Arena* arena) const {

EnumValueDescriptorProto* n = new EnumValueDescriptorProto;

if (arena != NULL) {

@@ -6230,19 +6213,19 @@ EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Aren

void EnumValueDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto)

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 7u) {

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ number_ = 0;

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::EnumValueOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear();

}

- number_ = 0;

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool EnumValueDescriptorProto::MergePartialFromCodedStream(

@@ -6251,13 +6234,13 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.EnumValueDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -6267,30 +6250,35 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_number;

break;

}

// optional int32 number = 2;

case 2: {

- if (tag == 16u) {

- set_has_number();

+ if (tag == 16) {

+ parse_number:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &number_)));

+ set_has_number();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_options;

break;

}

// optional .google.protobuf.EnumValueOptions options = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -6347,9 +6335,8 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueDescriptorProto)

}

-::google::protobuf::uint8* EnumValueDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -6370,8 +6357,8 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes(

// optional .google.protobuf.EnumValueOptions options = 3;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 3, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 3, *this->options_, target);

}

if (_internal_metadata_.have_unknown_fields()) {

@@ -6382,15 +6369,10 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t EnumValueDescriptorProto::ByteSizeLong() const {

+int EnumValueDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (_has_bits_[0 / 32] & 7u) {

// optional string name = 1;

if (has_name()) {

@@ -6399,13 +6381,6 @@ size_t EnumValueDescriptorProto::ByteSizeLong() const {

this->name());

}

- // optional .google.protobuf.EnumValueOptions options = 3;

- if (has_options()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- *this->options_);

- }

// optional int32 number = 2;

if (has_number()) {

total_size += 1 +

@@ -6413,18 +6388,29 @@ size_t EnumValueDescriptorProto::ByteSizeLong() const {

this->number());

}

+ // optional .google.protobuf.EnumValueOptions options = 3;

+ if (has_options()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ *this->options_);

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const EnumValueDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const EnumValueDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const EnumValueDescriptorProto>(

&from);

if (source == NULL) {

@@ -6438,19 +6424,21 @@ void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from

void EnumValueDescriptorProto::MergeFrom(const EnumValueDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 7u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

}

- if (from.has_options()) {

- mutable_options()->::google::protobuf::EnumValueOptions::MergeFrom(from.options());

- }

if (from.has_number()) {

set_number(from.number());

}

+ if (from.has_options()) {

+ mutable_options()->::google::protobuf::EnumValueOptions::MergeFrom(from.options());

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

@@ -6469,6 +6457,7 @@ void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) {

}

bool EnumValueDescriptorProto::IsInitialized() const {

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

}

@@ -6481,8 +6470,8 @@ void EnumValueDescriptorProto::Swap(EnumValueDescriptorProto* other) {

}

void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) {

name_.Swap(&other->name_);

- std::swap(options_, other->options_);

std::swap(number_, other->number_);

+ std::swap(options_, other->options_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -6490,7 +6479,10 @@ void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) {

::google::protobuf::Metadata EnumValueDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[8];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = EnumValueDescriptorProto_descriptor_;

+ metadata.reflection = EnumValueDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -6510,37 +6502,37 @@ void EnumValueDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& EnumValueDescriptorProto::name() const {

+ const ::std::string& EnumValueDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void EnumValueDescriptorProto::set_name(const ::std::string& value) {

+ void EnumValueDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name)

}

-void EnumValueDescriptorProto::set_name(const char* value) {

+ void EnumValueDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.EnumValueDescriptorProto.name)

}

-void EnumValueDescriptorProto::set_name(const char* value, size_t size) {

+ void EnumValueDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValueDescriptorProto.name)

}

-::std::string* EnumValueDescriptorProto::mutable_name() {

+ ::std::string* EnumValueDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* EnumValueDescriptorProto::release_name() {

+ ::std::string* EnumValueDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {

+ void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -6552,23 +6544,23 @@ void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {

// optional int32 number = 2;

bool EnumValueDescriptorProto::has_number() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000002u) != 0;

}

void EnumValueDescriptorProto::set_has_number() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000002u;

}

void EnumValueDescriptorProto::clear_has_number() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000002u;

}

void EnumValueDescriptorProto::clear_number() {

number_ = 0;

clear_has_number();

}

-::google::protobuf::int32 EnumValueDescriptorProto::number() const {

+ ::google::protobuf::int32 EnumValueDescriptorProto::number() const {

// @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.number)

return number_;

}

-void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) {

+ void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) {

set_has_number();

number_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)

@@ -6576,13 +6568,13 @@ void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) {

// optional .google.protobuf.EnumValueOptions options = 3;

bool EnumValueDescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void EnumValueDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000004u;

}

void EnumValueDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000004u;

}

void EnumValueDescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear();

@@ -6590,8 +6582,7 @@ void EnumValueDescriptorProto::clear_options() {

}

const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const {

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

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -6631,35 +6622,28 @@ const int ServiceDescriptorProto::kOptionsFieldNumber;

ServiceDescriptorProto::ServiceDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.ServiceDescriptorProto)

}

+void ServiceDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::ServiceOptions*>(&::google::protobuf::ServiceOptions::default_instance());

ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- method_(from.method_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::ServiceOptions(*from.options_);

- } else {

- options_ = NULL;

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceDescriptorProto)

}

void ServiceDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

options_ = NULL;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

ServiceDescriptorProto::~ServiceDescriptorProto() {

@@ -6669,7 +6653,7 @@ ServiceDescriptorProto::~ServiceDescriptorProto() {

void ServiceDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -6681,14 +6665,16 @@ void ServiceDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* ServiceDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[9].descriptor;

+ return ServiceDescriptorProto_descriptor_;

}

const ServiceDescriptorProto& ServiceDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+ServiceDescriptorProto* ServiceDescriptorProto::default_instance_ = NULL;

ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* arena) const {

ServiceDescriptorProto* n = new ServiceDescriptorProto;

if (arena != NULL) {

@@ -6699,19 +6685,19 @@ ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* a

void ServiceDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto)

- method_.Clear();

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 5u) {

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::ServiceOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ method_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool ServiceDescriptorProto::MergePartialFromCodedStream(

@@ -6720,13 +6706,13 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.ServiceDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -6736,30 +6722,37 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_method;

break;

}

// repeated .google.protobuf.MethodDescriptorProto method = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_method:

DO_(input->IncrementRecursionDepth());

+ parse_loop_method:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_method()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_loop_method;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(26)) goto parse_options;

break;

}

// optional .google.protobuf.ServiceOptions options = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -6817,9 +6810,8 @@ void ServiceDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.ServiceDescriptorProto)

}

-::google::protobuf::uint8* ServiceDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -6835,15 +6827,15 @@ void ServiceDescriptorProto::SerializeWithCachedSizes(

// repeated .google.protobuf.MethodDescriptorProto method = 2;

for (unsigned int i = 0, n = this->method_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 2, this->method(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 2, this->method(i), target);

}

// optional .google.protobuf.ServiceOptions options = 3;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 3, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 3, *this->options_, target);

}

if (_internal_metadata_.have_unknown_fields()) {

@@ -6854,27 +6846,11 @@ void ServiceDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t ServiceDescriptorProto::ByteSizeLong() const {

+int ServiceDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceDescriptorProto)

- size_t total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.MethodDescriptorProto method = 2;

- {

- unsigned int count = this->method_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->method(i));

- }

+ int total_size = 0;

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 5u) {

// optional string name = 1;

if (has_name()) {

total_size += 1 +

@@ -6890,17 +6866,29 @@ size_t ServiceDescriptorProto::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

- return total_size;

+ // repeated .google.protobuf.MethodDescriptorProto method = 2;

+ total_size += 1 * this->method_size();

+ for (int i = 0; i < this->method_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->method(i));

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

+ _cached_size_ = total_size;

+ GOOGLE_SAFE_CONCURRENT_WRITES_END();

+ return total_size;

}

void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const ServiceDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const ServiceDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const ServiceDescriptorProto>(

&from);

if (source == NULL) {

@@ -6914,10 +6902,9 @@ void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from)

void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

method_.MergeFrom(from.method_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

@@ -6926,6 +6913,9 @@ void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) {

mutable_options()->::google::protobuf::ServiceOptions::MergeFrom(from.options());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void ServiceDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {

@@ -6943,6 +6933,7 @@ void ServiceDescriptorProto::CopyFrom(const ServiceDescriptorProto& from) {

}

bool ServiceDescriptorProto::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->method())) return false;

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

@@ -6955,8 +6946,8 @@ void ServiceDescriptorProto::Swap(ServiceDescriptorProto* other) {

InternalSwap(other);

}

void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) {

- method_.UnsafeArenaSwap(&other->method_);

name_.Swap(&other->name_);

+ method_.UnsafeArenaSwap(&other->method_);

std::swap(options_, other->options_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

@@ -6965,7 +6956,10 @@ void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) {

::google::protobuf::Metadata ServiceDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[9];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = ServiceDescriptorProto_descriptor_;

+ metadata.reflection = ServiceDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -6985,37 +6979,37 @@ void ServiceDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& ServiceDescriptorProto::name() const {

+ const ::std::string& ServiceDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void ServiceDescriptorProto::set_name(const ::std::string& value) {

+ void ServiceDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name)

}

-void ServiceDescriptorProto::set_name(const char* value) {

+ void ServiceDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.ServiceDescriptorProto.name)

}

-void ServiceDescriptorProto::set_name(const char* value, size_t size) {

+ void ServiceDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.ServiceDescriptorProto.name)

}

-::std::string* ServiceDescriptorProto::mutable_name() {

+ ::std::string* ServiceDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* ServiceDescriptorProto::release_name() {

+ ::std::string* ServiceDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void ServiceDescriptorProto::set_allocated_name(::std::string* name) {

+ void ServiceDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -7057,13 +7051,13 @@ ServiceDescriptorProto::method() const {

// optional .google.protobuf.ServiceOptions options = 3;

bool ServiceDescriptorProto::has_options() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void ServiceDescriptorProto::set_has_options() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000004u;

}

void ServiceDescriptorProto::clear_has_options() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000004u;

}

void ServiceDescriptorProto::clear_options() {

if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear();

@@ -7071,8 +7065,7 @@ void ServiceDescriptorProto::clear_options() {

}

const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const {

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

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -7115,48 +7108,32 @@ const int MethodDescriptorProto::kServerStreamingFieldNumber;

MethodDescriptorProto::MethodDescriptorProto()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.MethodDescriptorProto)

}

+void MethodDescriptorProto::InitAsDefaultInstance() {

+ options_ = const_cast< ::google::protobuf::MethodOptions*>(&::google::protobuf::MethodOptions::default_instance());

MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name()) {

- name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

- }

- input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_input_type()) {

- input_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.input_type_);

- }

- output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_output_type()) {

- output_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_type_);

- }

- if (from.has_options()) {

- options_ = new ::google::protobuf::MethodOptions(*from.options_);

- } else {

- options_ = NULL;

- }

- ::memcpy(&client_streaming_, &from.client_streaming_,

- reinterpret_cast<char*>(&server_streaming_) -

- reinterpret_cast<char*>(&client_streaming_) + sizeof(server_streaming_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.MethodDescriptorProto)

}

void MethodDescriptorProto::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&options_, 0, reinterpret_cast<char*>(&server_streaming_) -

- reinterpret_cast<char*>(&options_) + sizeof(server_streaming_));

+ options_ = NULL;

+ client_streaming_ = false;

+ server_streaming_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

MethodDescriptorProto::~MethodDescriptorProto() {

@@ -7168,7 +7145,7 @@ void MethodDescriptorProto::SharedDtor() {

name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

input_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

output_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != internal_default_instance()) {

+ if (this != default_instance_) {

delete options_;

}

@@ -7180,14 +7157,16 @@ void MethodDescriptorProto::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* MethodDescriptorProto::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[10].descriptor;

+ return MethodDescriptorProto_descriptor_;

}

const MethodDescriptorProto& MethodDescriptorProto::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+MethodDescriptorProto* MethodDescriptorProto::default_instance_ = NULL;

MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* arena) const {

MethodDescriptorProto* n = new MethodDescriptorProto;

if (arena != NULL) {

@@ -7198,30 +7177,45 @@ MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* are

void MethodDescriptorProto::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto)

- if (_has_bits_[0 / 32] & 15u) {

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(MethodDescriptorProto, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<MethodDescriptorProto*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ if (_has_bits_[0 / 32] & 63u) {

+ ZR_(client_streaming_, server_streaming_);

if (has_name()) {

- GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_.UnsafeRawStringPointer())->clear();

+ name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_input_type()) {

- GOOGLE_DCHECK(!input_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*input_type_.UnsafeRawStringPointer())->clear();

+ input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_output_type()) {

- GOOGLE_DCHECK(!output_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*output_type_.UnsafeRawStringPointer())->clear();

+ output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_options()) {

- GOOGLE_DCHECK(options_ != NULL);

- options_->::google::protobuf::MethodOptions::Clear();

+ if (options_ != NULL) options_->::google::protobuf::MethodOptions::Clear();

}

- if (_has_bits_[0 / 32] & 48u) {

- ::memset(&client_streaming_, 0, reinterpret_cast<char*>(&server_streaming_) -

- reinterpret_cast<char*>(&client_streaming_) + sizeof(server_streaming_));

+#undef ZR_HELPER_

+#undef ZR_

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool MethodDescriptorProto::MergePartialFromCodedStream(

@@ -7230,13 +7224,13 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.MethodDescriptorProto)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string name = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_name()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -7246,12 +7240,14 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_input_type;

break;

}

// optional string input_type = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_input_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_input_type()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -7261,12 +7257,14 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_output_type;

break;

}

// optional string output_type = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_output_type:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_output_type()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -7276,43 +7274,50 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(34)) goto parse_options;

break;

}

// optional .google.protobuf.MethodOptions options = 4;

case 4: {

- if (tag == 34u) {

+ if (tag == 34) {

+ parse_options:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(

input, mutable_options()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(40)) goto parse_client_streaming;

break;

}

// optional bool client_streaming = 5 [default = false];

case 5: {

- if (tag == 40u) {

- set_has_client_streaming();

+ if (tag == 40) {

+ parse_client_streaming:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &client_streaming_)));

+ set_has_client_streaming();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(48)) goto parse_server_streaming;

break;

}

// optional bool server_streaming = 6 [default = false];

case 6: {

- if (tag == 48u) {

- set_has_server_streaming();

+ if (tag == 48) {

+ parse_server_streaming:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &server_streaming_)));

+ set_has_server_streaming();

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -7394,9 +7399,8 @@ void MethodDescriptorProto::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.MethodDescriptorProto)

}

-::google::protobuf::uint8* MethodDescriptorProto::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodDescriptorProto)

// optional string name = 1;

if (has_name()) {

@@ -7434,8 +7438,8 @@ void MethodDescriptorProto::SerializeWithCachedSizes(

// optional .google.protobuf.MethodOptions options = 4;

if (has_options()) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 4, *this->options_, false, target);

+ WriteMessageNoVirtualToArray(

+ 4, *this->options_, target);

}

// optional bool client_streaming = 5 [default = false];

@@ -7456,15 +7460,10 @@ void MethodDescriptorProto::SerializeWithCachedSizes(

return target;

}

-size_t MethodDescriptorProto::ByteSizeLong() const {

+int MethodDescriptorProto::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodDescriptorProto)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (_has_bits_[0 / 32] & 63u) {

// optional string name = 1;

if (has_name()) {

@@ -7505,17 +7504,21 @@ size_t MethodDescriptorProto::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- const MethodDescriptorProto* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const MethodDescriptorProto* source =

::google::protobuf::internal::DynamicCastToGenerated<const MethodDescriptorProto>(

&from);

if (source == NULL) {

@@ -7529,9 +7532,8 @@ void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {

void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodDescriptorProto)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 63u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name()) {

set_has_name();

name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);

@@ -7554,6 +7556,9 @@ void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) {

set_server_streaming(from.server_streaming());

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void MethodDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {

@@ -7571,6 +7576,7 @@ void MethodDescriptorProto::CopyFrom(const MethodDescriptorProto& from) {

}

bool MethodDescriptorProto::IsInitialized() const {

if (has_options()) {

if (!this->options_->IsInitialized()) return false;

}

@@ -7595,7 +7601,10 @@ void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) {

::google::protobuf::Metadata MethodDescriptorProto::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[10];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = MethodDescriptorProto_descriptor_;

+ metadata.reflection = MethodDescriptorProto_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -7615,37 +7624,37 @@ void MethodDescriptorProto::clear_name() {

name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_name();

}

-const ::std::string& MethodDescriptorProto::name() const {

+ const ::std::string& MethodDescriptorProto::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name)

- return name_.GetNoArena();

+ return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_name(const ::std::string& value) {

+ void MethodDescriptorProto::set_name(const ::std::string& value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

}

-void MethodDescriptorProto::set_name(const char* value) {

+ void MethodDescriptorProto::set_name(const char* value) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.name)

}

-void MethodDescriptorProto::set_name(const char* value, size_t size) {

+ void MethodDescriptorProto::set_name(const char* value, size_t size) {

set_has_name();

name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.name)

}

-::std::string* MethodDescriptorProto::mutable_name() {

+ ::std::string* MethodDescriptorProto::mutable_name() {

set_has_name();

// @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name)

return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* MethodDescriptorProto::release_name() {

+ ::std::string* MethodDescriptorProto::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name)

clear_has_name();

return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_allocated_name(::std::string* name) {

+ void MethodDescriptorProto::set_allocated_name(::std::string* name) {

if (name != NULL) {

set_has_name();

} else {

@@ -7669,37 +7678,37 @@ void MethodDescriptorProto::clear_input_type() {

input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_input_type();

}

-const ::std::string& MethodDescriptorProto::input_type() const {

+ const ::std::string& MethodDescriptorProto::input_type() const {

// @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type)

- return input_type_.GetNoArena();

+ return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_input_type(const ::std::string& value) {

+ void MethodDescriptorProto::set_input_type(const ::std::string& value) {

set_has_input_type();

input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

}

-void MethodDescriptorProto::set_input_type(const char* value) {

+ void MethodDescriptorProto::set_input_type(const char* value) {

set_has_input_type();

input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.input_type)

}

-void MethodDescriptorProto::set_input_type(const char* value, size_t size) {

+ void MethodDescriptorProto::set_input_type(const char* value, size_t size) {

set_has_input_type();

input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.input_type)

}

-::std::string* MethodDescriptorProto::mutable_input_type() {

+ ::std::string* MethodDescriptorProto::mutable_input_type() {

set_has_input_type();

// @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.input_type)

return input_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* MethodDescriptorProto::release_input_type() {

+ ::std::string* MethodDescriptorProto::release_input_type() {

// @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type)

clear_has_input_type();

return input_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) {

+ void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) {

if (input_type != NULL) {

set_has_input_type();

} else {

@@ -7723,37 +7732,37 @@ void MethodDescriptorProto::clear_output_type() {

output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_output_type();

}

-const ::std::string& MethodDescriptorProto::output_type() const {

+ const ::std::string& MethodDescriptorProto::output_type() const {

// @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type)

- return output_type_.GetNoArena();

+ return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_output_type(const ::std::string& value) {

+ void MethodDescriptorProto::set_output_type(const ::std::string& value) {

set_has_output_type();

output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

}

-void MethodDescriptorProto::set_output_type(const char* value) {

+ void MethodDescriptorProto::set_output_type(const char* value) {

set_has_output_type();

output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.output_type)

}

-void MethodDescriptorProto::set_output_type(const char* value, size_t size) {

+ void MethodDescriptorProto::set_output_type(const char* value, size_t size) {

set_has_output_type();

output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.output_type)

}

-::std::string* MethodDescriptorProto::mutable_output_type() {

+ ::std::string* MethodDescriptorProto::mutable_output_type() {

set_has_output_type();

// @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.output_type)

return output_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* MethodDescriptorProto::release_output_type() {

+ ::std::string* MethodDescriptorProto::release_output_type() {

// @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type)

clear_has_output_type();

return output_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) {

+ void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) {

if (output_type != NULL) {

set_has_output_type();

} else {

@@ -7779,8 +7788,7 @@ void MethodDescriptorProto::clear_options() {

}

const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const {

// @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)

- return options_ != NULL ? *options_

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

+ return options_ != NULL ? *options_ : *default_instance_->options_;

}

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

set_has_options();

@@ -7822,11 +7830,11 @@ void MethodDescriptorProto::clear_client_streaming() {

client_streaming_ = false;

clear_has_client_streaming();

}

-bool MethodDescriptorProto::client_streaming() const {

+ bool MethodDescriptorProto::client_streaming() const {

// @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.client_streaming)

return client_streaming_;

}

-void MethodDescriptorProto::set_client_streaming(bool value) {

+ void MethodDescriptorProto::set_client_streaming(bool value) {

set_has_client_streaming();

client_streaming_ = value;

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

@@ -7846,11 +7854,11 @@ void MethodDescriptorProto::clear_server_streaming() {

server_streaming_ = false;

clear_has_server_streaming();

}

-bool MethodDescriptorProto::server_streaming() const {

+ bool MethodDescriptorProto::server_streaming() const {

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

return server_streaming_;

}

-void MethodDescriptorProto::set_server_streaming(bool value) {

+ void MethodDescriptorProto::set_server_streaming(bool value) {

set_has_server_streaming();

server_streaming_ = value;

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

@@ -7860,6 +7868,29 @@ void MethodDescriptorProto::set_server_streaming(bool value) {

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

+const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return FileOptions_OptimizeMode_descriptor_;

+bool FileOptions_OptimizeMode_IsValid(int value) {

+ switch(value) {

+ case 1:

+ case 2:

+ case 3:

+ return true;

+ default:

+ return false;

+ }

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const FileOptions_OptimizeMode FileOptions::SPEED;

+const FileOptions_OptimizeMode FileOptions::CODE_SIZE;

+const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME;

+const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN;

+const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX;

+const int FileOptions::OptimizeMode_ARRAYSIZE;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int FileOptions::kJavaPackageFieldNumber;

const int FileOptions::kJavaOuterClassnameFieldNumber;

@@ -7875,67 +7906,44 @@ const int FileOptions::kDeprecatedFieldNumber;

const int FileOptions::kCcEnableArenasFieldNumber;

const int FileOptions::kObjcClassPrefixFieldNumber;

const int FileOptions::kCsharpNamespaceFieldNumber;

-const int FileOptions::kSwiftPrefixFieldNumber;

const int FileOptions::kUninterpretedOptionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

FileOptions::FileOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.FileOptions)

}

+void FileOptions::InitAsDefaultInstance() {

FileOptions::FileOptions(const FileOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_java_package()) {

- java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_);

- }

- java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_java_outer_classname()) {

- java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_);

- }

- go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_go_package()) {

- go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_);

- }

- objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_objc_class_prefix()) {

- objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_);

- }

- csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_csharp_namespace()) {

- csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);

- }

- swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_swift_prefix()) {

- swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_);

- }

- ::memcpy(&java_multiple_files_, &from.java_multiple_files_,

- reinterpret_cast<char*>(&optimize_for_) -

- reinterpret_cast<char*>(&java_multiple_files_) + sizeof(optimize_for_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.FileOptions)

}

void FileOptions::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ java_multiple_files_ = false;

+ java_generate_equals_and_hash_ = false;

+ java_string_check_utf8_ = false;

+ optimize_for_ = 1;

go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ cc_generic_services_ = false;

+ java_generic_services_ = false;

+ py_generic_services_ = false;

+ deprecated_ = false;

+ cc_enable_arenas_ = false;

objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&java_multiple_files_, 0, reinterpret_cast<char*>(&cc_enable_arenas_) -

- reinterpret_cast<char*>(&java_multiple_files_) + sizeof(cc_enable_arenas_));

- optimize_for_ = 1;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

FileOptions::~FileOptions() {

@@ -7949,7 +7957,8 @@ void FileOptions::SharedDtor() {

go_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

objc_class_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

csharp_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- swift_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (this != default_instance_) {

+ }

}

void FileOptions::SetCachedSize(int size) const {

@@ -7959,14 +7968,16 @@ void FileOptions::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* FileOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[11].descriptor;

+ return FileOptions_descriptor_;

}

const FileOptions& FileOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+FileOptions* FileOptions::default_instance_ = NULL;

FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const {

FileOptions* n = new FileOptions;

if (arena != NULL) {

@@ -7978,44 +7989,53 @@ FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const {

void FileOptions::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions)

_extensions_.Clear();

- uninterpreted_option_.Clear();

- if (_has_bits_[0 / 32] & 63u) {

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(FileOptions, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<FileOptions*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ if (_has_bits_[0 / 32] & 255u) {

+ ZR_(java_multiple_files_, cc_generic_services_);

if (has_java_package()) {

- GOOGLE_DCHECK(!java_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*java_package_.UnsafeRawStringPointer())->clear();

+ java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_java_outer_classname()) {

- GOOGLE_DCHECK(!java_outer_classname_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*java_outer_classname_.UnsafeRawStringPointer())->clear();

+ java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ optimize_for_ = 1;

if (has_go_package()) {

- GOOGLE_DCHECK(!go_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*go_package_.UnsafeRawStringPointer())->clear();

+ go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

+ }

+ if (_has_bits_[8 / 32] & 16128u) {

+ ZR_(java_generic_services_, cc_enable_arenas_);

if (has_objc_class_prefix()) {

- GOOGLE_DCHECK(!objc_class_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*objc_class_prefix_.UnsafeRawStringPointer())->clear();

+ objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_csharp_namespace()) {

- GOOGLE_DCHECK(!csharp_namespace_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*csharp_namespace_.UnsafeRawStringPointer())->clear();

- }

- if (has_swift_prefix()) {

- GOOGLE_DCHECK(!swift_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*swift_prefix_.UnsafeRawStringPointer())->clear();

+ csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

- if (_has_bits_[0 / 32] & 192u) {

- ::memset(&java_multiple_files_, 0, reinterpret_cast<char*>(&java_generate_equals_and_hash_) -

- reinterpret_cast<char*>(&java_multiple_files_) + sizeof(java_generate_equals_and_hash_));

- }

- if (_has_bits_[8 / 32] & 32512u) {

- ::memset(&java_string_check_utf8_, 0, reinterpret_cast<char*>(&cc_enable_arenas_) -

- reinterpret_cast<char*>(&java_string_check_utf8_) + sizeof(cc_enable_arenas_));

- optimize_for_ = 1;

+#undef ZR_HELPER_

+#undef ZR_

+ uninterpreted_option_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool FileOptions::MergePartialFromCodedStream(

@@ -8024,13 +8044,13 @@ bool FileOptions::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.FileOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional string java_package = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_java_package()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -8040,12 +8060,14 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(66)) goto parse_java_outer_classname;

break;

}

// optional string java_outer_classname = 8;

case 8: {

- if (tag == 66u) {

+ if (tag == 66) {

+ parse_java_outer_classname:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_java_outer_classname()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -8055,12 +8077,14 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(72)) goto parse_optimize_for;

break;

}

// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];

case 9: {

- if (tag == 72u) {

+ if (tag == 72) {

+ parse_optimize_for:

int value;

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -8073,25 +8097,29 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(80)) goto parse_java_multiple_files;

break;

}

// optional bool java_multiple_files = 10 [default = false];

case 10: {

- if (tag == 80u) {

- set_has_java_multiple_files();

+ if (tag == 80) {

+ parse_java_multiple_files:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &java_multiple_files_)));

+ set_has_java_multiple_files();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(90)) goto parse_go_package;

break;

}

// optional string go_package = 11;

case 11: {

- if (tag == 90u) {

+ if (tag == 90) {

+ parse_go_package:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_go_package()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -8101,103 +8129,119 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(128)) goto parse_cc_generic_services;

break;

}

// optional bool cc_generic_services = 16 [default = false];

case 16: {

- if (tag == 128u) {

- set_has_cc_generic_services();

+ if (tag == 128) {

+ parse_cc_generic_services:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &cc_generic_services_)));

+ set_has_cc_generic_services();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(136)) goto parse_java_generic_services;

break;

}

// optional bool java_generic_services = 17 [default = false];

case 17: {

- if (tag == 136u) {

- set_has_java_generic_services();

+ if (tag == 136) {

+ parse_java_generic_services:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &java_generic_services_)));

+ set_has_java_generic_services();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(144)) goto parse_py_generic_services;

break;

}

// optional bool py_generic_services = 18 [default = false];

case 18: {

- if (tag == 144u) {

- set_has_py_generic_services();

+ if (tag == 144) {

+ parse_py_generic_services:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &py_generic_services_)));

+ set_has_py_generic_services();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(160)) goto parse_java_generate_equals_and_hash;

break;

}

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

+ // optional bool java_generate_equals_and_hash = 20 [default = false];

case 20: {

- if (tag == 160u) {

- set_has_java_generate_equals_and_hash();

+ if (tag == 160) {

+ parse_java_generate_equals_and_hash:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &java_generate_equals_and_hash_)));

+ set_has_java_generate_equals_and_hash();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(184)) goto parse_deprecated;

break;

}

// optional bool deprecated = 23 [default = false];

case 23: {

- if (tag == 184u) {

- set_has_deprecated();

+ if (tag == 184) {

+ parse_deprecated:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(216)) goto parse_java_string_check_utf8;

break;

}

// optional bool java_string_check_utf8 = 27 [default = false];

case 27: {

- if (tag == 216u) {

- set_has_java_string_check_utf8();

+ if (tag == 216) {

+ parse_java_string_check_utf8:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &java_string_check_utf8_)));

+ set_has_java_string_check_utf8();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(248)) goto parse_cc_enable_arenas;

break;

}

// optional bool cc_enable_arenas = 31 [default = false];

case 31: {

- if (tag == 248u) {

- set_has_cc_enable_arenas();

+ if (tag == 248) {

+ parse_cc_enable_arenas:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &cc_enable_arenas_)));

+ set_has_cc_enable_arenas();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(290)) goto parse_objc_class_prefix;

break;

}

// optional string objc_class_prefix = 36;

case 36: {

- if (tag == 290u) {

+ if (tag == 290) {

+ parse_objc_class_prefix:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_objc_class_prefix()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -8207,12 +8251,14 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(298)) goto parse_csharp_namespace;

break;

}

// optional string csharp_namespace = 37;

case 37: {

- if (tag == 298u) {

+ if (tag == 298) {

+ parse_csharp_namespace:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_csharp_namespace()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -8222,34 +8268,24 @@ bool FileOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- break;

- }

- // optional string swift_prefix = 39;

- case 39: {

- if (tag == 314u) {

- DO_(::google::protobuf::internal::WireFormatLite::ReadString(

- input, this->mutable_swift_prefix()));

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->swift_prefix().data(), this->swift_prefix().length(),

- ::google::protobuf::internal::WireFormat::PARSE,

- "google.protobuf.FileOptions.swift_prefix");

- } else {

- goto handle_unusual;

- }

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -8261,7 +8297,7 @@ bool FileOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -8339,7 +8375,7 @@ void FileOptions::SerializeWithCachedSizes(

::google::protobuf::internal::WireFormatLite::WriteBool(18, this->py_generic_services(), output);

}

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

+ // optional bool java_generate_equals_and_hash = 20 [default = false];

if (has_java_generate_equals_and_hash()) {

::google::protobuf::internal::WireFormatLite::WriteBool(20, this->java_generate_equals_and_hash(), output);

}

@@ -8379,16 +8415,6 @@ void FileOptions::SerializeWithCachedSizes(

37, this->csharp_namespace(), output);

}

- // optional string swift_prefix = 39;

- if (has_swift_prefix()) {

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->swift_prefix().data(), this->swift_prefix().length(),

- ::google::protobuf::internal::WireFormat::SERIALIZE,

- "google.protobuf.FileOptions.swift_prefix");

- ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(

- 39, this->swift_prefix(), output);

- }

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

@@ -8406,9 +8432,8 @@ void FileOptions::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.FileOptions)

}

-::google::protobuf::uint8* FileOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileOptions)

// optional string java_package = 1;

if (has_java_package()) {

@@ -8469,7 +8494,7 @@ void FileOptions::SerializeWithCachedSizes(

target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(18, this->py_generic_services(), target);

}

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

+ // optional bool java_generate_equals_and_hash = 20 [default = false];

if (has_java_generate_equals_and_hash()) {

target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->java_generate_equals_and_hash(), target);

}

@@ -8511,27 +8536,16 @@ void FileOptions::SerializeWithCachedSizes(

37, this->csharp_namespace(), target);

}

- // optional string swift_prefix = 39;

- if (has_swift_prefix()) {

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->swift_prefix().data(), this->swift_prefix().length(),

- ::google::protobuf::internal::WireFormat::SERIALIZE,

- "google.protobuf.FileOptions.swift_prefix");

- target =

- ::google::protobuf::internal::WireFormatLite::WriteStringToArray(

- 39, this->swift_prefix(), target);

- }

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

@@ -8541,27 +8555,9 @@ void FileOptions::SerializeWithCachedSizes(

return target;

}

-size_t FileOptions::ByteSizeLong() const {

+int FileOptions::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileOptions)

- size_t total_size = 0;

- total_size += _extensions_.ByteSize();

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

+ int total_size = 0;

if (_has_bits_[0 / 32] & 255u) {

// optional string java_package = 1;

@@ -8578,56 +8574,41 @@ size_t FileOptions::ByteSizeLong() const {

this->java_outer_classname());

}

- // optional string go_package = 11;

- if (has_go_package()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->go_package());

- }

- // optional string objc_class_prefix = 36;

- if (has_objc_class_prefix()) {

- total_size += 2 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->objc_class_prefix());

- }

- // optional string csharp_namespace = 37;

- if (has_csharp_namespace()) {

- total_size += 2 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->csharp_namespace());

- }

- // optional string swift_prefix = 39;

- if (has_swift_prefix()) {

- total_size += 2 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->swift_prefix());

- }

// optional bool java_multiple_files = 10 [default = false];

if (has_java_multiple_files()) {

total_size += 1 + 1;

}

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

+ // optional bool java_generate_equals_and_hash = 20 [default = false];

if (has_java_generate_equals_and_hash()) {

total_size += 2 + 1;

}

- }

- if (_has_bits_[8 / 32] & 32512u) {

// optional bool java_string_check_utf8 = 27 [default = false];

if (has_java_string_check_utf8()) {

total_size += 2 + 1;

}

+ // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];

+ if (has_optimize_for()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for());

+ }

+ // optional string go_package = 11;

+ if (has_go_package()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->go_package());

+ }

// optional bool cc_generic_services = 16 [default = false];

if (has_cc_generic_services()) {

total_size += 2 + 1;

}

+ }

+ if (_has_bits_[8 / 32] & 16128u) {

// optional bool java_generic_services = 17 [default = false];

if (has_java_generic_services()) {

total_size += 2 + 1;

@@ -8648,24 +8629,46 @@ size_t FileOptions::ByteSizeLong() const {

total_size += 2 + 1;

}

- // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];

- if (has_optimize_for()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for());

+ // optional string objc_class_prefix = 36;

+ if (has_objc_class_prefix()) {

+ total_size += 2 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->objc_class_prefix());

}

+ // optional string csharp_namespace = 37;

+ if (has_csharp_namespace()) {

+ total_size += 2 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->csharp_namespace());

+ }

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

+ total_size += _extensions_.ByteSize();

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void FileOptions::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const FileOptions* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const FileOptions* source =

::google::protobuf::internal::DynamicCastToGenerated<const FileOptions>(

&from);

if (source == NULL) {

@@ -8679,11 +8682,9 @@ void FileOptions::MergeFrom(const ::google::protobuf::Message& from) {

void FileOptions::MergeFrom(const FileOptions& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from._has_bits_[0 / 32] & 255u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_java_package()) {

set_has_java_package();

java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_);

@@ -8692,36 +8693,27 @@ void FileOptions::MergeFrom(const FileOptions& from) {

set_has_java_outer_classname();

java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_);

}

- if (from.has_go_package()) {

- set_has_go_package();

- go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_);

- }

- if (from.has_objc_class_prefix()) {

- set_has_objc_class_prefix();

- objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_);

- }

- if (from.has_csharp_namespace()) {

- set_has_csharp_namespace();

- csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);

- }

- if (from.has_swift_prefix()) {

- set_has_swift_prefix();

- swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_);

- }

if (from.has_java_multiple_files()) {

set_java_multiple_files(from.java_multiple_files());

}

if (from.has_java_generate_equals_and_hash()) {

set_java_generate_equals_and_hash(from.java_generate_equals_and_hash());

}

- }

- if (from._has_bits_[8 / 32] & 32512u) {

if (from.has_java_string_check_utf8()) {

set_java_string_check_utf8(from.java_string_check_utf8());

}

+ if (from.has_optimize_for()) {

+ set_optimize_for(from.optimize_for());

+ }

+ if (from.has_go_package()) {

+ set_has_go_package();

+ go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_);

+ }

if (from.has_cc_generic_services()) {

set_cc_generic_services(from.cc_generic_services());

}

+ }

+ if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {

if (from.has_java_generic_services()) {

set_java_generic_services(from.java_generic_services());

}

@@ -8734,10 +8726,19 @@ void FileOptions::MergeFrom(const FileOptions& from) {

if (from.has_cc_enable_arenas()) {

set_cc_enable_arenas(from.cc_enable_arenas());

}

- if (from.has_optimize_for()) {

- set_optimize_for(from.optimize_for());

+ if (from.has_objc_class_prefix()) {

+ set_has_objc_class_prefix();

+ objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_);

+ }

+ if (from.has_csharp_namespace()) {

+ set_has_csharp_namespace();

+ csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_);

}

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void FileOptions::CopyFrom(const ::google::protobuf::Message& from) {

@@ -8755,12 +8756,10 @@ void FileOptions::CopyFrom(const FileOptions& from) {

}

bool FileOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

void FileOptions::Swap(FileOptions* other) {

@@ -8768,22 +8767,21 @@ void FileOptions::Swap(FileOptions* other) {

InternalSwap(other);

}

void FileOptions::InternalSwap(FileOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

java_package_.Swap(&other->java_package_);

java_outer_classname_.Swap(&other->java_outer_classname_);

- go_package_.Swap(&other->go_package_);

- objc_class_prefix_.Swap(&other->objc_class_prefix_);

- csharp_namespace_.Swap(&other->csharp_namespace_);

- swift_prefix_.Swap(&other->swift_prefix_);

std::swap(java_multiple_files_, other->java_multiple_files_);

std::swap(java_generate_equals_and_hash_, other->java_generate_equals_and_hash_);

std::swap(java_string_check_utf8_, other->java_string_check_utf8_);

+ std::swap(optimize_for_, other->optimize_for_);

+ go_package_.Swap(&other->go_package_);

std::swap(cc_generic_services_, other->cc_generic_services_);

std::swap(java_generic_services_, other->java_generic_services_);

std::swap(py_generic_services_, other->py_generic_services_);

std::swap(deprecated_, other->deprecated_);

std::swap(cc_enable_arenas_, other->cc_enable_arenas_);

- std::swap(optimize_for_, other->optimize_for_);

+ objc_class_prefix_.Swap(&other->objc_class_prefix_);

+ csharp_namespace_.Swap(&other->csharp_namespace_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -8792,7 +8790,10 @@ void FileOptions::InternalSwap(FileOptions* other) {

::google::protobuf::Metadata FileOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[11];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = FileOptions_descriptor_;

+ metadata.reflection = FileOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -8812,37 +8813,37 @@ void FileOptions::clear_java_package() {

java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_java_package();

}

-const ::std::string& FileOptions::java_package() const {

+ const ::std::string& FileOptions::java_package() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package)

- return java_package_.GetNoArena();

+ return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_java_package(const ::std::string& value) {

+ void FileOptions::set_java_package(const ::std::string& value) {

set_has_java_package();

java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package)

}

-void FileOptions::set_java_package(const char* value) {

+ void FileOptions::set_java_package(const char* value) {

set_has_java_package();

java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_package)

}

-void FileOptions::set_java_package(const char* value, size_t size) {

+ void FileOptions::set_java_package(const char* value, size_t size) {

set_has_java_package();

java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_package)

}

-::std::string* FileOptions::mutable_java_package() {

+ ::std::string* FileOptions::mutable_java_package() {

set_has_java_package();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_package)

return java_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileOptions::release_java_package() {

+ ::std::string* FileOptions::release_java_package() {

// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package)

clear_has_java_package();

return java_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_allocated_java_package(::std::string* java_package) {

+ void FileOptions::set_allocated_java_package(::std::string* java_package) {

if (java_package != NULL) {

set_has_java_package();

} else {

@@ -8866,37 +8867,37 @@ void FileOptions::clear_java_outer_classname() {

java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_java_outer_classname();

}

-const ::std::string& FileOptions::java_outer_classname() const {

+ const ::std::string& FileOptions::java_outer_classname() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname)

- return java_outer_classname_.GetNoArena();

+ return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_java_outer_classname(const ::std::string& value) {

+ void FileOptions::set_java_outer_classname(const ::std::string& value) {

set_has_java_outer_classname();

java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname)

}

-void FileOptions::set_java_outer_classname(const char* value) {

+ void FileOptions::set_java_outer_classname(const char* value) {

set_has_java_outer_classname();

java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_outer_classname)

}

-void FileOptions::set_java_outer_classname(const char* value, size_t size) {

+ void FileOptions::set_java_outer_classname(const char* value, size_t size) {

set_has_java_outer_classname();

java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_outer_classname)

}

-::std::string* FileOptions::mutable_java_outer_classname() {

+ ::std::string* FileOptions::mutable_java_outer_classname() {

set_has_java_outer_classname();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_outer_classname)

return java_outer_classname_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileOptions::release_java_outer_classname() {

+ ::std::string* FileOptions::release_java_outer_classname() {

// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname)

clear_has_java_outer_classname();

return java_outer_classname_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) {

+ void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) {

if (java_outer_classname != NULL) {

set_has_java_outer_classname();

} else {

@@ -8908,47 +8909,47 @@ void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_c

// optional bool java_multiple_files = 10 [default = false];

bool FileOptions::has_java_multiple_files() const {

- return (_has_bits_[0] & 0x00000040u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void FileOptions::set_has_java_multiple_files() {

- _has_bits_[0] |= 0x00000040u;

+ _has_bits_[0] |= 0x00000004u;

}

void FileOptions::clear_has_java_multiple_files() {

- _has_bits_[0] &= ~0x00000040u;

+ _has_bits_[0] &= ~0x00000004u;

}

void FileOptions::clear_java_multiple_files() {

java_multiple_files_ = false;

clear_has_java_multiple_files();

}

-bool FileOptions::java_multiple_files() const {

+ bool FileOptions::java_multiple_files() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files)

return java_multiple_files_;

}

-void FileOptions::set_java_multiple_files(bool value) {

+ void FileOptions::set_java_multiple_files(bool value) {

set_has_java_multiple_files();

java_multiple_files_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)

}

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

+// optional bool java_generate_equals_and_hash = 20 [default = false];

bool FileOptions::has_java_generate_equals_and_hash() const {

- return (_has_bits_[0] & 0x00000080u) != 0;

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

}

void FileOptions::set_has_java_generate_equals_and_hash() {

- _has_bits_[0] |= 0x00000080u;

+ _has_bits_[0] |= 0x00000008u;

}

void FileOptions::clear_has_java_generate_equals_and_hash() {

- _has_bits_[0] &= ~0x00000080u;

+ _has_bits_[0] &= ~0x00000008u;

}

void FileOptions::clear_java_generate_equals_and_hash() {

java_generate_equals_and_hash_ = false;

clear_has_java_generate_equals_and_hash();

}

-bool FileOptions::java_generate_equals_and_hash() const {

+ bool FileOptions::java_generate_equals_and_hash() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generate_equals_and_hash)

return java_generate_equals_and_hash_;

}

-void FileOptions::set_java_generate_equals_and_hash(bool value) {

+ void FileOptions::set_java_generate_equals_and_hash(bool value) {

set_has_java_generate_equals_and_hash();

java_generate_equals_and_hash_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash)

@@ -8956,23 +8957,23 @@ void FileOptions::set_java_generate_equals_and_hash(bool value) {

// optional bool java_string_check_utf8 = 27 [default = false];

bool FileOptions::has_java_string_check_utf8() const {

- return (_has_bits_[0] & 0x00000100u) != 0;

+ return (_has_bits_[0] & 0x00000010u) != 0;

}

void FileOptions::set_has_java_string_check_utf8() {

- _has_bits_[0] |= 0x00000100u;

+ _has_bits_[0] |= 0x00000010u;

}

void FileOptions::clear_has_java_string_check_utf8() {

- _has_bits_[0] &= ~0x00000100u;

+ _has_bits_[0] &= ~0x00000010u;

}

void FileOptions::clear_java_string_check_utf8() {

java_string_check_utf8_ = false;

clear_has_java_string_check_utf8();

}

-bool FileOptions::java_string_check_utf8() const {

+ bool FileOptions::java_string_check_utf8() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_string_check_utf8)

return java_string_check_utf8_;

}

-void FileOptions::set_java_string_check_utf8(bool value) {

+ void FileOptions::set_java_string_check_utf8(bool value) {

set_has_java_string_check_utf8();

java_string_check_utf8_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)

@@ -8980,23 +8981,23 @@ void FileOptions::set_java_string_check_utf8(bool value) {

// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];

bool FileOptions::has_optimize_for() const {

- return (_has_bits_[0] & 0x00004000u) != 0;

+ return (_has_bits_[0] & 0x00000020u) != 0;

}

void FileOptions::set_has_optimize_for() {

- _has_bits_[0] |= 0x00004000u;

+ _has_bits_[0] |= 0x00000020u;

}

void FileOptions::clear_has_optimize_for() {

- _has_bits_[0] &= ~0x00004000u;

+ _has_bits_[0] &= ~0x00000020u;

}

void FileOptions::clear_optimize_for() {

optimize_for_ = 1;

clear_has_optimize_for();

}

-::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const {

+ ::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.optimize_for)

return static_cast< ::google::protobuf::FileOptions_OptimizeMode >(optimize_for_);

}

-void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {

+ void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {

assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));

set_has_optimize_for();

optimize_for_ = value;

@@ -9005,49 +9006,49 @@ void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode

// optional string go_package = 11;

bool FileOptions::has_go_package() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000040u) != 0;

}

void FileOptions::set_has_go_package() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000040u;

}

void FileOptions::clear_has_go_package() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000040u;

}

void FileOptions::clear_go_package() {

go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_go_package();

}

-const ::std::string& FileOptions::go_package() const {

+ const ::std::string& FileOptions::go_package() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package)

- return go_package_.GetNoArena();

+ return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_go_package(const ::std::string& value) {

+ void FileOptions::set_go_package(const ::std::string& value) {

set_has_go_package();

go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package)

}

-void FileOptions::set_go_package(const char* value) {

+ void FileOptions::set_go_package(const char* value) {

set_has_go_package();

go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.go_package)

}

-void FileOptions::set_go_package(const char* value, size_t size) {

+ void FileOptions::set_go_package(const char* value, size_t size) {

set_has_go_package();

go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.go_package)

}

-::std::string* FileOptions::mutable_go_package() {

+ ::std::string* FileOptions::mutable_go_package() {

set_has_go_package();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.go_package)

return go_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileOptions::release_go_package() {

+ ::std::string* FileOptions::release_go_package() {

// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package)

clear_has_go_package();

return go_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_allocated_go_package(::std::string* go_package) {

+ void FileOptions::set_allocated_go_package(::std::string* go_package) {

if (go_package != NULL) {

set_has_go_package();

} else {

@@ -9059,23 +9060,23 @@ void FileOptions::set_allocated_go_package(::std::string* go_package) {

// optional bool cc_generic_services = 16 [default = false];

bool FileOptions::has_cc_generic_services() const {

- return (_has_bits_[0] & 0x00000200u) != 0;

+ return (_has_bits_[0] & 0x00000080u) != 0;

}

void FileOptions::set_has_cc_generic_services() {

- _has_bits_[0] |= 0x00000200u;

+ _has_bits_[0] |= 0x00000080u;

}

void FileOptions::clear_has_cc_generic_services() {

- _has_bits_[0] &= ~0x00000200u;

+ _has_bits_[0] &= ~0x00000080u;

}

void FileOptions::clear_cc_generic_services() {

cc_generic_services_ = false;

clear_has_cc_generic_services();

}

-bool FileOptions::cc_generic_services() const {

+ bool FileOptions::cc_generic_services() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_generic_services)

return cc_generic_services_;

}

-void FileOptions::set_cc_generic_services(bool value) {

+ void FileOptions::set_cc_generic_services(bool value) {

set_has_cc_generic_services();

cc_generic_services_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)

@@ -9083,23 +9084,23 @@ void FileOptions::set_cc_generic_services(bool value) {

// optional bool java_generic_services = 17 [default = false];

bool FileOptions::has_java_generic_services() const {

- return (_has_bits_[0] & 0x00000400u) != 0;

+ return (_has_bits_[0] & 0x00000100u) != 0;

}

void FileOptions::set_has_java_generic_services() {

- _has_bits_[0] |= 0x00000400u;

+ _has_bits_[0] |= 0x00000100u;

}

void FileOptions::clear_has_java_generic_services() {

- _has_bits_[0] &= ~0x00000400u;

+ _has_bits_[0] &= ~0x00000100u;

}

void FileOptions::clear_java_generic_services() {

java_generic_services_ = false;

clear_has_java_generic_services();

}

-bool FileOptions::java_generic_services() const {

+ bool FileOptions::java_generic_services() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generic_services)

return java_generic_services_;

}

-void FileOptions::set_java_generic_services(bool value) {

+ void FileOptions::set_java_generic_services(bool value) {

set_has_java_generic_services();

java_generic_services_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)

@@ -9107,23 +9108,23 @@ void FileOptions::set_java_generic_services(bool value) {

// optional bool py_generic_services = 18 [default = false];

bool FileOptions::has_py_generic_services() const {

- return (_has_bits_[0] & 0x00000800u) != 0;

+ return (_has_bits_[0] & 0x00000200u) != 0;

}

void FileOptions::set_has_py_generic_services() {

- _has_bits_[0] |= 0x00000800u;

+ _has_bits_[0] |= 0x00000200u;

}

void FileOptions::clear_has_py_generic_services() {

- _has_bits_[0] &= ~0x00000800u;

+ _has_bits_[0] &= ~0x00000200u;

}

void FileOptions::clear_py_generic_services() {

py_generic_services_ = false;

clear_has_py_generic_services();

}

-bool FileOptions::py_generic_services() const {

+ bool FileOptions::py_generic_services() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.py_generic_services)

return py_generic_services_;

}

-void FileOptions::set_py_generic_services(bool value) {

+ void FileOptions::set_py_generic_services(bool value) {

set_has_py_generic_services();

py_generic_services_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)

@@ -9131,23 +9132,23 @@ void FileOptions::set_py_generic_services(bool value) {

// optional bool deprecated = 23 [default = false];

bool FileOptions::has_deprecated() const {

- return (_has_bits_[0] & 0x00001000u) != 0;

+ return (_has_bits_[0] & 0x00000400u) != 0;

}

void FileOptions::set_has_deprecated() {

- _has_bits_[0] |= 0x00001000u;

+ _has_bits_[0] |= 0x00000400u;

}

void FileOptions::clear_has_deprecated() {

- _has_bits_[0] &= ~0x00001000u;

+ _has_bits_[0] &= ~0x00000400u;

}

void FileOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool FileOptions::deprecated() const {

+ bool FileOptions::deprecated() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated)

return deprecated_;

}

-void FileOptions::set_deprecated(bool value) {

+ void FileOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)

@@ -9155,23 +9156,23 @@ void FileOptions::set_deprecated(bool value) {

// optional bool cc_enable_arenas = 31 [default = false];

bool FileOptions::has_cc_enable_arenas() const {

- return (_has_bits_[0] & 0x00002000u) != 0;

+ return (_has_bits_[0] & 0x00000800u) != 0;

}

void FileOptions::set_has_cc_enable_arenas() {

- _has_bits_[0] |= 0x00002000u;

+ _has_bits_[0] |= 0x00000800u;

}

void FileOptions::clear_has_cc_enable_arenas() {

- _has_bits_[0] &= ~0x00002000u;

+ _has_bits_[0] &= ~0x00000800u;

}

void FileOptions::clear_cc_enable_arenas() {

cc_enable_arenas_ = false;

clear_has_cc_enable_arenas();

}

-bool FileOptions::cc_enable_arenas() const {

+ bool FileOptions::cc_enable_arenas() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_enable_arenas)

return cc_enable_arenas_;

}

-void FileOptions::set_cc_enable_arenas(bool value) {

+ void FileOptions::set_cc_enable_arenas(bool value) {

set_has_cc_enable_arenas();

cc_enable_arenas_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)

@@ -9179,49 +9180,49 @@ void FileOptions::set_cc_enable_arenas(bool value) {

// optional string objc_class_prefix = 36;

bool FileOptions::has_objc_class_prefix() const {

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

+ return (_has_bits_[0] & 0x00001000u) != 0;

}

void FileOptions::set_has_objc_class_prefix() {

- _has_bits_[0] |= 0x00000008u;

+ _has_bits_[0] |= 0x00001000u;

}

void FileOptions::clear_has_objc_class_prefix() {

- _has_bits_[0] &= ~0x00000008u;

+ _has_bits_[0] &= ~0x00001000u;

}

void FileOptions::clear_objc_class_prefix() {

objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_objc_class_prefix();

}

-const ::std::string& FileOptions::objc_class_prefix() const {

+ const ::std::string& FileOptions::objc_class_prefix() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix)

- return objc_class_prefix_.GetNoArena();

+ return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_objc_class_prefix(const ::std::string& value) {

+ void FileOptions::set_objc_class_prefix(const ::std::string& value) {

set_has_objc_class_prefix();

objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix)

}

-void FileOptions::set_objc_class_prefix(const char* value) {

+ void FileOptions::set_objc_class_prefix(const char* value) {

set_has_objc_class_prefix();

objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.objc_class_prefix)

}

-void FileOptions::set_objc_class_prefix(const char* value, size_t size) {

+ void FileOptions::set_objc_class_prefix(const char* value, size_t size) {

set_has_objc_class_prefix();

objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.objc_class_prefix)

}

-::std::string* FileOptions::mutable_objc_class_prefix() {

+ ::std::string* FileOptions::mutable_objc_class_prefix() {

set_has_objc_class_prefix();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.objc_class_prefix)

return objc_class_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileOptions::release_objc_class_prefix() {

+ ::std::string* FileOptions::release_objc_class_prefix() {

// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix)

clear_has_objc_class_prefix();

return objc_class_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) {

+ void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) {

if (objc_class_prefix != NULL) {

set_has_objc_class_prefix();

} else {

@@ -9233,49 +9234,49 @@ void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_pref

// optional string csharp_namespace = 37;

bool FileOptions::has_csharp_namespace() const {

- return (_has_bits_[0] & 0x00000010u) != 0;

+ return (_has_bits_[0] & 0x00002000u) != 0;

}

void FileOptions::set_has_csharp_namespace() {

- _has_bits_[0] |= 0x00000010u;

+ _has_bits_[0] |= 0x00002000u;

}

void FileOptions::clear_has_csharp_namespace() {

- _has_bits_[0] &= ~0x00000010u;

+ _has_bits_[0] &= ~0x00002000u;

}

void FileOptions::clear_csharp_namespace() {

csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_csharp_namespace();

}

-const ::std::string& FileOptions::csharp_namespace() const {

+ const ::std::string& FileOptions::csharp_namespace() const {

// @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace)

- return csharp_namespace_.GetNoArena();

+ return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_csharp_namespace(const ::std::string& value) {

+ void FileOptions::set_csharp_namespace(const ::std::string& value) {

set_has_csharp_namespace();

csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace)

}

-void FileOptions::set_csharp_namespace(const char* value) {

+ void FileOptions::set_csharp_namespace(const char* value) {

set_has_csharp_namespace();

csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_namespace)

}

-void FileOptions::set_csharp_namespace(const char* value, size_t size) {

+ void FileOptions::set_csharp_namespace(const char* value, size_t size) {

set_has_csharp_namespace();

csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_namespace)

}

-::std::string* FileOptions::mutable_csharp_namespace() {

+ ::std::string* FileOptions::mutable_csharp_namespace() {

set_has_csharp_namespace();

// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_namespace)

return csharp_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* FileOptions::release_csharp_namespace() {

+ ::std::string* FileOptions::release_csharp_namespace() {

// @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace)

clear_has_csharp_namespace();

return csharp_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) {

+ void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) {

if (csharp_namespace != NULL) {

set_has_csharp_namespace();

} else {

@@ -9285,60 +9286,6 @@ void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace

// @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)

}

-// optional string swift_prefix = 39;

-bool FileOptions::has_swift_prefix() const {

- return (_has_bits_[0] & 0x00000020u) != 0;

-void FileOptions::set_has_swift_prefix() {

- _has_bits_[0] |= 0x00000020u;

-void FileOptions::clear_has_swift_prefix() {

- _has_bits_[0] &= ~0x00000020u;

-void FileOptions::clear_swift_prefix() {

- swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- clear_has_swift_prefix();

-const ::std::string& FileOptions::swift_prefix() const {

- // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix)

- return swift_prefix_.GetNoArena();

-void FileOptions::set_swift_prefix(const ::std::string& value) {

- set_has_swift_prefix();

- swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

- // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)

-void FileOptions::set_swift_prefix(const char* value) {

- set_has_swift_prefix();

- swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

- // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix)

-void FileOptions::set_swift_prefix(const char* value, size_t size) {

- set_has_swift_prefix();

- swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

- // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix)

-::std::string* FileOptions::mutable_swift_prefix() {

- set_has_swift_prefix();

- // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix)

- return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-::std::string* FileOptions::release_swift_prefix() {

- // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)

- clear_has_swift_prefix();

- return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) {

- if (swift_prefix != NULL) {

- set_has_swift_prefix();

- } else {

- clear_has_swift_prefix();

- }

- swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix);

- // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix)

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

int FileOptions::uninterpreted_option_size() const {

return uninterpreted_option_.size();

@@ -9383,30 +9330,28 @@ const int MessageOptions::kUninterpretedOptionFieldNumber;

MessageOptions::MessageOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.MessageOptions)

}

+void MessageOptions::InitAsDefaultInstance() {

MessageOptions::MessageOptions(const MessageOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- ::memcpy(&message_set_wire_format_, &from.message_set_wire_format_,

- reinterpret_cast<char*>(&map_entry_) -

- reinterpret_cast<char*>(&message_set_wire_format_) + sizeof(map_entry_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions)

}

void MessageOptions::SharedCtor() {

_cached_size_ = 0;

- ::memset(&message_set_wire_format_, 0, reinterpret_cast<char*>(&map_entry_) -

- reinterpret_cast<char*>(&message_set_wire_format_) + sizeof(map_entry_));

+ message_set_wire_format_ = false;

+ no_standard_descriptor_accessor_ = false;

+ deprecated_ = false;

+ map_entry_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

MessageOptions::~MessageOptions() {

@@ -9415,6 +9360,8 @@ MessageOptions::~MessageOptions() {

}

void MessageOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void MessageOptions::SetCachedSize(int size) const {

@@ -9424,14 +9371,16 @@ void MessageOptions::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* MessageOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[12].descriptor;

+ return MessageOptions_descriptor_;

}

const MessageOptions& MessageOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+MessageOptions* MessageOptions::default_instance_ = NULL;

MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const {

MessageOptions* n = new MessageOptions;

if (arena != NULL) {

@@ -9443,13 +9392,32 @@ MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const {

void MessageOptions::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions)

_extensions_.Clear();

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(MessageOptions, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<MessageOptions*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ ZR_(message_set_wire_format_, map_entry_);

+#undef ZR_HELPER_

+#undef ZR_

uninterpreted_option_.Clear();

- if (_has_bits_[0 / 32] & 15u) {

- ::memset(&message_set_wire_format_, 0, reinterpret_cast<char*>(&map_entry_) -

- reinterpret_cast<char*>(&message_set_wire_format_) + sizeof(map_entry_));

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool MessageOptions::MergePartialFromCodedStream(

@@ -9458,72 +9426,83 @@ bool MessageOptions::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.MessageOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional bool message_set_wire_format = 1 [default = false];

case 1: {

- if (tag == 8u) {

- set_has_message_set_wire_format();

+ if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &message_set_wire_format_)));

+ set_has_message_set_wire_format();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_no_standard_descriptor_accessor;

break;

}

// optional bool no_standard_descriptor_accessor = 2 [default = false];

case 2: {

- if (tag == 16u) {

- set_has_no_standard_descriptor_accessor();

+ if (tag == 16) {

+ parse_no_standard_descriptor_accessor:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &no_standard_descriptor_accessor_)));

+ set_has_no_standard_descriptor_accessor();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(24)) goto parse_deprecated;

break;

}

// optional bool deprecated = 3 [default = false];

case 3: {

- if (tag == 24u) {

- set_has_deprecated();

+ if (tag == 24) {

+ parse_deprecated:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(56)) goto parse_map_entry;

break;

}

// optional bool map_entry = 7;

case 7: {

- if (tag == 56u) {

- set_has_map_entry();

+ if (tag == 56) {

+ parse_map_entry:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &map_entry_)));

+ set_has_map_entry();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -9535,7 +9514,7 @@ bool MessageOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -9594,9 +9573,8 @@ void MessageOptions::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.MessageOptions)

}

-::google::protobuf::uint8* MessageOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MessageOptions)

// optional bool message_set_wire_format = 1 [default = false];

if (has_message_set_wire_format()) {

@@ -9621,13 +9599,13 @@ void MessageOptions::SerializeWithCachedSizes(

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

@@ -9637,27 +9615,9 @@ void MessageOptions::SerializeWithCachedSizes(

return target;

}

-size_t MessageOptions::ByteSizeLong() const {

+int MessageOptions::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MessageOptions)

- size_t total_size = 0;

- total_size += _extensions_.ByteSize();

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

+ int total_size = 0;

if (_has_bits_[0 / 32] & 15u) {

// optional bool message_set_wire_format = 1 [default = false];

@@ -9681,17 +9641,31 @@ size_t MessageOptions::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

+ total_size += _extensions_.ByteSize();

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MessageOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const MessageOptions* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const MessageOptions* source =

::google::protobuf::internal::DynamicCastToGenerated<const MessageOptions>(

&from);

if (source == NULL) {

@@ -9705,11 +9679,9 @@ void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) {

void MessageOptions::MergeFrom(const MessageOptions& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MessageOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from._has_bits_[0 / 32] & 15u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_message_set_wire_format()) {

set_message_set_wire_format(from.message_set_wire_format());

}

@@ -9723,6 +9695,10 @@ void MessageOptions::MergeFrom(const MessageOptions& from) {

set_map_entry(from.map_entry());

}

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void MessageOptions::CopyFrom(const ::google::protobuf::Message& from) {

@@ -9740,12 +9716,10 @@ void MessageOptions::CopyFrom(const MessageOptions& from) {

}

bool MessageOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

void MessageOptions::Swap(MessageOptions* other) {

@@ -9753,11 +9727,11 @@ void MessageOptions::Swap(MessageOptions* other) {

InternalSwap(other);

}

void MessageOptions::InternalSwap(MessageOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(message_set_wire_format_, other->message_set_wire_format_);

std::swap(no_standard_descriptor_accessor_, other->no_standard_descriptor_accessor_);

std::swap(deprecated_, other->deprecated_);

std::swap(map_entry_, other->map_entry_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -9766,7 +9740,10 @@ void MessageOptions::InternalSwap(MessageOptions* other) {

::google::protobuf::Metadata MessageOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[12];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = MessageOptions_descriptor_;

+ metadata.reflection = MessageOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -9786,11 +9763,11 @@ void MessageOptions::clear_message_set_wire_format() {

message_set_wire_format_ = false;

clear_has_message_set_wire_format();

}

-bool MessageOptions::message_set_wire_format() const {

+ bool MessageOptions::message_set_wire_format() const {

// @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.message_set_wire_format)

return message_set_wire_format_;

}

-void MessageOptions::set_message_set_wire_format(bool value) {

+ void MessageOptions::set_message_set_wire_format(bool value) {

set_has_message_set_wire_format();

message_set_wire_format_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)

@@ -9810,11 +9787,11 @@ void MessageOptions::clear_no_standard_descriptor_accessor() {

no_standard_descriptor_accessor_ = false;

clear_has_no_standard_descriptor_accessor();

}

-bool MessageOptions::no_standard_descriptor_accessor() const {

+ bool MessageOptions::no_standard_descriptor_accessor() const {

// @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.no_standard_descriptor_accessor)

return no_standard_descriptor_accessor_;

}

-void MessageOptions::set_no_standard_descriptor_accessor(bool value) {

+ void MessageOptions::set_no_standard_descriptor_accessor(bool value) {

set_has_no_standard_descriptor_accessor();

no_standard_descriptor_accessor_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)

@@ -9834,11 +9811,11 @@ void MessageOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool MessageOptions::deprecated() const {

+ bool MessageOptions::deprecated() const {

// @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated)

return deprecated_;

}

-void MessageOptions::set_deprecated(bool value) {

+ void MessageOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)

@@ -9858,11 +9835,11 @@ void MessageOptions::clear_map_entry() {

map_entry_ = false;

clear_has_map_entry();

}

-bool MessageOptions::map_entry() const {

+ bool MessageOptions::map_entry() const {

// @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.map_entry)

return map_entry_;

}

-void MessageOptions::set_map_entry(bool value) {

+ void MessageOptions::set_map_entry(bool value) {

set_has_map_entry();

map_entry_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)

@@ -9902,6 +9879,52 @@ MessageOptions::uninterpreted_option() const {

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

+const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return FieldOptions_CType_descriptor_;

+bool FieldOptions_CType_IsValid(int value) {

+ switch(value) {

+ case 0:

+ case 1:

+ case 2:

+ return true;

+ default:

+ return false;

+ }

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const FieldOptions_CType FieldOptions::STRING;

+const FieldOptions_CType FieldOptions::CORD;

+const FieldOptions_CType FieldOptions::STRING_PIECE;

+const FieldOptions_CType FieldOptions::CType_MIN;

+const FieldOptions_CType FieldOptions::CType_MAX;

+const int FieldOptions::CType_ARRAYSIZE;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

+const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return FieldOptions_JSType_descriptor_;

+bool FieldOptions_JSType_IsValid(int value) {

+ switch(value) {

+ case 0:

+ case 1:

+ case 2:

+ return true;

+ default:

+ return false;

+ }

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const FieldOptions_JSType FieldOptions::JS_NORMAL;

+const FieldOptions_JSType FieldOptions::JS_STRING;

+const FieldOptions_JSType FieldOptions::JS_NUMBER;

+const FieldOptions_JSType FieldOptions::JSType_MIN;

+const FieldOptions_JSType FieldOptions::JSType_MAX;

+const int FieldOptions::JSType_ARRAYSIZE;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int FieldOptions::kCtypeFieldNumber;

const int FieldOptions::kPackedFieldNumber;

@@ -9914,30 +9937,30 @@ const int FieldOptions::kUninterpretedOptionFieldNumber;

FieldOptions::FieldOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.FieldOptions)

}

+void FieldOptions::InitAsDefaultInstance() {

FieldOptions::FieldOptions(const FieldOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- ::memcpy(&ctype_, &from.ctype_,

- reinterpret_cast<char*>(&weak_) -

- reinterpret_cast<char*>(&ctype_) + sizeof(weak_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions)

}

void FieldOptions::SharedCtor() {

_cached_size_ = 0;

- ::memset(&ctype_, 0, reinterpret_cast<char*>(&weak_) -

- reinterpret_cast<char*>(&ctype_) + sizeof(weak_));

+ ctype_ = 0;

+ packed_ = false;

+ jstype_ = 0;

+ lazy_ = false;

+ deprecated_ = false;

+ weak_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

FieldOptions::~FieldOptions() {

@@ -9946,6 +9969,8 @@ FieldOptions::~FieldOptions() {

}

void FieldOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void FieldOptions::SetCachedSize(int size) const {

@@ -9955,14 +9980,16 @@ void FieldOptions::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* FieldOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[13].descriptor;

+ return FieldOptions_descriptor_;

}

const FieldOptions& FieldOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+FieldOptions* FieldOptions::default_instance_ = NULL;

FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const {

FieldOptions* n = new FieldOptions;

if (arena != NULL) {

@@ -9974,13 +10001,35 @@ FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const {

void FieldOptions::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions)

_extensions_.Clear();

- uninterpreted_option_.Clear();

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(FieldOptions, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<FieldOptions*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

if (_has_bits_[0 / 32] & 63u) {

- ::memset(&ctype_, 0, reinterpret_cast<char*>(&weak_) -

- reinterpret_cast<char*>(&ctype_) + sizeof(weak_));

+ ZR_(ctype_, jstype_);

+ ZR_(packed_, weak_);

+ }

+#undef ZR_HELPER_

+#undef ZR_

+ uninterpreted_option_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool FieldOptions::MergePartialFromCodedStream(

@@ -9989,13 +10038,13 @@ bool FieldOptions::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.FieldOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];

case 1: {

- if (tag == 8u) {

+ if (tag == 8) {

int value;

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -10008,51 +10057,59 @@ bool FieldOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_packed;

break;

}

// optional bool packed = 2;

case 2: {

- if (tag == 16u) {

- set_has_packed();

+ if (tag == 16) {

+ parse_packed:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &packed_)));

+ set_has_packed();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(24)) goto parse_deprecated;

break;

}

// optional bool deprecated = 3 [default = false];

case 3: {

- if (tag == 24u) {

- set_has_deprecated();

+ if (tag == 24) {

+ parse_deprecated:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(40)) goto parse_lazy;

break;

}

// optional bool lazy = 5 [default = false];

case 5: {

- if (tag == 40u) {

- set_has_lazy();

+ if (tag == 40) {

+ parse_lazy:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &lazy_)));

+ set_has_lazy();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(48)) goto parse_jstype;

break;

}

// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];

case 6: {

- if (tag == 48u) {

+ if (tag == 48) {

+ parse_jstype:

int value;

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -10065,32 +10122,39 @@ bool FieldOptions::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(80)) goto parse_weak;

break;

}

// optional bool weak = 10 [default = false];

case 10: {

- if (tag == 80u) {

- set_has_weak();

+ if (tag == 80) {

+ parse_weak:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &weak_)));

+ set_has_weak();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -10102,7 +10166,7 @@ bool FieldOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -10173,9 +10237,8 @@ void FieldOptions::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.FieldOptions)

}

-::google::protobuf::uint8* FieldOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldOptions)

// optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];

if (has_ctype()) {

@@ -10212,13 +10275,13 @@ void FieldOptions::SerializeWithCachedSizes(

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

@@ -10228,33 +10291,20 @@ void FieldOptions::SerializeWithCachedSizes(

return target;

}

-size_t FieldOptions::ByteSizeLong() const {

+int FieldOptions::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldOptions)

- size_t total_size = 0;

+ int total_size = 0;

- total_size += _extensions_.ByteSize();

+ if (_has_bits_[0 / 32] & 63u) {

+ // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];

+ if (has_ctype()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->ctype());

+ }

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- if (_has_bits_[0 / 32] & 63u) {

- // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];

- if (has_ctype()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->ctype());

+ // optional bool packed = 2;

+ if (has_packed()) {

+ total_size += 1 + 1;

}

// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];

@@ -10263,11 +10313,6 @@ size_t FieldOptions::ByteSizeLong() const {

::google::protobuf::internal::WireFormatLite::EnumSize(this->jstype());

}

- // optional bool packed = 2;

- if (has_packed()) {

- total_size += 1 + 1;

- }

// optional bool lazy = 5 [default = false];

if (has_lazy()) {

total_size += 1 + 1;

@@ -10284,17 +10329,31 @@ size_t FieldOptions::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

+ total_size += _extensions_.ByteSize();

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const FieldOptions* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const FieldOptions* source =

::google::protobuf::internal::DynamicCastToGenerated<const FieldOptions>(

&from);

if (source == NULL) {

@@ -10308,20 +10367,18 @@ void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) {

void FieldOptions::MergeFrom(const FieldOptions& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from._has_bits_[0 / 32] & 63u) {

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_ctype()) {

set_ctype(from.ctype());

}

- if (from.has_jstype()) {

- set_jstype(from.jstype());

- }

if (from.has_packed()) {

set_packed(from.packed());

}

+ if (from.has_jstype()) {

+ set_jstype(from.jstype());

+ }

if (from.has_lazy()) {

set_lazy(from.lazy());

}

@@ -10332,6 +10389,10 @@ void FieldOptions::MergeFrom(const FieldOptions& from) {

set_weak(from.weak());

}

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void FieldOptions::CopyFrom(const ::google::protobuf::Message& from) {

@@ -10349,12 +10410,10 @@ void FieldOptions::CopyFrom(const FieldOptions& from) {

}

bool FieldOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

void FieldOptions::Swap(FieldOptions* other) {

@@ -10362,13 +10421,13 @@ void FieldOptions::Swap(FieldOptions* other) {

InternalSwap(other);

}

void FieldOptions::InternalSwap(FieldOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(ctype_, other->ctype_);

- std::swap(jstype_, other->jstype_);

std::swap(packed_, other->packed_);

+ std::swap(jstype_, other->jstype_);

std::swap(lazy_, other->lazy_);

std::swap(deprecated_, other->deprecated_);

std::swap(weak_, other->weak_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -10377,7 +10436,10 @@ void FieldOptions::InternalSwap(FieldOptions* other) {

::google::protobuf::Metadata FieldOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[13];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = FieldOptions_descriptor_;

+ metadata.reflection = FieldOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -10397,11 +10459,11 @@ void FieldOptions::clear_ctype() {

ctype_ = 0;

clear_has_ctype();

}

-::google::protobuf::FieldOptions_CType FieldOptions::ctype() const {

+ ::google::protobuf::FieldOptions_CType FieldOptions::ctype() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.ctype)

return static_cast< ::google::protobuf::FieldOptions_CType >(ctype_);

}

-void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) {

+ void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) {

assert(::google::protobuf::FieldOptions_CType_IsValid(value));

set_has_ctype();

ctype_ = value;

@@ -10410,23 +10472,23 @@ void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) {

// optional bool packed = 2;

bool FieldOptions::has_packed() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000002u) != 0;

}

void FieldOptions::set_has_packed() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000002u;

}

void FieldOptions::clear_has_packed() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000002u;

}

void FieldOptions::clear_packed() {

packed_ = false;

clear_has_packed();

}

-bool FieldOptions::packed() const {

+ bool FieldOptions::packed() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed)

return packed_;

}

-void FieldOptions::set_packed(bool value) {

+ void FieldOptions::set_packed(bool value) {

set_has_packed();

packed_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)

@@ -10434,23 +10496,23 @@ void FieldOptions::set_packed(bool value) {

// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];

bool FieldOptions::has_jstype() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void FieldOptions::set_has_jstype() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000004u;

}

void FieldOptions::clear_has_jstype() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000004u;

}

void FieldOptions::clear_jstype() {

jstype_ = 0;

clear_has_jstype();

}

-::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const {

+ ::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.jstype)

return static_cast< ::google::protobuf::FieldOptions_JSType >(jstype_);

}

-void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) {

+ void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) {

assert(::google::protobuf::FieldOptions_JSType_IsValid(value));

set_has_jstype();

jstype_ = value;

@@ -10471,11 +10533,11 @@ void FieldOptions::clear_lazy() {

lazy_ = false;

clear_has_lazy();

}

-bool FieldOptions::lazy() const {

+ bool FieldOptions::lazy() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy)

return lazy_;

}

-void FieldOptions::set_lazy(bool value) {

+ void FieldOptions::set_lazy(bool value) {

set_has_lazy();

lazy_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)

@@ -10495,11 +10557,11 @@ void FieldOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool FieldOptions::deprecated() const {

+ bool FieldOptions::deprecated() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated)

return deprecated_;

}

-void FieldOptions::set_deprecated(bool value) {

+ void FieldOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)

@@ -10519,11 +10581,11 @@ void FieldOptions::clear_weak() {

weak_ = false;

clear_has_weak();

}

-bool FieldOptions::weak() const {

+ bool FieldOptions::weak() const {

// @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak)

return weak_;

}

-void FieldOptions::set_weak(bool value) {

+ void FieldOptions::set_weak(bool value) {

set_has_weak();

weak_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)

@@ -10564,91 +10626,154 @@ FieldOptions::uninterpreted_option() const {

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int OneofOptions::kUninterpretedOptionFieldNumber;

+const int EnumOptions::kAllowAliasFieldNumber;

+const int EnumOptions::kDeprecatedFieldNumber;

+const int EnumOptions::kUninterpretedOptionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-OneofOptions::OneofOptions()

+EnumOptions::EnumOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions)

}

-OneofOptions::OneofOptions(const OneofOptions& from)

+void EnumOptions::InitAsDefaultInstance() {

+EnumOptions::EnumOptions(const EnumOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofOptions)

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions)

}

-void OneofOptions::SharedCtor() {

+void EnumOptions::SharedCtor() {

_cached_size_ = 0;

+ allow_alias_ = false;

+ deprecated_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

-OneofOptions::~OneofOptions() {

- // @@protoc_insertion_point(destructor:google.protobuf.OneofOptions)

+EnumOptions::~EnumOptions() {

+ // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions)

SharedDtor();

}

-void OneofOptions::SharedDtor() {

+void EnumOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

-void OneofOptions::SetCachedSize(int size) const {

+void EnumOptions::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

}

-const ::google::protobuf::Descriptor* OneofOptions::descriptor() {

+const ::google::protobuf::Descriptor* EnumOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[14].descriptor;

+ return EnumOptions_descriptor_;

}

-const OneofOptions& OneofOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+const EnumOptions& EnumOptions::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

-OneofOptions* OneofOptions::New(::google::protobuf::Arena* arena) const {

- OneofOptions* n = new OneofOptions;

+EnumOptions* EnumOptions::default_instance_ = NULL;

+EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const {

+ EnumOptions* n = new EnumOptions;

if (arena != NULL) {

arena->Own(n);

}

return n;

}

-void OneofOptions::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions)

+void EnumOptions::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions)

_extensions_.Clear();

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(EnumOptions, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<EnumOptions*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ ZR_(allow_alias_, deprecated_);

+#undef ZR_HELPER_

+#undef ZR_

uninterpreted_option_.Clear();

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

-bool OneofOptions::MergePartialFromCodedStream(

+bool EnumOptions::MergePartialFromCodedStream(

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

#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

+ // optional bool allow_alias = 2;

+ case 2: {

+ if (tag == 16) {

+ DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

+ bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

+ input, &allow_alias_)));

+ set_has_allow_alias();

+ } else {

+ goto handle_unusual;

+ }

+ if (input->ExpectTag(24)) goto parse_deprecated;

+ break;

+ }

+ // optional bool deprecated = 3 [default = false];

+ case 3: {

+ if (tag == 24) {

+ parse_deprecated:

+ DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

+ bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

+ input, &deprecated_)));

+ set_has_deprecated();

+ } else {

+ goto handle_unusual;

+ }

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

+ break;

+ }

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -10660,7 +10785,7 @@ bool OneofOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -10671,17 +10796,27 @@ bool OneofOptions::MergePartialFromCodedStream(

}

success:

- // @@protoc_insertion_point(parse_success:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions)

return true;

failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions)

return false;

#undef DO_

}

-void OneofOptions::SerializeWithCachedSizes(

+void EnumOptions::SerializeWithCachedSizes(

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

- // @@protoc_insertion_point(serialize_start:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions)

+ // optional bool allow_alias = 2;

+ if (has_allow_alias()) {

+ ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output);

+ }

+ // optional bool deprecated = 3 [default = false];

+ if (has_deprecated()) {

+ ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output);

+ }

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

@@ -10696,35 +10831,64 @@ void OneofOptions::SerializeWithCachedSizes(

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

}

- // @@protoc_insertion_point(serialize_end:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions)

}

-::google::protobuf::uint8* OneofOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofOptions)

+::google::protobuf::uint8* EnumOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions)

+ // optional bool allow_alias = 2;

+ if (has_allow_alias()) {

+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target);

+ }

+ // optional bool deprecated = 3 [default = false];

+ if (has_deprecated()) {

+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target);

+ }

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

}

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions)

return target;

}

-size_t OneofOptions::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofOptions)

- size_t total_size = 0;

+int EnumOptions::ByteSize() const {

+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions)

+ int total_size = 0;

+ if (_has_bits_[0 / 32] & 3u) {

+ // optional bool allow_alias = 2;

+ if (has_allow_alias()) {

+ total_size += 1 + 1;

+ }

+ // optional bool deprecated = 3 [default = false];

+ if (has_deprecated()) {

+ total_size += 1 + 1;

+ }

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

total_size += _extensions_.ByteSize();

@@ -10733,75 +10897,73 @@ size_t OneofOptions::ByteSizeLong() const {

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

-void OneofOptions::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const OneofOptions* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const OneofOptions>(

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const EnumOptions* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const EnumOptions>(

&from);

if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions)

::google::protobuf::internal::ReflectionOps::Merge(from, this);

} else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.OneofOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions)

MergeFrom(*source);

}

-void OneofOptions::MergeFrom(const OneofOptions& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+void EnumOptions::MergeFrom(const EnumOptions& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

+ if (from.has_allow_alias()) {

+ set_allow_alias(from.allow_alias());

+ }

+ if (from.has_deprecated()) {

+ set_deprecated(from.deprecated());

+ }

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

-void OneofOptions::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.OneofOptions)

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-void OneofOptions::CopyFrom(const OneofOptions& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.OneofOptions)

+void EnumOptions::CopyFrom(const EnumOptions& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-bool OneofOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

+bool EnumOptions::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

-void OneofOptions::Swap(OneofOptions* other) {

+void EnumOptions::Swap(EnumOptions* other) {

if (other == this) return;

InternalSwap(other);

}

-void OneofOptions::InternalSwap(OneofOptions* other) {

+void EnumOptions::InternalSwap(EnumOptions* other) {

+ std::swap(allow_alias_, other->allow_alias_);

+ std::swap(deprecated_, other->deprecated_);

uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

@@ -10809,42 +10971,93 @@ void OneofOptions::InternalSwap(OneofOptions* other) {

_extensions_.Swap(&other->_extensions_);

}

-::google::protobuf::Metadata OneofOptions::GetMetadata() const {

+::google::protobuf::Metadata EnumOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[14];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = EnumOptions_descriptor_;

+ metadata.reflection = EnumOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// OneofOptions

+// EnumOptions

+// optional bool allow_alias = 2;

+bool EnumOptions::has_allow_alias() const {

+ return (_has_bits_[0] & 0x00000001u) != 0;

+void EnumOptions::set_has_allow_alias() {

+ _has_bits_[0] |= 0x00000001u;

+void EnumOptions::clear_has_allow_alias() {

+ _has_bits_[0] &= ~0x00000001u;

+void EnumOptions::clear_allow_alias() {

+ allow_alias_ = false;

+ clear_has_allow_alias();

+ bool EnumOptions::allow_alias() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias)

+ return allow_alias_;

+ void EnumOptions::set_allow_alias(bool value) {

+ set_has_allow_alias();

+ allow_alias_ = value;

+ // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)

+// optional bool deprecated = 3 [default = false];

+bool EnumOptions::has_deprecated() const {

+ return (_has_bits_[0] & 0x00000002u) != 0;

+void EnumOptions::set_has_deprecated() {

+ _has_bits_[0] |= 0x00000002u;

+void EnumOptions::clear_has_deprecated() {

+ _has_bits_[0] &= ~0x00000002u;

+void EnumOptions::clear_deprecated() {

+ deprecated_ = false;

+ clear_has_deprecated();

+ bool EnumOptions::deprecated() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated)

+ return deprecated_;

+ void EnumOptions::set_deprecated(bool value) {

+ set_has_deprecated();

+ deprecated_ = value;

+ // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

-int OneofOptions::uninterpreted_option_size() const {

+int EnumOptions::uninterpreted_option_size() const {

return uninterpreted_option_.size();

}

-void OneofOptions::clear_uninterpreted_option() {

+void EnumOptions::clear_uninterpreted_option() {

uninterpreted_option_.Clear();

}

-const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.uninterpreted_option)

+const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option)

return uninterpreted_option_.Get(index);

}

-::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) {

+ // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option)

return uninterpreted_option_.Mutable(index);

}

-::google::protobuf::UninterpretedOption* OneofOptions::add_uninterpreted_option() {

- // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() {

+ // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)

return uninterpreted_option_.Add();

}

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*

-OneofOptions::mutable_uninterpreted_option() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option)

+EnumOptions::mutable_uninterpreted_option() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)

return &uninterpreted_option_;

}

const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&

-OneofOptions::uninterpreted_option() const {

- // @@protoc_insertion_point(field_list:google.protobuf.OneofOptions.uninterpreted_option)

- return uninterpreted_option_;

+EnumOptions::uninterpreted_option() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option)

+ return uninterpreted_option_;

}

#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -10852,128 +11065,117 @@ OneofOptions::uninterpreted_option() const {

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int EnumOptions::kAllowAliasFieldNumber;

-const int EnumOptions::kDeprecatedFieldNumber;

-const int EnumOptions::kUninterpretedOptionFieldNumber;

+const int EnumValueOptions::kDeprecatedFieldNumber;

+const int EnumValueOptions::kUninterpretedOptionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-EnumOptions::EnumOptions()

+EnumValueOptions::EnumValueOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions)

}

-EnumOptions::EnumOptions(const EnumOptions& from)

+void EnumValueOptions::InitAsDefaultInstance() {

+EnumValueOptions::EnumValueOptions(const EnumValueOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- ::memcpy(&allow_alias_, &from.allow_alias_,

- reinterpret_cast<char*>(&deprecated_) -

- reinterpret_cast<char*>(&allow_alias_) + sizeof(deprecated_));

- // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions)

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions)

}

-void EnumOptions::SharedCtor() {

+void EnumValueOptions::SharedCtor() {

_cached_size_ = 0;

- ::memset(&allow_alias_, 0, reinterpret_cast<char*>(&deprecated_) -

- reinterpret_cast<char*>(&allow_alias_) + sizeof(deprecated_));

+ deprecated_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

-EnumOptions::~EnumOptions() {

- // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions)

+EnumValueOptions::~EnumValueOptions() {

+ // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions)

SharedDtor();

}

-void EnumOptions::SharedDtor() {

+void EnumValueOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

-void EnumOptions::SetCachedSize(int size) const {

+void EnumValueOptions::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

}

-const ::google::protobuf::Descriptor* EnumOptions::descriptor() {

+const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[15].descriptor;

+ return EnumValueOptions_descriptor_;

}

-const EnumOptions& EnumOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+const EnumValueOptions& EnumValueOptions::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

-EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const {

- EnumOptions* n = new EnumOptions;

+EnumValueOptions* EnumValueOptions::default_instance_ = NULL;

+EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const {

+ EnumValueOptions* n = new EnumValueOptions;

if (arena != NULL) {

arena->Own(n);

}

return n;

}

-void EnumOptions::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions)

+void EnumValueOptions::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions)

_extensions_.Clear();

+ deprecated_ = false;

uninterpreted_option_.Clear();

- if (_has_bits_[0 / 32] & 3u) {

- ::memset(&allow_alias_, 0, reinterpret_cast<char*>(&deprecated_) -

- reinterpret_cast<char*>(&allow_alias_) + sizeof(deprecated_));

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

-bool EnumOptions::MergePartialFromCodedStream(

+bool EnumValueOptions::MergePartialFromCodedStream(

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

#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

- // optional bool allow_alias = 2;

- case 2: {

- if (tag == 16u) {

- set_has_allow_alias();

- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

- bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

- input, &allow_alias_)));

- } else {

- goto handle_unusual;

- }

- break;

- }

- // optional bool deprecated = 3 [default = false];

- case 3: {

- if (tag == 24u) {

- set_has_deprecated();

+ // optional bool deprecated = 1 [default = false];

+ case 1: {

+ if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -10985,7 +11187,7 @@ bool EnumOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -10996,25 +11198,20 @@ bool EnumOptions::MergePartialFromCodedStream(

}

success:

- // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions)

return true;

failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions)

return false;

#undef DO_

}

-void EnumOptions::SerializeWithCachedSizes(

+void EnumValueOptions::SerializeWithCachedSizes(

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

- // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions)

- // optional bool allow_alias = 2;

- if (has_allow_alias()) {

- ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output);

- }

- // optional bool deprecated = 3 [default = false];

+ // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions)

+ // optional bool deprecated = 1 [default = false];

if (has_deprecated()) {

- ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output);

+ ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output);

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

@@ -11031,45 +11228,52 @@ void EnumOptions::SerializeWithCachedSizes(

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

}

- // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions)

}

-::google::protobuf::uint8* EnumOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions)

- // optional bool allow_alias = 2;

- if (has_allow_alias()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target);

- }

- // optional bool deprecated = 3 [default = false];

+::google::protobuf::uint8* EnumValueOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions)

+ // optional bool deprecated = 1 [default = false];

if (has_deprecated()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target);

+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target);

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

}

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions)

return target;

}

-size_t EnumOptions::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions)

- size_t total_size = 0;

+int EnumValueOptions::ByteSize() const {

+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions)

+ int total_size = 0;

+ // optional bool deprecated = 1 [default = false];

+ if (has_deprecated()) {

+ total_size += 1 + 1;

+ }

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

total_size += _extensions_.ByteSize();

@@ -11078,187 +11282,138 @@ size_t EnumOptions::ByteSizeLong() const {

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- if (_has_bits_[0 / 32] & 3u) {

- // optional bool allow_alias = 2;

- if (has_allow_alias()) {

- total_size += 1 + 1;

- }

- // optional bool deprecated = 3 [default = false];

- if (has_deprecated()) {

- total_size += 1 + 1;

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

-void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const EnumOptions* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const EnumOptions>(

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const EnumValueOptions* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const EnumValueOptions>(

&from);

if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions)

::google::protobuf::internal::ReflectionOps::Merge(from, this);

} else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions)

MergeFrom(*source);

}

-void EnumOptions::MergeFrom(const EnumOptions& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+void EnumValueOptions::MergeFrom(const EnumValueOptions& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from._has_bits_[0 / 32] & 3u) {

- if (from.has_allow_alias()) {

- set_allow_alias(from.allow_alias());

- }

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_deprecated()) {

set_deprecated(from.deprecated());

}

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

-void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions)

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-void EnumOptions::CopyFrom(const EnumOptions& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions)

+void EnumValueOptions::CopyFrom(const EnumValueOptions& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-bool EnumOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

+bool EnumValueOptions::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

-void EnumOptions::Swap(EnumOptions* other) {

+void EnumValueOptions::Swap(EnumValueOptions* other) {

if (other == this) return;

InternalSwap(other);

}

-void EnumOptions::InternalSwap(EnumOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

- std::swap(allow_alias_, other->allow_alias_);

+void EnumValueOptions::InternalSwap(EnumValueOptions* other) {

std::swap(deprecated_, other->deprecated_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

_extensions_.Swap(&other->_extensions_);

}

-::google::protobuf::Metadata EnumOptions::GetMetadata() const {

+::google::protobuf::Metadata EnumValueOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[15];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = EnumValueOptions_descriptor_;

+ metadata.reflection = EnumValueOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// EnumOptions

+// EnumValueOptions

-// optional bool allow_alias = 2;

-bool EnumOptions::has_allow_alias() const {

+// optional bool deprecated = 1 [default = false];

+bool EnumValueOptions::has_deprecated() const {

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

}

-void EnumOptions::set_has_allow_alias() {

+void EnumValueOptions::set_has_deprecated() {

_has_bits_[0] |= 0x00000001u;

}

-void EnumOptions::clear_has_allow_alias() {

+void EnumValueOptions::clear_has_deprecated() {

_has_bits_[0] &= ~0x00000001u;

}

-void EnumOptions::clear_allow_alias() {

- allow_alias_ = false;

- clear_has_allow_alias();

-bool EnumOptions::allow_alias() const {

- // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias)

- return allow_alias_;

-void EnumOptions::set_allow_alias(bool value) {

- set_has_allow_alias();

- allow_alias_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)

-// optional bool deprecated = 3 [default = false];

-bool EnumOptions::has_deprecated() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void EnumOptions::set_has_deprecated() {

- _has_bits_[0] |= 0x00000002u;

-void EnumOptions::clear_has_deprecated() {

- _has_bits_[0] &= ~0x00000002u;

-void EnumOptions::clear_deprecated() {

+void EnumValueOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool EnumOptions::deprecated() const {

- // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated)

+ bool EnumValueOptions::deprecated() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated)

return deprecated_;

}

-void EnumOptions::set_deprecated(bool value) {

+ void EnumValueOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)

+ // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

-int EnumOptions::uninterpreted_option_size() const {

+int EnumValueOptions::uninterpreted_option_size() const {

return uninterpreted_option_.size();

}

-void EnumOptions::clear_uninterpreted_option() {

+void EnumValueOptions::clear_uninterpreted_option() {

uninterpreted_option_.Clear();

}

-const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option)

+const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option)

return uninterpreted_option_.Get(index);

}

-::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) {

+ // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option)

return uninterpreted_option_.Mutable(index);

}

-::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() {

- // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() {

+ // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)

return uninterpreted_option_.Add();

}

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*

-EnumOptions::mutable_uninterpreted_option() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)

+EnumValueOptions::mutable_uninterpreted_option() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)

return &uninterpreted_option_;

}

const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&

-EnumOptions::uninterpreted_option() const {

- // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option)

+EnumValueOptions::uninterpreted_option() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option)

return uninterpreted_option_;

}

@@ -11267,108 +11422,117 @@ EnumOptions::uninterpreted_option() const {

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int EnumValueOptions::kDeprecatedFieldNumber;

-const int EnumValueOptions::kUninterpretedOptionFieldNumber;

+const int ServiceOptions::kDeprecatedFieldNumber;

+const int ServiceOptions::kUninterpretedOptionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-EnumValueOptions::EnumValueOptions()

+ServiceOptions::ServiceOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions)

-EnumValueOptions::EnumValueOptions(const EnumValueOptions& from)

- : ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- deprecated_ = from.deprecated_;

- // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions)

}

-void EnumValueOptions::SharedCtor() {

- _cached_size_ = 0;

- deprecated_ = false;

+void ServiceOptions::InitAsDefaultInstance() {

}

-EnumValueOptions::~EnumValueOptions() {

- // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions)

+ServiceOptions::ServiceOptions(const ServiceOptions& from)

+ : ::google::protobuf::Message(),

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions)

+void ServiceOptions::SharedCtor() {

+ _cached_size_ = 0;

+ deprecated_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ServiceOptions::~ServiceOptions() {

+ // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions)

SharedDtor();

}

-void EnumValueOptions::SharedDtor() {

+void ServiceOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

-void EnumValueOptions::SetCachedSize(int size) const {

+void ServiceOptions::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

}

-const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() {

+const ::google::protobuf::Descriptor* ServiceOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[16].descriptor;

+ return ServiceOptions_descriptor_;

}

-const EnumValueOptions& EnumValueOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+const ServiceOptions& ServiceOptions::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

-EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const {

- EnumValueOptions* n = new EnumValueOptions;

+ServiceOptions* ServiceOptions::default_instance_ = NULL;

+ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const {

+ ServiceOptions* n = new ServiceOptions;

if (arena != NULL) {

arena->Own(n);

}

return n;

}

-void EnumValueOptions::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions)

+void ServiceOptions::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions)

_extensions_.Clear();

- uninterpreted_option_.Clear();

deprecated_ = false;

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ uninterpreted_option_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

-bool EnumValueOptions::MergePartialFromCodedStream(

+bool ServiceOptions::MergePartialFromCodedStream(

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

#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

- // optional bool deprecated = 1 [default = false];

- case 1: {

- if (tag == 8u) {

- set_has_deprecated();

+ // optional bool deprecated = 33 [default = false];

+ case 33: {

+ if (tag == 264) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -11380,7 +11544,7 @@ bool EnumValueOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -11391,20 +11555,20 @@ bool EnumValueOptions::MergePartialFromCodedStream(

}

success:

- // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions)

return true;

failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions)

return false;

#undef DO_

}

-void EnumValueOptions::SerializeWithCachedSizes(

+void ServiceOptions::SerializeWithCachedSizes(

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

- // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions)

- // optional bool deprecated = 1 [default = false];

+ // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions)

+ // optional bool deprecated = 33 [default = false];

if (has_deprecated()) {

- ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output);

+ ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output);

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

@@ -11421,40 +11585,52 @@ void EnumValueOptions::SerializeWithCachedSizes(

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

}

- // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions)

}

-::google::protobuf::uint8* EnumValueOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions)

- // optional bool deprecated = 1 [default = false];

+::google::protobuf::uint8* ServiceOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions)

+ // optional bool deprecated = 33 [default = false];

if (has_deprecated()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target);

+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target);

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

}

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions)

return target;

}

-size_t EnumValueOptions::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions)

- size_t total_size = 0;

+int ServiceOptions::ByteSize() const {

+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions)

+ int total_size = 0;

+ // optional bool deprecated = 33 [default = false];

+ if (has_deprecated()) {

+ total_size += 2 + 1;

+ }

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

total_size += _extensions_.ByteSize();

@@ -11463,150 +11639,138 @@ size_t EnumValueOptions::ByteSizeLong() const {

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- // optional bool deprecated = 1 [default = false];

- if (has_deprecated()) {

- total_size += 1 + 1;

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

-void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const EnumValueOptions* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const EnumValueOptions>(

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const ServiceOptions* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const ServiceOptions>(

&from);

if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions)

::google::protobuf::internal::ReflectionOps::Merge(from, this);

} else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions)

MergeFrom(*source);

}

-void EnumValueOptions::MergeFrom(const EnumValueOptions& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+void ServiceOptions::MergeFrom(const ServiceOptions& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from.has_deprecated()) {

- set_deprecated(from.deprecated());

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

+ if (from.has_deprecated()) {

+ set_deprecated(from.deprecated());

+ }

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

-void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions)

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-void EnumValueOptions::CopyFrom(const EnumValueOptions& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions)

+void ServiceOptions::CopyFrom(const ServiceOptions& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-bool EnumValueOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

+bool ServiceOptions::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

-void EnumValueOptions::Swap(EnumValueOptions* other) {

+void ServiceOptions::Swap(ServiceOptions* other) {

if (other == this) return;

InternalSwap(other);

}

-void EnumValueOptions::InternalSwap(EnumValueOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

+void ServiceOptions::InternalSwap(ServiceOptions* other) {

std::swap(deprecated_, other->deprecated_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

_extensions_.Swap(&other->_extensions_);

}

-::google::protobuf::Metadata EnumValueOptions::GetMetadata() const {

+::google::protobuf::Metadata ServiceOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[16];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = ServiceOptions_descriptor_;

+ metadata.reflection = ServiceOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// EnumValueOptions

+// ServiceOptions

-// optional bool deprecated = 1 [default = false];

-bool EnumValueOptions::has_deprecated() const {

+// optional bool deprecated = 33 [default = false];

+bool ServiceOptions::has_deprecated() const {

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

}

-void EnumValueOptions::set_has_deprecated() {

+void ServiceOptions::set_has_deprecated() {

_has_bits_[0] |= 0x00000001u;

}

-void EnumValueOptions::clear_has_deprecated() {

+void ServiceOptions::clear_has_deprecated() {

_has_bits_[0] &= ~0x00000001u;

}

-void EnumValueOptions::clear_deprecated() {

+void ServiceOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool EnumValueOptions::deprecated() const {

- // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated)

+ bool ServiceOptions::deprecated() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated)

return deprecated_;

}

-void EnumValueOptions::set_deprecated(bool value) {

+ void ServiceOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)

+ // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

-int EnumValueOptions::uninterpreted_option_size() const {

+int ServiceOptions::uninterpreted_option_size() const {

return uninterpreted_option_.size();

}

-void EnumValueOptions::clear_uninterpreted_option() {

+void ServiceOptions::clear_uninterpreted_option() {

uninterpreted_option_.Clear();

}

-const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option)

+const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option)

return uninterpreted_option_.Get(index);

}

-::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) {

+ // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option)

return uninterpreted_option_.Mutable(index);

}

-::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() {

- // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() {

+ // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)

return uninterpreted_option_.Add();

}

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*

-EnumValueOptions::mutable_uninterpreted_option() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)

+ServiceOptions::mutable_uninterpreted_option() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)

return &uninterpreted_option_;

}

const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&

-EnumValueOptions::uninterpreted_option() const {

- // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option)

+ServiceOptions::uninterpreted_option() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option)

return uninterpreted_option_;

}

@@ -11615,108 +11779,117 @@ EnumValueOptions::uninterpreted_option() const {

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int ServiceOptions::kDeprecatedFieldNumber;

-const int ServiceOptions::kUninterpretedOptionFieldNumber;

+const int MethodOptions::kDeprecatedFieldNumber;

+const int MethodOptions::kUninterpretedOptionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-ServiceOptions::ServiceOptions()

+MethodOptions::MethodOptions()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions)

}

-ServiceOptions::ServiceOptions(const ServiceOptions& from)

+void MethodOptions::InitAsDefaultInstance() {

+MethodOptions::MethodOptions(const MethodOptions& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- deprecated_ = from.deprecated_;

- // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions)

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions)

}

-void ServiceOptions::SharedCtor() {

+void MethodOptions::SharedCtor() {

_cached_size_ = 0;

deprecated_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

-ServiceOptions::~ServiceOptions() {

- // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions)

+MethodOptions::~MethodOptions() {

+ // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions)

SharedDtor();

}

-void ServiceOptions::SharedDtor() {

+void MethodOptions::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

-void ServiceOptions::SetCachedSize(int size) const {

+void MethodOptions::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

}

-const ::google::protobuf::Descriptor* ServiceOptions::descriptor() {

+const ::google::protobuf::Descriptor* MethodOptions::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[17].descriptor;

+ return MethodOptions_descriptor_;

}

-const ServiceOptions& ServiceOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+const MethodOptions& MethodOptions::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

-ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const {

- ServiceOptions* n = new ServiceOptions;

+MethodOptions* MethodOptions::default_instance_ = NULL;

+MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const {

+ MethodOptions* n = new MethodOptions;

if (arena != NULL) {

arena->Own(n);

}

return n;

}

-void ServiceOptions::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions)

+void MethodOptions::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions)

_extensions_.Clear();

- uninterpreted_option_.Clear();

deprecated_ = false;

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ uninterpreted_option_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

-bool ServiceOptions::MergePartialFromCodedStream(

+bool MethodOptions::MergePartialFromCodedStream(

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

#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// optional bool deprecated = 33 [default = false];

case 33: {

- if (tag == 264u) {

- set_has_deprecated();

+ if (tag == 264) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &deprecated_)));

+ set_has_deprecated();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_uninterpreted_option;

break;

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

case 999: {

- if (tag == 7994u) {

+ if (tag == 7994) {

+ parse_uninterpreted_option:

DO_(input->IncrementRecursionDepth());

+ parse_loop_uninterpreted_option:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_uninterpreted_option()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -11728,7 +11901,7 @@ bool ServiceOptions::MergePartialFromCodedStream(

goto success;

}

if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

+ DO_(_extensions_.ParseField(tag, input, default_instance_,

mutable_unknown_fields()));

continue;

}

@@ -11739,17 +11912,17 @@ bool ServiceOptions::MergePartialFromCodedStream(

}

success:

- // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions)

return true;

failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions)

return false;

#undef DO_

}

-void ServiceOptions::SerializeWithCachedSizes(

+void MethodOptions::SerializeWithCachedSizes(

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

- // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions)

// optional bool deprecated = 33 [default = false];

if (has_deprecated()) {

::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output);

@@ -11769,13 +11942,12 @@ void ServiceOptions::SerializeWithCachedSizes(

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

}

- // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions)

}

-::google::protobuf::uint8* ServiceOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions)

+::google::protobuf::uint8* MethodOptions::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions)

// optional bool deprecated = 33 [default = false];

if (has_deprecated()) {

target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target);

@@ -11784,25 +11956,38 @@ void ServiceOptions::SerializeWithCachedSizes(

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 999, this->uninterpreted_option(i), target);

}

// Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

+ target = _extensions_.SerializeWithCachedSizesToArray(

+ 1000, 536870912, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

}

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions)

return target;

}

-size_t ServiceOptions::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions)

- size_t total_size = 0;

+int MethodOptions::ByteSize() const {

+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions)

+ int total_size = 0;

+ // optional bool deprecated = 33 [default = false];

+ if (has_deprecated()) {

+ total_size += 2 + 1;

+ }

+ // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

+ total_size += 2 * this->uninterpreted_option_size();

+ for (int i = 0; i < this->uninterpreted_option_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->uninterpreted_option(i));

+ }

total_size += _extensions_.ByteSize();

@@ -11811,150 +11996,138 @@ size_t ServiceOptions::ByteSizeLong() const {

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- // optional bool deprecated = 33 [default = false];

- if (has_deprecated()) {

- total_size += 2 + 1;

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

-void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const ServiceOptions* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const ServiceOptions>(

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const MethodOptions* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const MethodOptions>(

&from);

if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions)

::google::protobuf::internal::ReflectionOps::Merge(from, this);

} else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions)

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions)

MergeFrom(*source);

}

-void ServiceOptions::MergeFrom(const ServiceOptions& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+void MethodOptions::MergeFrom(const MethodOptions& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from.has_deprecated()) {

- set_deprecated(from.deprecated());

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

+ if (from.has_deprecated()) {

+ set_deprecated(from.deprecated());

+ }

+ _extensions_.MergeFrom(from._extensions_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

-void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions)

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-void ServiceOptions::CopyFrom(const ServiceOptions& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions)

+void MethodOptions::CopyFrom(const MethodOptions& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-bool ServiceOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

+bool MethodOptions::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

+ if (!_extensions_.IsInitialized()) return false; return true;

}

-void ServiceOptions::Swap(ServiceOptions* other) {

+void MethodOptions::Swap(MethodOptions* other) {

if (other == this) return;

InternalSwap(other);

}

-void ServiceOptions::InternalSwap(ServiceOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

+void MethodOptions::InternalSwap(MethodOptions* other) {

std::swap(deprecated_, other->deprecated_);

+ uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

_extensions_.Swap(&other->_extensions_);

}

-::google::protobuf::Metadata ServiceOptions::GetMetadata() const {

+::google::protobuf::Metadata MethodOptions::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[17];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = MethodOptions_descriptor_;

+ metadata.reflection = MethodOptions_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// ServiceOptions

+// MethodOptions

// optional bool deprecated = 33 [default = false];

-bool ServiceOptions::has_deprecated() const {

+bool MethodOptions::has_deprecated() const {

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

}

-void ServiceOptions::set_has_deprecated() {

+void MethodOptions::set_has_deprecated() {

_has_bits_[0] |= 0x00000001u;

}

-void ServiceOptions::clear_has_deprecated() {

+void MethodOptions::clear_has_deprecated() {

_has_bits_[0] &= ~0x00000001u;

}

-void ServiceOptions::clear_deprecated() {

+void MethodOptions::clear_deprecated() {

deprecated_ = false;

clear_has_deprecated();

}

-bool ServiceOptions::deprecated() const {

- // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated)

+ bool MethodOptions::deprecated() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated)

return deprecated_;

}

-void ServiceOptions::set_deprecated(bool value) {

+ void MethodOptions::set_deprecated(bool value) {

set_has_deprecated();

deprecated_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)

+ // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)

}

// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

-int ServiceOptions::uninterpreted_option_size() const {

+int MethodOptions::uninterpreted_option_size() const {

return uninterpreted_option_.size();

}

-void ServiceOptions::clear_uninterpreted_option() {

+void MethodOptions::clear_uninterpreted_option() {

uninterpreted_option_.Clear();

}

-const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option)

+const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option)

return uninterpreted_option_.Get(index);

}

-::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) {

+ // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option)

return uninterpreted_option_.Mutable(index);

}

-::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() {

- // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)

+::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() {

+ // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option)

return uninterpreted_option_.Add();

}

::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*

-ServiceOptions::mutable_uninterpreted_option() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)

+MethodOptions::mutable_uninterpreted_option() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)

return &uninterpreted_option_;

}

const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&

-ServiceOptions::uninterpreted_option() const {

- // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option)

+MethodOptions::uninterpreted_option() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option)

return uninterpreted_option_;

}

@@ -11963,133 +12136,123 @@ ServiceOptions::uninterpreted_option() const {

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int MethodOptions::kDeprecatedFieldNumber;

-const int MethodOptions::kIdempotencyLevelFieldNumber;

-const int MethodOptions::kUninterpretedOptionFieldNumber;

+const int UninterpretedOption_NamePart::kNamePartFieldNumber;

+const int UninterpretedOption_NamePart::kIsExtensionFieldNumber;

#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-MethodOptions::MethodOptions()

+UninterpretedOption_NamePart::UninterpretedOption_NamePart()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart)

}

-MethodOptions::MethodOptions(const MethodOptions& from)

+void UninterpretedOption_NamePart::InitAsDefaultInstance() {

+UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- uninterpreted_option_(from.uninterpreted_option_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- _extensions_.MergeFrom(from._extensions_);

- ::memcpy(&deprecated_, &from.deprecated_,

- reinterpret_cast<char*>(&idempotency_level_) -

- reinterpret_cast<char*>(&deprecated_) + sizeof(idempotency_level_));

- // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions)

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart)

}

-void MethodOptions::SharedCtor() {

+void UninterpretedOption_NamePart::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

- ::memset(&deprecated_, 0, reinterpret_cast<char*>(&idempotency_level_) -

- reinterpret_cast<char*>(&deprecated_) + sizeof(idempotency_level_));

+ name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ is_extension_ = false;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

-MethodOptions::~MethodOptions() {

- // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions)

+UninterpretedOption_NamePart::~UninterpretedOption_NamePart() {

+ // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart)

SharedDtor();

}

-void MethodOptions::SharedDtor() {

+void UninterpretedOption_NamePart::SharedDtor() {

+ name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (this != default_instance_) {

+ }

}

-void MethodOptions::SetCachedSize(int size) const {

+void UninterpretedOption_NamePart::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

}

-const ::google::protobuf::Descriptor* MethodOptions::descriptor() {

+const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[18].descriptor;

+ return UninterpretedOption_NamePart_descriptor_;

}

-const MethodOptions& MethodOptions::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

-MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const {

- MethodOptions* n = new MethodOptions;

+UninterpretedOption_NamePart* UninterpretedOption_NamePart::default_instance_ = NULL;

+UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const {

+ UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart;

if (arena != NULL) {

arena->Own(n);

}

return n;

}

-void MethodOptions::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions)

- _extensions_.Clear();

- uninterpreted_option_.Clear();

+void UninterpretedOption_NamePart::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart)

if (_has_bits_[0 / 32] & 3u) {

- ::memset(&deprecated_, 0, reinterpret_cast<char*>(&idempotency_level_) -

- reinterpret_cast<char*>(&deprecated_) + sizeof(idempotency_level_));

+ if (has_name_part()) {

+ name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ }

+ is_extension_ = false;

+ }

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

-bool MethodOptions::MergePartialFromCodedStream(

+bool UninterpretedOption_NamePart::MergePartialFromCodedStream(

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

#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

- // optional bool deprecated = 33 [default = false];

- case 33: {

- if (tag == 264u) {

- set_has_deprecated();

- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

- bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

- input, &deprecated_)));

+ // required string name_part = 1;

+ case 1: {

+ if (tag == 10) {

+ DO_(::google::protobuf::internal::WireFormatLite::ReadString(

+ input, this->mutable_name_part()));

+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

+ this->name_part().data(), this->name_part().length(),

+ ::google::protobuf::internal::WireFormat::PARSE,

+ "google.protobuf.UninterpretedOption.NamePart.name_part");

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(16)) goto parse_is_extension;

break;

}

- // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];

- case 34: {

- if (tag == 272u) {

- int value;

+ // required bool is_extension = 2;

+ case 2: {

+ if (tag == 16) {

+ parse_is_extension:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

- int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

- input, &value)));

- if (::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value)) {

- set_idempotency_level(static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(value));

- } else {

- mutable_unknown_fields()->AddVarint(34, value);

- }

- } else {

- goto handle_unusual;

- }

- break;

- }

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- case 999: {

- if (tag == 7994u) {

- DO_(input->IncrementRecursionDepth());

- DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

- input, add_uninterpreted_option()));

+ bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

+ input, &is_extension_)));

+ set_has_is_extension();

} else {

goto handle_unusual;

}

- input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -12100,11 +12263,6 @@ bool MethodOptions::MergePartialFromCodedStream(

::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {

goto success;

}

- if ((8000u <= tag)) {

- DO_(_extensions_.ParseField(tag, input, internal_default_instance(),

- mutable_unknown_fields()));

- continue;

- }

DO_(::google::protobuf::internal::WireFormat::SkipField(

input, tag, mutable_unknown_fields()));

break;

@@ -12112,478 +12270,75 @@ bool MethodOptions::MergePartialFromCodedStream(

}

success:

- // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart)

return true;

failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart)

return false;

#undef DO_

}

-void MethodOptions::SerializeWithCachedSizes(

+void UninterpretedOption_NamePart::SerializeWithCachedSizes(

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

- // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions)

- // optional bool deprecated = 33 [default = false];

- if (has_deprecated()) {

- ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output);

- }

- // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];

- if (has_idempotency_level()) {

- ::google::protobuf::internal::WireFormatLite::WriteEnum(

- 34, this->idempotency_level(), output);

+ // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart)

+ // required string name_part = 1;

+ if (has_name_part()) {

+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

+ this->name_part().data(), this->name_part().length(),

+ ::google::protobuf::internal::WireFormat::SERIALIZE,

+ "google.protobuf.UninterpretedOption.NamePart.name_part");

+ ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(

+ 1, this->name_part(), output);

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

- ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

- 999, this->uninterpreted_option(i), output);

+ // required bool is_extension = 2;

+ if (has_is_extension()) {

+ ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output);

}

- // Extension range [1000, 536870912)

- _extensions_.SerializeWithCachedSizes(

- 1000, 536870912, output);

if (_internal_metadata_.have_unknown_fields()) {

::google::protobuf::internal::WireFormat::SerializeUnknownFields(

unknown_fields(), output);

}

- // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart)

}

-::google::protobuf::uint8* MethodOptions::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions)

- // optional bool deprecated = 33 [default = false];

- if (has_deprecated()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target);

- }

- // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];

- if (has_idempotency_level()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(

- 34, this->idempotency_level(), target);

+::google::protobuf::uint8* UninterpretedOption_NamePart::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart)

+ // required string name_part = 1;

+ if (has_name_part()) {

+ ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

+ this->name_part().data(), this->name_part().length(),

+ ::google::protobuf::internal::WireFormat::SERIALIZE,

+ "google.protobuf.UninterpretedOption.NamePart.name_part");

+ target =

+ ::google::protobuf::internal::WireFormatLite::WriteStringToArray(

+ 1, this->name_part(), target);

}

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {

- target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 999, this->uninterpreted_option(i), false, target);

+ // required bool is_extension = 2;

+ if (has_is_extension()) {

+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target);

}

- // Extension range [1000, 536870912)

- target = _extensions_.InternalSerializeWithCachedSizesToArray(

- 1000, 536870912, false, target);

if (_internal_metadata_.have_unknown_fields()) {

target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

unknown_fields(), target);

}

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions)

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart)

return target;

}

-size_t MethodOptions::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions)

- size_t total_size = 0;

- total_size += _extensions_.ByteSize();

+int UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const {

+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart)

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

- {

- unsigned int count = this->uninterpreted_option_size();

- total_size += 2UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->uninterpreted_option(i));

- }

- if (_has_bits_[0 / 32] & 3u) {

- // optional bool deprecated = 33 [default = false];

- if (has_deprecated()) {

- total_size += 2 + 1;

- }

- // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];

- if (has_idempotency_level()) {

- total_size += 2 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->idempotency_level());

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

- return total_size;

-void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions)

- GOOGLE_DCHECK_NE(&from, this);

- const MethodOptions* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const MethodOptions>(

- &from);

- if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions)

- ::google::protobuf::internal::ReflectionOps::Merge(from, this);

- } else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions)

- MergeFrom(*source);

- }

-void MethodOptions::MergeFrom(const MethodOptions& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions)

- GOOGLE_DCHECK_NE(&from, this);

- _extensions_.MergeFrom(from._extensions_);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- uninterpreted_option_.MergeFrom(from.uninterpreted_option_);

- if (from._has_bits_[0 / 32] & 3u) {

- if (from.has_deprecated()) {

- set_deprecated(from.deprecated());

- }

- if (from.has_idempotency_level()) {

- set_idempotency_level(from.idempotency_level());

- }

-void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-void MethodOptions::CopyFrom(const MethodOptions& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-bool MethodOptions::IsInitialized() const {

- if (!_extensions_.IsInitialized()) {

- return false;

- }

- if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;

- return true;

-void MethodOptions::Swap(MethodOptions* other) {

- if (other == this) return;

- InternalSwap(other);

-void MethodOptions::InternalSwap(MethodOptions* other) {

- uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_);

- std::swap(deprecated_, other->deprecated_);

- std::swap(idempotency_level_, other->idempotency_level_);

- std::swap(_has_bits_[0], other->_has_bits_[0]);

- _internal_metadata_.Swap(&other->_internal_metadata_);

- std::swap(_cached_size_, other->_cached_size_);

- _extensions_.Swap(&other->_extensions_);

-::google::protobuf::Metadata MethodOptions::GetMetadata() const {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[18];

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// MethodOptions

-// optional bool deprecated = 33 [default = false];

-bool MethodOptions::has_deprecated() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

-void MethodOptions::set_has_deprecated() {

- _has_bits_[0] |= 0x00000001u;

-void MethodOptions::clear_has_deprecated() {

- _has_bits_[0] &= ~0x00000001u;

-void MethodOptions::clear_deprecated() {

- deprecated_ = false;

- clear_has_deprecated();

-bool MethodOptions::deprecated() const {

- // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated)

- return deprecated_;

-void MethodOptions::set_deprecated(bool value) {

- set_has_deprecated();

- deprecated_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)

-// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];

-bool MethodOptions::has_idempotency_level() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void MethodOptions::set_has_idempotency_level() {

- _has_bits_[0] |= 0x00000002u;

-void MethodOptions::clear_has_idempotency_level() {

- _has_bits_[0] &= ~0x00000002u;

-void MethodOptions::clear_idempotency_level() {

- idempotency_level_ = 0;

- clear_has_idempotency_level();

-::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const {

- // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.idempotency_level)

- return static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(idempotency_level_);

-void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) {

- assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value));

- set_has_idempotency_level();

- idempotency_level_ = value;

- // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level)

-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;

-int MethodOptions::uninterpreted_option_size() const {

- return uninterpreted_option_.size();

-void MethodOptions::clear_uninterpreted_option() {

- uninterpreted_option_.Clear();

-const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option)

- return uninterpreted_option_.Get(index);

-::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option)

- return uninterpreted_option_.Mutable(index);

-::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() {

- // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option)

- return uninterpreted_option_.Add();

-::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*

-MethodOptions::mutable_uninterpreted_option() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)

- return &uninterpreted_option_;

-const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&

-MethodOptions::uninterpreted_option() const {

- // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option)

- return uninterpreted_option_;

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int UninterpretedOption_NamePart::kNamePartFieldNumber;

-const int UninterpretedOption_NamePart::kIsExtensionFieldNumber;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-UninterpretedOption_NamePart::UninterpretedOption_NamePart()

- : ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

- SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart)

-UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from)

- : ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_name_part()) {

- name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_);

- }

- is_extension_ = from.is_extension_;

- // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart)

-void UninterpretedOption_NamePart::SharedCtor() {

- _cached_size_ = 0;

- name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- is_extension_ = false;

-UninterpretedOption_NamePart::~UninterpretedOption_NamePart() {

- // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart)

- SharedDtor();

-void UninterpretedOption_NamePart::SharedDtor() {

- name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-void UninterpretedOption_NamePart::SetCachedSize(int size) const {

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

-const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[19].descriptor;

-const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

-UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const {

- UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

-void UninterpretedOption_NamePart::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart)

- if (has_name_part()) {

- GOOGLE_DCHECK(!name_part_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*name_part_.UnsafeRawStringPointer())->clear();

- }

- is_extension_ = false;

- _has_bits_.Clear();

- _internal_metadata_.Clear();

-bool UninterpretedOption_NamePart::MergePartialFromCodedStream(

- ::google::protobuf::io::CodedInputStream* input) {

-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

- ::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart)

- for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

- tag = p.first;

- if (!p.second) goto handle_unusual;

- switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

- // required string name_part = 1;

- case 1: {

- if (tag == 10u) {

- DO_(::google::protobuf::internal::WireFormatLite::ReadString(

- input, this->mutable_name_part()));

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->name_part().data(), this->name_part().length(),

- ::google::protobuf::internal::WireFormat::PARSE,

- "google.protobuf.UninterpretedOption.NamePart.name_part");

- } else {

- goto handle_unusual;

- }

- break;

- }

- // required bool is_extension = 2;

- case 2: {

- if (tag == 16u) {

- set_has_is_extension();

- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

- bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

- input, &is_extension_)));

- } else {

- goto handle_unusual;

- }

- break;

- }

- default: {

- handle_unusual:

- if (tag == 0 ||

- ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==

- ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {

- goto success;

- }

- DO_(::google::protobuf::internal::WireFormat::SkipField(

- input, tag, mutable_unknown_fields()));

- break;

- }

-success:

- // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart)

- return true;

-failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart)

- return false;

-#undef DO_

-void UninterpretedOption_NamePart::SerializeWithCachedSizes(

- ::google::protobuf::io::CodedOutputStream* output) const {

- // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart)

- // required string name_part = 1;

- if (has_name_part()) {

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->name_part().data(), this->name_part().length(),

- ::google::protobuf::internal::WireFormat::SERIALIZE,

- "google.protobuf.UninterpretedOption.NamePart.name_part");

- ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(

- 1, this->name_part(), output);

- }

- // required bool is_extension = 2;

- if (has_is_extension()) {

- ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output);

- }

- if (_internal_metadata_.have_unknown_fields()) {

- ::google::protobuf::internal::WireFormat::SerializeUnknownFields(

- unknown_fields(), output);

- }

- // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart)

-::google::protobuf::uint8* UninterpretedOption_NamePart::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart)

- // required string name_part = 1;

- if (has_name_part()) {

- ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

- this->name_part().data(), this->name_part().length(),

- ::google::protobuf::internal::WireFormat::SERIALIZE,

- "google.protobuf.UninterpretedOption.NamePart.name_part");

- target =

- ::google::protobuf::internal::WireFormatLite::WriteStringToArray(

- 1, this->name_part(), target);

- }

- // required bool is_extension = 2;

- if (has_is_extension()) {

- target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target);

- }

- if (_internal_metadata_.have_unknown_fields()) {

- target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

- unknown_fields(), target);

- }

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart)

- return target;

-size_t UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const {

-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart)

- size_t total_size = 0;

- if (has_name_part()) {

- // required string name_part = 1;

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->name_part());

+ if (has_name_part()) {

+ // required string name_part = 1;

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->name_part());

}

if (has_is_extension()) {

@@ -12593,15 +12348,10 @@ size_t UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const {

return total_size;

}

-size_t UninterpretedOption_NamePart::ByteSizeLong() const {

+int UninterpretedOption_NamePart::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart)

- size_t total_size = 0;

+ int total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present.

// required string name_part = 1;

total_size += 1 +

@@ -12614,17 +12364,21 @@ size_t UninterpretedOption_NamePart::ByteSizeLong() const {

} else {

total_size += RequiredFieldsByteSizeFallback();

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption.NamePart)

- GOOGLE_DCHECK_NE(&from, this);

- const UninterpretedOption_NamePart* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const UninterpretedOption_NamePart* source =

::google::protobuf::internal::DynamicCastToGenerated<const UninterpretedOption_NamePart>(

&from);

if (source == NULL) {

@@ -12638,139 +12392,63 @@ void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message&

void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {

if (from.has_name_part()) {

set_has_name_part();

name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_);

}

- if (from.has_is_extension()) {

- set_is_extension(from.is_extension());

- }

-void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-bool UninterpretedOption_NamePart::IsInitialized() const {

- if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;

- return true;

-void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) {

- if (other == this) return;

- InternalSwap(other);

-void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) {

- name_part_.Swap(&other->name_part_);

- std::swap(is_extension_, other->is_extension_);

- std::swap(_has_bits_[0], other->_has_bits_[0]);

- _internal_metadata_.Swap(&other->_internal_metadata_);

- std::swap(_cached_size_, other->_cached_size_);

-::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[19];

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// UninterpretedOption_NamePart

-// required string name_part = 1;

-bool UninterpretedOption_NamePart::has_name_part() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

-void UninterpretedOption_NamePart::set_has_name_part() {

- _has_bits_[0] |= 0x00000001u;

-void UninterpretedOption_NamePart::clear_has_name_part() {

- _has_bits_[0] &= ~0x00000001u;

-void UninterpretedOption_NamePart::clear_name_part() {

- name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- clear_has_name_part();

-const ::std::string& UninterpretedOption_NamePart::name_part() const {

- // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part)

- return name_part_.GetNoArena();

-void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) {

- set_has_name_part();

- name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

-void UninterpretedOption_NamePart::set_name_part(const char* value) {

- set_has_name_part();

- name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

- // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.NamePart.name_part)

-void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) {

- set_has_name_part();

- name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

- // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.NamePart.name_part)

-::std::string* UninterpretedOption_NamePart::mutable_name_part() {

- set_has_name_part();

- // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part)

- return name_part_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-::std::string* UninterpretedOption_NamePart::release_name_part() {

- // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part)

- clear_has_name_part();

- return name_part_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) {

- if (name_part != NULL) {

- set_has_name_part();

- } else {

- clear_has_name_part();

+ if (from.has_is_extension()) {

+ set_is_extension(from.is_extension());

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

- name_part_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name_part);

- // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.NamePart.name_part)

}

-// required bool is_extension = 2;

-bool UninterpretedOption_NamePart::has_is_extension() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

}

-void UninterpretedOption_NamePart::set_has_is_extension() {

- _has_bits_[0] |= 0x00000002u;

+void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

}

-void UninterpretedOption_NamePart::clear_has_is_extension() {

- _has_bits_[0] &= ~0x00000002u;

+bool UninterpretedOption_NamePart::IsInitialized() const {

+ if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;

+ return true;

}

-void UninterpretedOption_NamePart::clear_is_extension() {

- is_extension_ = false;

- clear_has_is_extension();

+void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) {

+ if (other == this) return;

+ InternalSwap(other);

}

-bool UninterpretedOption_NamePart::is_extension() const {

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

- return is_extension_;

+void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) {

+ name_part_.Swap(&other->name_part_);

+ std::swap(is_extension_, other->is_extension_);

+ std::swap(_has_bits_[0], other->_has_bits_[0]);

+ _internal_metadata_.Swap(&other->_internal_metadata_);

+ std::swap(_cached_size_, other->_cached_size_);

}

-void UninterpretedOption_NamePart::set_is_extension(bool value) {

- set_has_is_extension();

- is_extension_ = value;

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

+::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const {

+ protobuf_AssignDescriptorsOnce();

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = UninterpretedOption_NamePart_descriptor_;

+ metadata.reflection = UninterpretedOption_NamePart_reflection_;

+ return metadata;

}

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int UninterpretedOption::kNameFieldNumber;

@@ -12784,44 +12462,31 @@ const int UninterpretedOption::kAggregateValueFieldNumber;

UninterpretedOption::UninterpretedOption()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption)

}

+void UninterpretedOption::InitAsDefaultInstance() {

UninterpretedOption::UninterpretedOption(const UninterpretedOption& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- name_(from.name_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_identifier_value()) {

- identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_);

- }

- string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_string_value()) {

- string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_);

- }

- aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_aggregate_value()) {

- aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_);

- }

- ::memcpy(&positive_int_value_, &from.positive_int_value_,

- reinterpret_cast<char*>(&double_value_) -

- reinterpret_cast<char*>(&positive_int_value_) + sizeof(double_value_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption)

}

void UninterpretedOption::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ positive_int_value_ = GOOGLE_ULONGLONG(0);

+ negative_int_value_ = GOOGLE_LONGLONG(0);

+ double_value_ = 0;

string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&positive_int_value_, 0, reinterpret_cast<char*>(&double_value_) -

- reinterpret_cast<char*>(&positive_int_value_) + sizeof(double_value_));

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

UninterpretedOption::~UninterpretedOption() {

@@ -12833,6 +12498,8 @@ void UninterpretedOption::SharedDtor() {

identifier_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

aggregate_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (this != default_instance_) {

+ }

}

void UninterpretedOption::SetCachedSize(int size) const {

@@ -12842,14 +12509,16 @@ void UninterpretedOption::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* UninterpretedOption::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[20].descriptor;

+ return UninterpretedOption_descriptor_;

}

const UninterpretedOption& UninterpretedOption::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+UninterpretedOption* UninterpretedOption::default_instance_ = NULL;

UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const {

UninterpretedOption* n = new UninterpretedOption;

if (arena != NULL) {

@@ -12860,27 +12529,43 @@ UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena)

void UninterpretedOption::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption)

- name_.Clear();

- if (_has_bits_[0 / 32] & 7u) {

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(UninterpretedOption, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<UninterpretedOption*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ if (_has_bits_[0 / 32] & 126u) {

+ ZR_(positive_int_value_, double_value_);

if (has_identifier_value()) {

- GOOGLE_DCHECK(!identifier_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*identifier_value_.UnsafeRawStringPointer())->clear();

+ identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_string_value()) {

- GOOGLE_DCHECK(!string_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*string_value_.UnsafeRawStringPointer())->clear();

+ string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_aggregate_value()) {

- GOOGLE_DCHECK(!aggregate_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*aggregate_value_.UnsafeRawStringPointer())->clear();

+ aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

- if (_has_bits_[0 / 32] & 56u) {

- ::memset(&positive_int_value_, 0, reinterpret_cast<char*>(&double_value_) -

- reinterpret_cast<char*>(&positive_int_value_) + sizeof(double_value_));

+#undef ZR_HELPER_

+#undef ZR_

+ name_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool UninterpretedOption::MergePartialFromCodedStream(

@@ -12889,26 +12574,30 @@ bool UninterpretedOption::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// repeated .google.protobuf.UninterpretedOption.NamePart name = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_name:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_name()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_loop_name;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectTag(26)) goto parse_identifier_value;

break;

}

// optional string identifier_value = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_identifier_value:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_identifier_value()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -12918,62 +12607,72 @@ bool UninterpretedOption::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(32)) goto parse_positive_int_value;

break;

}

// optional uint64 positive_int_value = 4;

case 4: {

- if (tag == 32u) {

- set_has_positive_int_value();

+ if (tag == 32) {

+ parse_positive_int_value:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(

input, &positive_int_value_)));

+ set_has_positive_int_value();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(40)) goto parse_negative_int_value;

break;

}

// optional int64 negative_int_value = 5;

case 5: {

- if (tag == 40u) {

- set_has_negative_int_value();

+ if (tag == 40) {

+ parse_negative_int_value:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(

input, &negative_int_value_)));

+ set_has_negative_int_value();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(49)) goto parse_double_value;

break;

}

// optional double double_value = 6;

case 6: {

- if (tag == 49u) {

- set_has_double_value();

+ if (tag == 49) {

+ parse_double_value:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(

input, &double_value_)));

+ set_has_double_value();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(58)) goto parse_string_value;

break;

}

// optional bytes string_value = 7;

case 7: {

- if (tag == 58u) {

+ if (tag == 58) {

+ parse_string_value:

DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(

input, this->mutable_string_value()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(66)) goto parse_aggregate_value;

break;

}

// optional string aggregate_value = 8;

case 8: {

- if (tag == 66u) {

+ if (tag == 66) {

+ parse_aggregate_value:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_aggregate_value()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -12983,6 +12682,7 @@ bool UninterpretedOption::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -13065,15 +12765,14 @@ void UninterpretedOption::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption)

}

-::google::protobuf::uint8* UninterpretedOption::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* UninterpretedOption::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption)

// repeated .google.protobuf.UninterpretedOption.NamePart name = 2;

for (unsigned int i = 0, n = this->name_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 2, this->name(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 2, this->name(i), target);

}

// optional string identifier_value = 3;

@@ -13128,27 +12827,11 @@ void UninterpretedOption::SerializeWithCachedSizes(

return target;

}

-size_t UninterpretedOption::ByteSizeLong() const {

+int UninterpretedOption::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption)

- size_t total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;

- {

- unsigned int count = this->name_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->name(i));

- }

+ int total_size = 0;

- if (_has_bits_[0 / 32] & 63u) {

+ if (_has_bits_[1 / 32] & 126u) {

// optional string identifier_value = 3;

if (has_identifier_value()) {

total_size += 1 +

@@ -13156,20 +12839,6 @@ size_t UninterpretedOption::ByteSizeLong() const {

this->identifier_value());

}

- // optional bytes string_value = 7;

- if (has_string_value()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::BytesSize(

- this->string_value());

- }

- // optional string aggregate_value = 8;

- if (has_aggregate_value()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->aggregate_value());

- }

// optional uint64 positive_int_value = 4;

if (has_positive_int_value()) {

total_size += 1 +

@@ -13189,18 +12858,44 @@ size_t UninterpretedOption::ByteSizeLong() const {

total_size += 1 + 8;

}

+ // optional bytes string_value = 7;

+ if (has_string_value()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::BytesSize(

+ this->string_value());

+ }

+ // optional string aggregate_value = 8;

+ if (has_aggregate_value()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->aggregate_value());

+ }

+ // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;

+ total_size += 1 * this->name_size();

+ for (int i = 0; i < this->name_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->name(i));

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption)

- GOOGLE_DCHECK_NE(&from, this);

- const UninterpretedOption* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const UninterpretedOption* source =

::google::protobuf::internal::DynamicCastToGenerated<const UninterpretedOption>(

&from);

if (source == NULL) {

@@ -13214,22 +12909,13 @@ void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) {

void UninterpretedOption::MergeFrom(const UninterpretedOption& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

name_.MergeFrom(from.name_);

- if (from._has_bits_[0 / 32] & 63u) {

+ if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) {

if (from.has_identifier_value()) {

set_has_identifier_value();

identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_);

}

- if (from.has_string_value()) {

- set_has_string_value();

- string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_);

- }

- if (from.has_aggregate_value()) {

- set_has_aggregate_value();

- aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_);

- }

if (from.has_positive_int_value()) {

set_positive_int_value(from.positive_int_value());

}

@@ -13239,6 +12925,17 @@ void UninterpretedOption::MergeFrom(const UninterpretedOption& from) {

if (from.has_double_value()) {

set_double_value(from.double_value());

}

+ if (from.has_string_value()) {

+ set_has_string_value();

+ string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_);

+ }

+ if (from.has_aggregate_value()) {

+ set_has_aggregate_value();

+ aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_);

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}

@@ -13257,6 +12954,7 @@ void UninterpretedOption::CopyFrom(const UninterpretedOption& from) {

}

bool UninterpretedOption::IsInitialized() const {

if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false;

return true;

}

@@ -13268,11 +12966,11 @@ void UninterpretedOption::Swap(UninterpretedOption* other) {

void UninterpretedOption::InternalSwap(UninterpretedOption* other) {

name_.UnsafeArenaSwap(&other->name_);

identifier_value_.Swap(&other->identifier_value_);

- string_value_.Swap(&other->string_value_);

- aggregate_value_.Swap(&other->aggregate_value_);

std::swap(positive_int_value_, other->positive_int_value_);

std::swap(negative_int_value_, other->negative_int_value_);

std::swap(double_value_, other->double_value_);

+ string_value_.Swap(&other->string_value_);

+ aggregate_value_.Swap(&other->aggregate_value_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

@@ -13280,10 +12978,95 @@ void UninterpretedOption::InternalSwap(UninterpretedOption* other) {

::google::protobuf::Metadata UninterpretedOption::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[20];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = UninterpretedOption_descriptor_;

+ metadata.reflection = UninterpretedOption_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

+// UninterpretedOption_NamePart

+// required string name_part = 1;

+bool UninterpretedOption_NamePart::has_name_part() const {

+ return (_has_bits_[0] & 0x00000001u) != 0;

+void UninterpretedOption_NamePart::set_has_name_part() {

+ _has_bits_[0] |= 0x00000001u;

+void UninterpretedOption_NamePart::clear_has_name_part() {

+ _has_bits_[0] &= ~0x00000001u;

+void UninterpretedOption_NamePart::clear_name_part() {

+ name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ clear_has_name_part();

+ const ::std::string& UninterpretedOption_NamePart::name_part() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part)

+ return name_part_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) {

+ set_has_name_part();

+ name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

+ void UninterpretedOption_NamePart::set_name_part(const char* value) {

+ set_has_name_part();

+ name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.NamePart.name_part)

+ void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) {

+ set_has_name_part();

+ name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ ::std::string(reinterpret_cast<const char*>(value), size));

+ // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.NamePart.name_part)

+ ::std::string* UninterpretedOption_NamePart::mutable_name_part() {

+ set_has_name_part();

+ // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part)

+ return name_part_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ ::std::string* UninterpretedOption_NamePart::release_name_part() {

+ // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part)

+ clear_has_name_part();

+ return name_part_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) {

+ if (name_part != NULL) {

+ set_has_name_part();

+ } else {

+ clear_has_name_part();

+ }

+ name_part_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name_part);

+ // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.NamePart.name_part)

+// required bool is_extension = 2;

+bool UninterpretedOption_NamePart::has_is_extension() const {

+ return (_has_bits_[0] & 0x00000002u) != 0;

+void UninterpretedOption_NamePart::set_has_is_extension() {

+ _has_bits_[0] |= 0x00000002u;

+void UninterpretedOption_NamePart::clear_has_is_extension() {

+ _has_bits_[0] &= ~0x00000002u;

+void UninterpretedOption_NamePart::clear_is_extension() {

+ is_extension_ = false;

+ clear_has_is_extension();

+ bool UninterpretedOption_NamePart::is_extension() const {

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

+ return is_extension_;

+ void UninterpretedOption_NamePart::set_is_extension(bool value) {

+ set_has_is_extension();

+ is_extension_ = value;

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

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

// UninterpretedOption

// repeated .google.protobuf.UninterpretedOption.NamePart name = 2;

@@ -13318,49 +13101,49 @@ UninterpretedOption::name() const {

// optional string identifier_value = 3;

bool UninterpretedOption::has_identifier_value() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

+ return (_has_bits_[0] & 0x00000002u) != 0;

}

void UninterpretedOption::set_has_identifier_value() {

- _has_bits_[0] |= 0x00000001u;

+ _has_bits_[0] |= 0x00000002u;

}

void UninterpretedOption::clear_has_identifier_value() {

- _has_bits_[0] &= ~0x00000001u;

+ _has_bits_[0] &= ~0x00000002u;

}

void UninterpretedOption::clear_identifier_value() {

identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_identifier_value();

}

-const ::std::string& UninterpretedOption::identifier_value() const {

+ const ::std::string& UninterpretedOption::identifier_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value)

- return identifier_value_.GetNoArena();

+ return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_identifier_value(const ::std::string& value) {

+ void UninterpretedOption::set_identifier_value(const ::std::string& value) {

set_has_identifier_value();

identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value)

}

-void UninterpretedOption::set_identifier_value(const char* value) {

+ void UninterpretedOption::set_identifier_value(const char* value) {

set_has_identifier_value();

identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value)

}

-void UninterpretedOption::set_identifier_value(const char* value, size_t size) {

+ void UninterpretedOption::set_identifier_value(const char* value, size_t size) {

set_has_identifier_value();

identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value)

}

-::std::string* UninterpretedOption::mutable_identifier_value() {

+ ::std::string* UninterpretedOption::mutable_identifier_value() {

set_has_identifier_value();

// @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value)

return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* UninterpretedOption::release_identifier_value() {

+ ::std::string* UninterpretedOption::release_identifier_value() {

// @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value)

clear_has_identifier_value();

return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) {

+ void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) {

if (identifier_value != NULL) {

set_has_identifier_value();

} else {

@@ -13372,23 +13155,23 @@ void UninterpretedOption::set_allocated_identifier_value(::std::string* identifi

// optional uint64 positive_int_value = 4;

bool UninterpretedOption::has_positive_int_value() const {

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

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void UninterpretedOption::set_has_positive_int_value() {

- _has_bits_[0] |= 0x00000008u;

+ _has_bits_[0] |= 0x00000004u;

}

void UninterpretedOption::clear_has_positive_int_value() {

- _has_bits_[0] &= ~0x00000008u;

+ _has_bits_[0] &= ~0x00000004u;

}

void UninterpretedOption::clear_positive_int_value() {

positive_int_value_ = GOOGLE_ULONGLONG(0);

clear_has_positive_int_value();

}

-::google::protobuf::uint64 UninterpretedOption::positive_int_value() const {

+ ::google::protobuf::uint64 UninterpretedOption::positive_int_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value)

return positive_int_value_;

}

-void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) {

+ void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) {

set_has_positive_int_value();

positive_int_value_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)

@@ -13396,23 +13179,23 @@ void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 valu

// optional int64 negative_int_value = 5;

bool UninterpretedOption::has_negative_int_value() const {

- return (_has_bits_[0] & 0x00000010u) != 0;

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

}

void UninterpretedOption::set_has_negative_int_value() {

- _has_bits_[0] |= 0x00000010u;

+ _has_bits_[0] |= 0x00000008u;

}

void UninterpretedOption::clear_has_negative_int_value() {

- _has_bits_[0] &= ~0x00000010u;

+ _has_bits_[0] &= ~0x00000008u;

}

void UninterpretedOption::clear_negative_int_value() {

negative_int_value_ = GOOGLE_LONGLONG(0);

clear_has_negative_int_value();

}

-::google::protobuf::int64 UninterpretedOption::negative_int_value() const {

+ ::google::protobuf::int64 UninterpretedOption::negative_int_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value)

return negative_int_value_;

}

-void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) {

+ void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) {

set_has_negative_int_value();

negative_int_value_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)

@@ -13420,23 +13203,23 @@ void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value

// optional double double_value = 6;

bool UninterpretedOption::has_double_value() const {

- return (_has_bits_[0] & 0x00000020u) != 0;

+ return (_has_bits_[0] & 0x00000010u) != 0;

}

void UninterpretedOption::set_has_double_value() {

- _has_bits_[0] |= 0x00000020u;

+ _has_bits_[0] |= 0x00000010u;

}

void UninterpretedOption::clear_has_double_value() {

- _has_bits_[0] &= ~0x00000020u;

+ _has_bits_[0] &= ~0x00000010u;

}

void UninterpretedOption::clear_double_value() {

double_value_ = 0;

clear_has_double_value();

}

-double UninterpretedOption::double_value() const {

+ double UninterpretedOption::double_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value)

return double_value_;

}

-void UninterpretedOption::set_double_value(double value) {

+ void UninterpretedOption::set_double_value(double value) {

set_has_double_value();

double_value_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)

@@ -13444,49 +13227,49 @@ void UninterpretedOption::set_double_value(double value) {

// optional bytes string_value = 7;

bool UninterpretedOption::has_string_value() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

+ return (_has_bits_[0] & 0x00000020u) != 0;

}

void UninterpretedOption::set_has_string_value() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000020u;

}

void UninterpretedOption::clear_has_string_value() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000020u;

}

void UninterpretedOption::clear_string_value() {

string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_string_value();

}

-const ::std::string& UninterpretedOption::string_value() const {

+ const ::std::string& UninterpretedOption::string_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value)

- return string_value_.GetNoArena();

+ return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_string_value(const ::std::string& value) {

+ void UninterpretedOption::set_string_value(const ::std::string& value) {

set_has_string_value();

string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value)

}

-void UninterpretedOption::set_string_value(const char* value) {

+ void UninterpretedOption::set_string_value(const char* value) {

set_has_string_value();

string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value)

}

-void UninterpretedOption::set_string_value(const void* value, size_t size) {

+ void UninterpretedOption::set_string_value(const void* value, size_t size) {

set_has_string_value();

string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value)

}

-::std::string* UninterpretedOption::mutable_string_value() {

+ ::std::string* UninterpretedOption::mutable_string_value() {

set_has_string_value();

// @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value)

return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* UninterpretedOption::release_string_value() {

+ ::std::string* UninterpretedOption::release_string_value() {

// @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value)

clear_has_string_value();

return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_allocated_string_value(::std::string* string_value) {

+ void UninterpretedOption::set_allocated_string_value(::std::string* string_value) {

if (string_value != NULL) {

set_has_string_value();

} else {

@@ -13498,49 +13281,49 @@ void UninterpretedOption::set_allocated_string_value(::std::string* string_value

// optional string aggregate_value = 8;

bool UninterpretedOption::has_aggregate_value() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

+ return (_has_bits_[0] & 0x00000040u) != 0;

}

void UninterpretedOption::set_has_aggregate_value() {

- _has_bits_[0] |= 0x00000004u;

+ _has_bits_[0] |= 0x00000040u;

}

void UninterpretedOption::clear_has_aggregate_value() {

- _has_bits_[0] &= ~0x00000004u;

+ _has_bits_[0] &= ~0x00000040u;

}

void UninterpretedOption::clear_aggregate_value() {

aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_aggregate_value();

}

-const ::std::string& UninterpretedOption::aggregate_value() const {

+ const ::std::string& UninterpretedOption::aggregate_value() const {

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

- return aggregate_value_.GetNoArena();

+ return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_aggregate_value(const ::std::string& value) {

+ void UninterpretedOption::set_aggregate_value(const ::std::string& value) {

set_has_aggregate_value();

aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

}

-void UninterpretedOption::set_aggregate_value(const char* value) {

+ void UninterpretedOption::set_aggregate_value(const char* value) {

set_has_aggregate_value();

aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

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

}

-void UninterpretedOption::set_aggregate_value(const char* value, size_t size) {

+ void UninterpretedOption::set_aggregate_value(const char* value, size_t size) {

set_has_aggregate_value();

aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

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

}

-::std::string* UninterpretedOption::mutable_aggregate_value() {

+ ::std::string* UninterpretedOption::mutable_aggregate_value() {

set_has_aggregate_value();

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

return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* UninterpretedOption::release_aggregate_value() {

+ ::std::string* UninterpretedOption::release_aggregate_value() {

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

clear_has_aggregate_value();

return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) {

+ void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) {

if (aggregate_value != NULL) {

set_has_aggregate_value();

} else {

@@ -13564,36 +13347,27 @@ const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber;

SourceCodeInfo_Location::SourceCodeInfo_Location()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo.Location)

}

+void SourceCodeInfo_Location::InitAsDefaultInstance() {

SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- path_(from.path_),

- span_(from.span_),

- leading_detached_comments_(from.leading_detached_comments_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_leading_comments()) {

- leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_);

- }

- trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_trailing_comments()) {

- trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_);

- }

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location)

}

void SourceCodeInfo_Location::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

SourceCodeInfo_Location::~SourceCodeInfo_Location() {

@@ -13604,6 +13378,8 @@ SourceCodeInfo_Location::~SourceCodeInfo_Location() {

void SourceCodeInfo_Location::SharedDtor() {

leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (this != default_instance_) {

+ }

}

void SourceCodeInfo_Location::SetCachedSize(int size) const {

@@ -13613,14 +13389,16 @@ void SourceCodeInfo_Location::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* SourceCodeInfo_Location::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[21].descriptor;

+ return SourceCodeInfo_Location_descriptor_;

}

const SourceCodeInfo_Location& SourceCodeInfo_Location::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+SourceCodeInfo_Location* SourceCodeInfo_Location::default_instance_ = NULL;

SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena* arena) const {

SourceCodeInfo_Location* n = new SourceCodeInfo_Location;

if (arena != NULL) {

@@ -13631,21 +13409,21 @@ SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena*

void SourceCodeInfo_Location::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location)

- path_.Clear();

- span_.Clear();

- leading_detached_comments_.Clear();

- if (_has_bits_[0 / 32] & 3u) {

+ if (_has_bits_[0 / 32] & 12u) {

if (has_leading_comments()) {

- GOOGLE_DCHECK(!leading_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*leading_comments_.UnsafeRawStringPointer())->clear();

+ leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

if (has_trailing_comments()) {

- GOOGLE_DCHECK(!trailing_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*trailing_comments_.UnsafeRawStringPointer())->clear();

+ trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ path_.Clear();

+ span_.Clear();

+ leading_detached_comments_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool SourceCodeInfo_Location::MergePartialFromCodedStream(

@@ -13654,45 +13432,49 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// repeated int32 path = 1 [packed = true];

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, this->mutable_path())));

- } else if (tag == 8u) {

+ } else if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

- 1, 10u, input, this->mutable_path())));

+ 1, 10, input, this->mutable_path())));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_span;

break;

}

// repeated int32 span = 2 [packed = true];

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_span:

DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, this->mutable_span())));

- } else if (tag == 16u) {

+ } else if (tag == 16) {

DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

- 1, 18u, input, this->mutable_span())));

+ 1, 18, input, this->mutable_span())));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(26)) goto parse_leading_comments;

break;

}

// optional string leading_comments = 3;

case 3: {

- if (tag == 26u) {

+ if (tag == 26) {

+ parse_leading_comments:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_leading_comments()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -13702,12 +13484,14 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(34)) goto parse_trailing_comments;

break;

}

// optional string trailing_comments = 4;

case 4: {

- if (tag == 34u) {

+ if (tag == 34) {

+ parse_trailing_comments:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_trailing_comments()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -13717,12 +13501,14 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(50)) goto parse_leading_detached_comments;

break;

}

// repeated string leading_detached_comments = 6;

case 6: {

- if (tag == 50u) {

+ if (tag == 50) {

+ parse_leading_detached_comments:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->add_leading_detached_comments()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -13733,6 +13519,8 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(50)) goto parse_leading_detached_comments;

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -13818,9 +13606,8 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location)

}

-::google::protobuf::uint8* SourceCodeInfo_Location::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* SourceCodeInfo_Location::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location)

// repeated int32 path = 1 [packed = true];

if (this->path_size() > 0) {

@@ -13890,20 +13677,30 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes(

return target;

}

-size_t SourceCodeInfo_Location::ByteSizeLong() const {

+int SourceCodeInfo_Location::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location)

- size_t total_size = 0;

+ int total_size = 0;

+ if (_has_bits_[2 / 32] & 12u) {

+ // optional string leading_comments = 3;

+ if (has_leading_comments()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->leading_comments());

+ }

+ // optional string trailing_comments = 4;

+ if (has_trailing_comments()) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::StringSize(

+ this->trailing_comments());

+ }

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

}

// repeated int32 path = 1 [packed = true];

{

- size_t data_size = 0;

- unsigned int count = this->path_size();

- for (unsigned int i = 0; i < count; i++) {

+ int data_size = 0;

+ for (int i = 0; i < this->path_size(); i++) {

data_size += ::google::protobuf::internal::WireFormatLite::

Int32Size(this->path(i));

}

@@ -13911,18 +13708,16 @@ size_t SourceCodeInfo_Location::ByteSizeLong() const {

total_size += 1 +

::google::protobuf::internal::WireFormatLite::Int32Size(data_size);

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(data_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _path_cached_byte_size_ = cached_size;

+ _path_cached_byte_size_ = data_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

total_size += data_size;

}

// repeated int32 span = 2 [packed = true];

{

- size_t data_size = 0;

- unsigned int count = this->span_size();

- for (unsigned int i = 0; i < count; i++) {

+ int data_size = 0;

+ for (int i = 0; i < this->span_size(); i++) {

data_size += ::google::protobuf::internal::WireFormatLite::

Int32Size(this->span(i));

}

@@ -13930,48 +13725,34 @@ size_t SourceCodeInfo_Location::ByteSizeLong() const {

total_size += 1 +

::google::protobuf::internal::WireFormatLite::Int32Size(data_size);

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(data_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _span_cached_byte_size_ = cached_size;

+ _span_cached_byte_size_ = data_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

total_size += data_size;

}

// repeated string leading_detached_comments = 6;

- total_size += 1 *

- ::google::protobuf::internal::FromIntSize(this->leading_detached_comments_size());

+ total_size += 1 * this->leading_detached_comments_size();

for (int i = 0; i < this->leading_detached_comments_size(); i++) {

total_size += ::google::protobuf::internal::WireFormatLite::StringSize(

this->leading_detached_comments(i));

}

- if (_has_bits_[0 / 32] & 3u) {

- // optional string leading_comments = 3;

- if (has_leading_comments()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->leading_comments());

- }

- // optional string trailing_comments = 4;

- if (has_trailing_comments()) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->trailing_comments());

- }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo.Location)

- GOOGLE_DCHECK_NE(&from, this);

- const SourceCodeInfo_Location* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const SourceCodeInfo_Location* source =

::google::protobuf::internal::DynamicCastToGenerated<const SourceCodeInfo_Location>(

&from);

if (source == NULL) {

@@ -13985,12 +13766,11 @@ void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from)

void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

path_.MergeFrom(from.path_);

span_.MergeFrom(from.span_);

leading_detached_comments_.MergeFrom(from.leading_detached_comments_);

- if (from._has_bits_[0 / 32] & 3u) {

+ if (from._has_bits_[2 / 32] & (0xffu << (2 % 32))) {

if (from.has_leading_comments()) {

set_has_leading_comments();

leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_);

@@ -14000,44 +13780,291 @@ void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) {

trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_);

}

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

+void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

+bool SourceCodeInfo_Location::IsInitialized() const {

+ return true;

+void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) {

+ if (other == this) return;

+ InternalSwap(other);

+void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) {

+ path_.UnsafeArenaSwap(&other->path_);

+ span_.UnsafeArenaSwap(&other->span_);

+ leading_comments_.Swap(&other->leading_comments_);

+ trailing_comments_.Swap(&other->trailing_comments_);

+ leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_);

+ std::swap(_has_bits_[0], other->_has_bits_[0]);

+ _internal_metadata_.Swap(&other->_internal_metadata_);

+ std::swap(_cached_size_, other->_cached_size_);

+::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const {

+ protobuf_AssignDescriptorsOnce();

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = SourceCodeInfo_Location_descriptor_;

+ metadata.reflection = SourceCodeInfo_Location_reflection_;

+ return metadata;

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

+#if !defined(_MSC_VER) || _MSC_VER >= 1900

+const int SourceCodeInfo::kLocationFieldNumber;

+#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

+SourceCodeInfo::SourceCodeInfo()

+ : ::google::protobuf::Message(), _internal_metadata_(NULL) {

+ SharedCtor();

+ // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo)

+void SourceCodeInfo::InitAsDefaultInstance() {

+SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from)

+ : ::google::protobuf::Message(),

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

+ // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo)

+void SourceCodeInfo::SharedCtor() {

+ _cached_size_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+SourceCodeInfo::~SourceCodeInfo() {

+ // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo)

+ SharedDtor();

+void SourceCodeInfo::SharedDtor() {

+ if (this != default_instance_) {

+ }

+void SourceCodeInfo::SetCachedSize(int size) const {

+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

+ _cached_size_ = size;

+ GOOGLE_SAFE_CONCURRENT_WRITES_END();

+const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return SourceCodeInfo_descriptor_;

+const SourceCodeInfo& SourceCodeInfo::default_instance() {

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

+SourceCodeInfo* SourceCodeInfo::default_instance_ = NULL;

+SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const {

+ SourceCodeInfo* n = new SourceCodeInfo;

+ if (arena != NULL) {

+ arena->Own(n);

+ }

+ return n;

+void SourceCodeInfo::Clear() {

+// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo)

+ location_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

+bool SourceCodeInfo::MergePartialFromCodedStream(

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

+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

+ ::google::protobuf::uint32 tag;

+ // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo)

+ for (;;) {

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

+ tag = p.first;

+ if (!p.second) goto handle_unusual;

+ switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

+ // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

+ case 1: {

+ if (tag == 10) {

+ DO_(input->IncrementRecursionDepth());

+ parse_loop_location:

+ DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

+ input, add_location()));

+ } else {

+ goto handle_unusual;

+ }

+ if (input->ExpectTag(10)) goto parse_loop_location;

+ input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

+ break;

+ }

+ default: {

+ handle_unusual:

+ if (tag == 0 ||

+ ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==

+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {

+ goto success;

+ }

+ DO_(::google::protobuf::internal::WireFormat::SkipField(

+ input, tag, mutable_unknown_fields()));

+ break;

+ }

+success:

+ // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo)

+ return true;

+failure:

+ // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo)

+ return false;

+#undef DO_

+void SourceCodeInfo::SerializeWithCachedSizes(

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

+ // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo)

+ // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

+ for (unsigned int i = 0, n = this->location_size(); i < n; i++) {

+ ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

+ 1, this->location(i), output);

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ ::google::protobuf::internal::WireFormat::SerializeUnknownFields(

+ unknown_fields(), output);

+ }

+ // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo)

+::google::protobuf::uint8* SourceCodeInfo::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

+ // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo)

+ // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

+ for (unsigned int i = 0, n = this->location_size(); i < n; i++) {

+ target = ::google::protobuf::internal::WireFormatLite::

+ WriteMessageNoVirtualToArray(

+ 1, this->location(i), target);

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

+ unknown_fields(), target);

+ }

+ // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo)

+ return target;

+int SourceCodeInfo::ByteSize() const {

+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo)

+ int total_size = 0;

+ // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

+ total_size += 1 * this->location_size();

+ for (int i = 0; i < this->location_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->location(i));

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

+ _cached_size_ = total_size;

+ GOOGLE_SAFE_CONCURRENT_WRITES_END();

+ return total_size;

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const SourceCodeInfo* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const SourceCodeInfo>(

+ &from);

+ if (source == NULL) {

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo)

+ ::google::protobuf::internal::ReflectionOps::Merge(from, this);

+ } else {

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo)

+ MergeFrom(*source);

+ }

}

-void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location)

+void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ location_.MergeFrom(from.location_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location)

+void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo)

if (&from == this) return;

Clear();

MergeFrom(from);

}

-bool SourceCodeInfo_Location::IsInitialized() const {

+bool SourceCodeInfo::IsInitialized() const {

return true;

}

-void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) {

+void SourceCodeInfo::Swap(SourceCodeInfo* other) {

if (other == this) return;

InternalSwap(other);

}

-void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) {

- path_.UnsafeArenaSwap(&other->path_);

- span_.UnsafeArenaSwap(&other->span_);

- leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_);

- leading_comments_.Swap(&other->leading_comments_);

- trailing_comments_.Swap(&other->trailing_comments_);

+void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) {

+ location_.UnsafeArenaSwap(&other->location_);

std::swap(_has_bits_[0], other->_has_bits_[0]);

_internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

-::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const {

+::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[21];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = SourceCodeInfo_descriptor_;

+ metadata.reflection = SourceCodeInfo_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

@@ -14050,24 +14077,24 @@ int SourceCodeInfo_Location::path_size() const {

void SourceCodeInfo_Location::clear_path() {

path_.Clear();

}

-::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const {

+ ::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path)

return path_.Get(index);

}

-void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) {

+ void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) {

path_.Set(index, value);

// @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path)

}

-void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) {

+ void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) {

path_.Add(value);

// @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path)

}

-const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

+ const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

SourceCodeInfo_Location::path() const {

// @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path)

return path_;

}

-::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

SourceCodeInfo_Location::mutable_path() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path)

return &path_;

@@ -14080,24 +14107,24 @@ int SourceCodeInfo_Location::span_size() const {

void SourceCodeInfo_Location::clear_span() {

span_.Clear();

}

-::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const {

+ ::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span)

return span_.Get(index);

}

-void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) {

+ void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) {

span_.Set(index, value);

// @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span)

}

-void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) {

+ void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) {

span_.Add(value);

// @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span)

}

-const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

+ const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

SourceCodeInfo_Location::span() const {

// @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span)

return span_;

}

-::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

SourceCodeInfo_Location::mutable_span() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span)

return &span_;

@@ -14105,49 +14132,49 @@ SourceCodeInfo_Location::mutable_span() {

// optional string leading_comments = 3;

bool SourceCodeInfo_Location::has_leading_comments() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

+ return (_has_bits_[0] & 0x00000004u) != 0;

}

void SourceCodeInfo_Location::set_has_leading_comments() {

- _has_bits_[0] |= 0x00000001u;

+ _has_bits_[0] |= 0x00000004u;

}

void SourceCodeInfo_Location::clear_has_leading_comments() {

- _has_bits_[0] &= ~0x00000001u;

+ _has_bits_[0] &= ~0x00000004u;

}

void SourceCodeInfo_Location::clear_leading_comments() {

leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_leading_comments();

}

-const ::std::string& SourceCodeInfo_Location::leading_comments() const {

+ const ::std::string& SourceCodeInfo_Location::leading_comments() const {

// @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments)

- return leading_comments_.GetNoArena();

+ return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) {

+ void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) {

set_has_leading_comments();

leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments)

}

-void SourceCodeInfo_Location::set_leading_comments(const char* value) {

+ void SourceCodeInfo_Location::set_leading_comments(const char* value) {

set_has_leading_comments();

leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_comments)

}

-void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) {

+ void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) {

set_has_leading_comments();

leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_comments)

}

-::std::string* SourceCodeInfo_Location::mutable_leading_comments() {

+ ::std::string* SourceCodeInfo_Location::mutable_leading_comments() {

set_has_leading_comments();

// @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_comments)

return leading_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* SourceCodeInfo_Location::release_leading_comments() {

+ ::std::string* SourceCodeInfo_Location::release_leading_comments() {

// @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments)

clear_has_leading_comments();

return leading_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) {

+ void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) {

if (leading_comments != NULL) {

set_has_leading_comments();

} else {

@@ -14159,345 +14186,115 @@ void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* lead

// optional string trailing_comments = 4;

bool SourceCodeInfo_Location::has_trailing_comments() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

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

}

void SourceCodeInfo_Location::set_has_trailing_comments() {

- _has_bits_[0] |= 0x00000002u;

+ _has_bits_[0] |= 0x00000008u;

}

void SourceCodeInfo_Location::clear_has_trailing_comments() {

- _has_bits_[0] &= ~0x00000002u;

+ _has_bits_[0] &= ~0x00000008u;

}

void SourceCodeInfo_Location::clear_trailing_comments() {

trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

clear_has_trailing_comments();

}

-const ::std::string& SourceCodeInfo_Location::trailing_comments() const {

+ const ::std::string& SourceCodeInfo_Location::trailing_comments() const {

// @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments)

- return trailing_comments_.GetNoArena();

+ return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) {

+ void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) {

set_has_trailing_comments();

trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

// @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments)

}

-void SourceCodeInfo_Location::set_trailing_comments(const char* value) {

+ void SourceCodeInfo_Location::set_trailing_comments(const char* value) {

set_has_trailing_comments();

trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

// @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.trailing_comments)

}

-void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) {

+ void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) {

set_has_trailing_comments();

trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

::std::string(reinterpret_cast<const char*>(value), size));

// @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.trailing_comments)

}

-::std::string* SourceCodeInfo_Location::mutable_trailing_comments() {

+ ::std::string* SourceCodeInfo_Location::mutable_trailing_comments() {

set_has_trailing_comments();

// @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.trailing_comments)

return trailing_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-::std::string* SourceCodeInfo_Location::release_trailing_comments() {

+ ::std::string* SourceCodeInfo_Location::release_trailing_comments() {

// @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments)

clear_has_trailing_comments();

return trailing_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

}

-void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) {

- if (trailing_comments != NULL) {

- set_has_trailing_comments();

- } else {

- clear_has_trailing_comments();

- }

- trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments);

- // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments)

-// repeated string leading_detached_comments = 6;

-int SourceCodeInfo_Location::leading_detached_comments_size() const {

- return leading_detached_comments_.size();

-void SourceCodeInfo_Location::clear_leading_detached_comments() {

- leading_detached_comments_.Clear();

-const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- return leading_detached_comments_.Get(index);

-::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) {

- // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- return leading_detached_comments_.Mutable(index);

-void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) {

- // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- leading_detached_comments_.Mutable(index)->assign(value);

-void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) {

- leading_detached_comments_.Mutable(index)->assign(value);

- // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

-void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) {

- leading_detached_comments_.Mutable(index)->assign(

- reinterpret_cast<const char*>(value), size);

- // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

-::std::string* SourceCodeInfo_Location::add_leading_detached_comments() {

- // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- return leading_detached_comments_.Add();

-void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) {

- leading_detached_comments_.Add()->assign(value);

- // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

-void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) {

- leading_detached_comments_.Add()->assign(value);

- // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

-void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) {

- leading_detached_comments_.Add()->assign(reinterpret_cast<const char*>(value), size);

- // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

-const ::google::protobuf::RepeatedPtrField< ::std::string>&

-SourceCodeInfo_Location::leading_detached_comments() const {

- // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- return leading_detached_comments_;

-::google::protobuf::RepeatedPtrField< ::std::string>*

-SourceCodeInfo_Location::mutable_leading_detached_comments() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

- return &leading_detached_comments_;

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

-#if !defined(_MSC_VER) || _MSC_VER >= 1900

-const int SourceCodeInfo::kLocationFieldNumber;

-#endif // !defined(_MSC_VER) || _MSC_VER >= 1900

-SourceCodeInfo::SourceCodeInfo()

- : ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

- SharedCtor();

- // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo)

-SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from)

- : ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- location_(from.location_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo)

-void SourceCodeInfo::SharedCtor() {

- _cached_size_ = 0;

-SourceCodeInfo::~SourceCodeInfo() {

- // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo)

- SharedDtor();

-void SourceCodeInfo::SharedDtor() {

-void SourceCodeInfo::SetCachedSize(int size) const {

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

-const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[22].descriptor;

-const SourceCodeInfo& SourceCodeInfo::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

-SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const {

- SourceCodeInfo* n = new SourceCodeInfo;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

-void SourceCodeInfo::Clear() {

-// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo)

- location_.Clear();

- _has_bits_.Clear();

- _internal_metadata_.Clear();

-bool SourceCodeInfo::MergePartialFromCodedStream(

- ::google::protobuf::io::CodedInputStream* input) {

-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure

- ::google::protobuf::uint32 tag;

- // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo)

- for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

- tag = p.first;

- if (!p.second) goto handle_unusual;

- switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

- case 1: {

- if (tag == 10u) {

- DO_(input->IncrementRecursionDepth());

- DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

- input, add_location()));

- } else {

- goto handle_unusual;

- }

- input->UnsafeDecrementRecursionDepth();

- break;

- }

- default: {

- handle_unusual:

- if (tag == 0 ||

- ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==

- ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {

- goto success;

- }

- DO_(::google::protobuf::internal::WireFormat::SkipField(

- input, tag, mutable_unknown_fields()));

- break;

- }

-success:

- // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo)

- return true;

-failure:

- // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo)

- return false;

-#undef DO_

-void SourceCodeInfo::SerializeWithCachedSizes(

- ::google::protobuf::io::CodedOutputStream* output) const {

- // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo)

- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

- for (unsigned int i = 0, n = this->location_size(); i < n; i++) {

- ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

- 1, this->location(i), output);

- }

- if (_internal_metadata_.have_unknown_fields()) {

- ::google::protobuf::internal::WireFormat::SerializeUnknownFields(

- unknown_fields(), output);

- }

- // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo)

-::google::protobuf::uint8* SourceCodeInfo::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

- // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo)

- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

- for (unsigned int i = 0, n = this->location_size(); i < n; i++) {

- target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 1, this->location(i), false, target);

- }

- if (_internal_metadata_.have_unknown_fields()) {

- target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

- unknown_fields(), target);

- }

- // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo)

- return target;

-size_t SourceCodeInfo::ByteSizeLong() const {

-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo)

- size_t total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated .google.protobuf.SourceCodeInfo.Location location = 1;

- {

- unsigned int count = this->location_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->location(i));

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

- return total_size;

-void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo)

- GOOGLE_DCHECK_NE(&from, this);

- const SourceCodeInfo* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const SourceCodeInfo>(

- &from);

- if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo)

- ::google::protobuf::internal::ReflectionOps::Merge(from, this);

+ void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) {

+ if (trailing_comments != NULL) {

+ set_has_trailing_comments();

} else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo)

- MergeFrom(*source);

+ clear_has_trailing_comments();

}

+ trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments);

+ // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments)

}

-void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- location_.MergeFrom(from.location_);

+// repeated string leading_detached_comments = 6;

+int SourceCodeInfo_Location::leading_detached_comments_size() const {

+ return leading_detached_comments_.size();

}

-void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

+void SourceCodeInfo_Location::clear_leading_detached_comments() {

+ leading_detached_comments_.Clear();

}

-void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

+ const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ return leading_detached_comments_.Get(index);

}

-bool SourceCodeInfo::IsInitialized() const {

- return true;

+ ::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) {

+ // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ return leading_detached_comments_.Mutable(index);

}

-void SourceCodeInfo::Swap(SourceCodeInfo* other) {

- if (other == this) return;

- InternalSwap(other);

+ void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) {

+ // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ leading_detached_comments_.Mutable(index)->assign(value);

}

-void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) {

- location_.UnsafeArenaSwap(&other->location_);

- std::swap(_has_bits_[0], other->_has_bits_[0]);

- _internal_metadata_.Swap(&other->_internal_metadata_);

- std::swap(_cached_size_, other->_cached_size_);

+ void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) {

+ leading_detached_comments_.Mutable(index)->assign(value);

+ // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

}

-::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[22];

+ void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) {

+ leading_detached_comments_.Mutable(index)->assign(

+ reinterpret_cast<const char*>(value), size);

+ // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ ::std::string* SourceCodeInfo_Location::add_leading_detached_comments() {

+ // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ return leading_detached_comments_.Add();

+ void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) {

+ leading_detached_comments_.Add()->assign(value);

+ // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) {

+ leading_detached_comments_.Add()->assign(value);

+ // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) {

+ leading_detached_comments_.Add()->assign(reinterpret_cast<const char*>(value), size);

+ // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ const ::google::protobuf::RepeatedPtrField< ::std::string>&

+SourceCodeInfo_Location::leading_detached_comments() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ return leading_detached_comments_;

+ ::google::protobuf::RepeatedPtrField< ::std::string>*

+SourceCodeInfo_Location::mutable_leading_detached_comments() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)

+ return &leading_detached_comments_;

}

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

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

// SourceCodeInfo

// repeated .google.protobuf.SourceCodeInfo.Location location = 1;

@@ -14543,34 +14340,28 @@ const int GeneratedCodeInfo_Annotation::kEndFieldNumber;

GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo.Annotation)

}

+void GeneratedCodeInfo_Annotation::InitAsDefaultInstance() {

GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- path_(from.path_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (from.has_source_file()) {

- source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_);

- }

- ::memcpy(&begin_, &from.begin_,

- reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&begin_) + sizeof(end_));

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo.Annotation)

}

void GeneratedCodeInfo_Annotation::SharedCtor() {

+ ::google::protobuf::internal::GetEmptyString();

_cached_size_ = 0;

source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- ::memset(&begin_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&begin_) + sizeof(end_));

+ begin_ = 0;

+ end_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() {

@@ -14580,6 +14371,8 @@ GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() {

void GeneratedCodeInfo_Annotation::SharedDtor() {

source_file_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (this != default_instance_) {

+ }

}

void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const {

@@ -14589,14 +14382,16 @@ void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[23].descriptor;

+ return GeneratedCodeInfo_Annotation_descriptor_;

}

const GeneratedCodeInfo_Annotation& GeneratedCodeInfo_Annotation::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::default_instance_ = NULL;

GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protobuf::Arena* arena) const {

GeneratedCodeInfo_Annotation* n = new GeneratedCodeInfo_Annotation;

if (arena != NULL) {

@@ -14607,17 +14402,37 @@ GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protob

void GeneratedCodeInfo_Annotation::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation)

- path_.Clear();

- if (has_source_file()) {

- GOOGLE_DCHECK(!source_file_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));

- (*source_file_.UnsafeRawStringPointer())->clear();

+#if defined(__clang__)

+#define ZR_HELPER_(f) \

+ _Pragma("clang diagnostic push") \

+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

+ __builtin_offsetof(GeneratedCodeInfo_Annotation, f) \

+ _Pragma("clang diagnostic pop")

+#else

+#define ZR_HELPER_(f) reinterpret_cast<char*>(\

+ &reinterpret_cast<GeneratedCodeInfo_Annotation*>(16)->f)

+#endif

+#define ZR_(first, last) do {\

+ ::memset(&first, 0,\

+ ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

+} while (0)

+ if (_has_bits_[0 / 32] & 14u) {

+ ZR_(begin_, end_);

+ if (has_source_file()) {

+ source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ }

}

- if (_has_bits_[0 / 32] & 6u) {

- ::memset(&begin_, 0, reinterpret_cast<char*>(&end_) -

- reinterpret_cast<char*>(&begin_) + sizeof(end_));

+#undef ZR_HELPER_

+#undef ZR_

+ path_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

}

- _has_bits_.Clear();

- _internal_metadata_.Clear();

}

bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream(

@@ -14626,29 +14441,31 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo.Annotation)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// repeated int32 path = 1 [packed = true];

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, this->mutable_path())));

- } else if (tag == 8u) {

+ } else if (tag == 8) {

DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

- 1, 10u, input, this->mutable_path())));

+ 1, 10, input, this->mutable_path())));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(18)) goto parse_source_file;

break;

}

// optional string source_file = 2;

case 2: {

- if (tag == 18u) {

+ if (tag == 18) {

+ parse_source_file:

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->mutable_source_file()));

::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(

@@ -14658,32 +14475,37 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(24)) goto parse_begin;

break;

}

// optional int32 begin = 3;

case 3: {

- if (tag == 24u) {

- set_has_begin();

+ if (tag == 24) {

+ parse_begin:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &begin_)));

+ set_has_begin();

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(32)) goto parse_end;

break;

}

// optional int32 end = 4;

case 4: {

- if (tag == 32u) {

- set_has_end();

+ if (tag == 32) {

+ parse_end:

DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(

input, &end_)));

+ set_has_end();

} else {

goto handle_unusual;

}

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -14749,9 +14571,8 @@ void GeneratedCodeInfo_Annotation::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo.Annotation)

}

-::google::protobuf::uint8* GeneratedCodeInfo_Annotation::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* GeneratedCodeInfo_Annotation::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo.Annotation)

// repeated int32 path = 1 [packed = true];

if (this->path_size() > 0) {

@@ -14796,35 +14617,11 @@ void GeneratedCodeInfo_Annotation::SerializeWithCachedSizes(

return target;

}

-size_t GeneratedCodeInfo_Annotation::ByteSizeLong() const {

+int GeneratedCodeInfo_Annotation::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo.Annotation)

- size_t total_size = 0;

- if (_internal_metadata_.have_unknown_fields()) {

- total_size +=

- ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

- unknown_fields());

- }

- // repeated int32 path = 1 [packed = true];

- {

- size_t data_size = 0;

- unsigned int count = this->path_size();

- for (unsigned int i = 0; i < count; i++) {

- data_size += ::google::protobuf::internal::WireFormatLite::

- Int32Size(this->path(i));

- }

- if (data_size > 0) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(data_size);

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _path_cached_byte_size_ = cached_size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

- total_size += data_size;

- }

+ int total_size = 0;

- if (_has_bits_[0 / 32] & 7u) {

+ if (_has_bits_[1 / 32] & 14u) {

// optional string source_file = 2;

if (has_source_file()) {

total_size += 1 +

@@ -14847,222 +14644,113 @@ size_t GeneratedCodeInfo_Annotation::ByteSizeLong() const {

}

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

- GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

- GOOGLE_SAFE_CONCURRENT_WRITES_END();

- return total_size;

-void GeneratedCodeInfo_Annotation::MergeFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

- GOOGLE_DCHECK_NE(&from, this);

- const GeneratedCodeInfo_Annotation* source =

- ::google::protobuf::internal::DynamicCastToGenerated<const GeneratedCodeInfo_Annotation>(

- &from);

- if (source == NULL) {

- // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation)

- ::google::protobuf::internal::ReflectionOps::Merge(from, this);

- } else {

- // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation)

- MergeFrom(*source);

- }

-void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) {

-// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

- path_.MergeFrom(from.path_);

- if (from._has_bits_[0 / 32] & 7u) {

- if (from.has_source_file()) {

- set_has_source_file();

- source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_);

- }

- if (from.has_begin()) {

- set_begin(from.begin());

- }

- if (from.has_end()) {

- set_end(from.end());

- }

-void GeneratedCodeInfo_Annotation::CopyFrom(const ::google::protobuf::Message& from) {

-// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) {

-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

- if (&from == this) return;

- Clear();

- MergeFrom(from);

-bool GeneratedCodeInfo_Annotation::IsInitialized() const {

- return true;

-void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) {

- if (other == this) return;

- InternalSwap(other);

-void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) {

- path_.UnsafeArenaSwap(&other->path_);

- source_file_.Swap(&other->source_file_);

- std::swap(begin_, other->begin_);

- std::swap(end_, other->end_);

- std::swap(_has_bits_[0], other->_has_bits_[0]);

- _internal_metadata_.Swap(&other->_internal_metadata_);

- std::swap(_cached_size_, other->_cached_size_);

-::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const {

- protobuf_AssignDescriptorsOnce();

- return file_level_metadata[23];

-#if PROTOBUF_INLINE_NOT_IN_HEADERS

-// GeneratedCodeInfo_Annotation

-// repeated int32 path = 1 [packed = true];

-int GeneratedCodeInfo_Annotation::path_size() const {

- return path_.size();

-void GeneratedCodeInfo_Annotation::clear_path() {

- path_.Clear();

-::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const {

- // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path)

- return path_.Get(index);

-void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) {

- path_.Set(index, value);

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

-void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) {

- path_.Add(value);

- // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path)

-const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

-GeneratedCodeInfo_Annotation::path() const {

- // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path)

- return path_;

-::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

-GeneratedCodeInfo_Annotation::mutable_path() {

- // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path)

- return &path_;

-// optional string source_file = 2;

-bool GeneratedCodeInfo_Annotation::has_source_file() const {

- return (_has_bits_[0] & 0x00000001u) != 0;

-void GeneratedCodeInfo_Annotation::set_has_source_file() {

- _has_bits_[0] |= 0x00000001u;

-void GeneratedCodeInfo_Annotation::clear_has_source_file() {

- _has_bits_[0] &= ~0x00000001u;

-void GeneratedCodeInfo_Annotation::clear_source_file() {

- source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- clear_has_source_file();

-const ::std::string& GeneratedCodeInfo_Annotation::source_file() const {

- // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

- return source_file_.GetNoArena();

-void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) {

- set_has_source_file();

- source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

-void GeneratedCodeInfo_Annotation::set_source_file(const char* value) {

- set_has_source_file();

- source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

- // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

-void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) {

- set_has_source_file();

- source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

- // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

-::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() {

- set_has_source_file();

- // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

- return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-::std::string* GeneratedCodeInfo_Annotation::release_source_file() {

- // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

- clear_has_source_file();

- return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ // repeated int32 path = 1 [packed = true];

+ {

+ int data_size = 0;

+ for (int i = 0; i < this->path_size(); i++) {

+ data_size += ::google::protobuf::internal::WireFormatLite::

+ Int32Size(this->path(i));

+ }

+ if (data_size > 0) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);

+ }

+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

+ _path_cached_byte_size_ = data_size;

+ GOOGLE_SAFE_CONCURRENT_WRITES_END();

+ total_size += data_size;

+ }

+ if (_internal_metadata_.have_unknown_fields()) {

+ total_size +=

+ ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

+ unknown_fields());

+ }

+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

+ _cached_size_ = total_size;

+ GOOGLE_SAFE_CONCURRENT_WRITES_END();

+ return total_size;

}

-void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) {

- if (source_file != NULL) {

- set_has_source_file();

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

+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const GeneratedCodeInfo_Annotation* source =

+ ::google::protobuf::internal::DynamicCastToGenerated<const GeneratedCodeInfo_Annotation>(

+ &from);

+ if (source == NULL) {

+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation)

+ ::google::protobuf::internal::ReflectionOps::Merge(from, this);

} else {

- clear_has_source_file();

+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation)

+ MergeFrom(*source);

}

- source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file);

- // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

}

-// optional int32 begin = 3;

-bool GeneratedCodeInfo_Annotation::has_begin() const {

- return (_has_bits_[0] & 0x00000002u) != 0;

-void GeneratedCodeInfo_Annotation::set_has_begin() {

- _has_bits_[0] |= 0x00000002u;

-void GeneratedCodeInfo_Annotation::clear_has_begin() {

- _has_bits_[0] &= ~0x00000002u;

-void GeneratedCodeInfo_Annotation::clear_begin() {

- begin_ = 0;

- clear_has_begin();

-::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const {

- // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin)

- return begin_;

-void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) {

- set_has_begin();

- begin_ = value;

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

+void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) {

+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ path_.MergeFrom(from.path_);

+ if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) {

+ if (from.has_source_file()) {

+ set_has_source_file();

+ source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_);

+ }

+ if (from.has_begin()) {

+ set_begin(from.begin());

+ }

+ if (from.has_end()) {

+ set_end(from.end());

+ }

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

-// optional int32 end = 4;

-bool GeneratedCodeInfo_Annotation::has_end() const {

- return (_has_bits_[0] & 0x00000004u) != 0;

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

+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

}

-void GeneratedCodeInfo_Annotation::set_has_end() {

- _has_bits_[0] |= 0x00000004u;

+void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) {

+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation)

+ if (&from == this) return;

+ Clear();

+ MergeFrom(from);

}

-void GeneratedCodeInfo_Annotation::clear_has_end() {

- _has_bits_[0] &= ~0x00000004u;

+bool GeneratedCodeInfo_Annotation::IsInitialized() const {

+ return true;

}

-void GeneratedCodeInfo_Annotation::clear_end() {

- end_ = 0;

- clear_has_end();

+void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) {

+ if (other == this) return;

+ InternalSwap(other);

}

-::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const {

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

- return end_;

+void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) {

+ path_.UnsafeArenaSwap(&other->path_);

+ source_file_.Swap(&other->source_file_);

+ std::swap(begin_, other->begin_);

+ std::swap(end_, other->end_);

+ std::swap(_has_bits_[0], other->_has_bits_[0]);

+ _internal_metadata_.Swap(&other->_internal_metadata_);

+ std::swap(_cached_size_, other->_cached_size_);

}

-void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) {

- set_has_end();

- end_ = value;

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

+::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const {

+ protobuf_AssignDescriptorsOnce();

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = GeneratedCodeInfo_Annotation_descriptor_;

+ metadata.reflection = GeneratedCodeInfo_Annotation_reflection_;

+ return metadata;

}

-#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

-// ===================================================================

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

#if !defined(_MSC_VER) || _MSC_VER >= 1900

const int GeneratedCodeInfo::kAnnotationFieldNumber;

@@ -15070,24 +14758,24 @@ const int GeneratedCodeInfo::kAnnotationFieldNumber;

GeneratedCodeInfo::GeneratedCodeInfo()

: ::google::protobuf::Message(), _internal_metadata_(NULL) {

- if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- }

SharedCtor();

// @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo)

}

+void GeneratedCodeInfo::InitAsDefaultInstance() {

GeneratedCodeInfo::GeneratedCodeInfo(const GeneratedCodeInfo& from)

: ::google::protobuf::Message(),

- _internal_metadata_(NULL),

- _has_bits_(from._has_bits_),

- _cached_size_(0),

- annotation_(from.annotation_) {

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ _internal_metadata_(NULL) {

+ SharedCtor();

+ MergeFrom(from);

// @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo)

}

void GeneratedCodeInfo::SharedCtor() {

_cached_size_ = 0;

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

}

GeneratedCodeInfo::~GeneratedCodeInfo() {

@@ -15096,6 +14784,8 @@ GeneratedCodeInfo::~GeneratedCodeInfo() {

}

void GeneratedCodeInfo::SharedDtor() {

+ if (this != default_instance_) {

+ }

}

void GeneratedCodeInfo::SetCachedSize(int size) const {

@@ -15105,14 +14795,16 @@ void GeneratedCodeInfo::SetCachedSize(int size) const {

}

const ::google::protobuf::Descriptor* GeneratedCodeInfo::descriptor() {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[24].descriptor;

+ return GeneratedCodeInfo_descriptor_;

}

const GeneratedCodeInfo& GeneratedCodeInfo::default_instance() {

- protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto();

- return *internal_default_instance();

+ if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();

+ return *default_instance_;

}

+GeneratedCodeInfo* GeneratedCodeInfo::default_instance_ = NULL;

GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) const {

GeneratedCodeInfo* n = new GeneratedCodeInfo;

if (arena != NULL) {

@@ -15124,8 +14816,10 @@ GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) cons

void GeneratedCodeInfo::Clear() {

// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo)

annotation_.Clear();

- _has_bits_.Clear();

- _internal_metadata_.Clear();

+ ::memset(_has_bits_, 0, sizeof(_has_bits_));

+ if (_internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->Clear();

+ }

}

bool GeneratedCodeInfo::MergePartialFromCodedStream(

@@ -15134,20 +14828,23 @@ bool GeneratedCodeInfo::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

// @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo)

for (;;) {

- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);

+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);

tag = p.first;

if (!p.second) goto handle_unusual;

switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {

// repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;

case 1: {

- if (tag == 10u) {

+ if (tag == 10) {

DO_(input->IncrementRecursionDepth());

+ parse_loop_annotation:

DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(

input, add_annotation()));

} else {

goto handle_unusual;

}

+ if (input->ExpectTag(10)) goto parse_loop_annotation;

input->UnsafeDecrementRecursionDepth();

+ if (input->ExpectAtEnd()) goto success;

break;

}

@@ -15189,15 +14886,14 @@ void GeneratedCodeInfo::SerializeWithCachedSizes(

// @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo)

}

-::google::protobuf::uint8* GeneratedCodeInfo::InternalSerializeWithCachedSizesToArray(

- bool deterministic, ::google::protobuf::uint8* target) const {

- (void)deterministic; // Unused

+::google::protobuf::uint8* GeneratedCodeInfo::SerializeWithCachedSizesToArray(

+ ::google::protobuf::uint8* target) const {

// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo)

// repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;

for (unsigned int i = 0, n = this->annotation_size(); i < n; i++) {

target = ::google::protobuf::internal::WireFormatLite::

- InternalWriteMessageNoVirtualToArray(

- 1, this->annotation(i), false, target);

+ WriteMessageNoVirtualToArray(

+ 1, this->annotation(i), target);

}

if (_internal_metadata_.have_unknown_fields()) {

@@ -15208,37 +14904,33 @@ void GeneratedCodeInfo::SerializeWithCachedSizes(

return target;

}

-size_t GeneratedCodeInfo::ByteSizeLong() const {

+int GeneratedCodeInfo::ByteSize() const {

// @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo)

- size_t total_size = 0;

+ int total_size = 0;

+ // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;

+ total_size += 1 * this->annotation_size();

+ for (int i = 0; i < this->annotation_size(); i++) {

+ total_size +=

+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

+ this->annotation(i));

+ }

if (_internal_metadata_.have_unknown_fields()) {

total_size +=

::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(

unknown_fields());

}

- // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;

- {

- unsigned int count = this->annotation_size();

- total_size += 1UL * count;

- for (unsigned int i = 0; i < count; i++) {

- total_size +=

- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(

- this->annotation(i));

- }

- int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = cached_size;

+ _cached_size_ = total_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) {

// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo)

- GOOGLE_DCHECK_NE(&from, this);

- const GeneratedCodeInfo* source =

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

+ const GeneratedCodeInfo* source =

::google::protobuf::internal::DynamicCastToGenerated<const GeneratedCodeInfo>(

&from);

if (source == NULL) {

@@ -15252,9 +14944,11 @@ void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) {

void GeneratedCodeInfo::MergeFrom(const GeneratedCodeInfo& from) {

// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo)

- GOOGLE_DCHECK_NE(&from, this);

- _internal_metadata_.MergeFrom(from._internal_metadata_);

+ if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);

annotation_.MergeFrom(from.annotation_);

+ if (from._internal_metadata_.have_unknown_fields()) {

+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());

+ }

}

void GeneratedCodeInfo::CopyFrom(const ::google::protobuf::Message& from) {

@@ -15272,6 +14966,7 @@ void GeneratedCodeInfo::CopyFrom(const GeneratedCodeInfo& from) {

}

bool GeneratedCodeInfo::IsInitialized() const {

return true;

}

@@ -15288,10 +14983,149 @@ void GeneratedCodeInfo::InternalSwap(GeneratedCodeInfo* other) {

::google::protobuf::Metadata GeneratedCodeInfo::GetMetadata() const {

protobuf_AssignDescriptorsOnce();

- return file_level_metadata[24];

+ ::google::protobuf::Metadata metadata;

+ metadata.descriptor = GeneratedCodeInfo_descriptor_;

+ metadata.reflection = GeneratedCodeInfo_reflection_;

+ return metadata;

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

+// GeneratedCodeInfo_Annotation

+// repeated int32 path = 1 [packed = true];

+int GeneratedCodeInfo_Annotation::path_size() const {

+ return path_.size();

+void GeneratedCodeInfo_Annotation::clear_path() {

+ path_.Clear();

+ ::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const {

+ // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path)

+ return path_.Get(index);

+ void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) {

+ path_.Set(index, value);

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

+ void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) {

+ path_.Add(value);

+ // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path)

+ const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&

+GeneratedCodeInfo_Annotation::path() const {

+ // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path)

+ return path_;

+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*

+GeneratedCodeInfo_Annotation::mutable_path() {

+ // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path)

+ return &path_;

+// optional string source_file = 2;

+bool GeneratedCodeInfo_Annotation::has_source_file() const {

+ return (_has_bits_[0] & 0x00000002u) != 0;

+void GeneratedCodeInfo_Annotation::set_has_source_file() {

+ _has_bits_[0] |= 0x00000002u;

+void GeneratedCodeInfo_Annotation::clear_has_source_file() {

+ _has_bits_[0] &= ~0x00000002u;

+void GeneratedCodeInfo_Annotation::clear_source_file() {

+ source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ clear_has_source_file();

+ const ::std::string& GeneratedCodeInfo_Annotation::source_file() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+ return source_file_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) {

+ set_has_source_file();

+ source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

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

+ void GeneratedCodeInfo_Annotation::set_source_file(const char* value) {

+ set_has_source_file();

+ source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+ void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) {

+ set_has_source_file();

+ source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ ::std::string(reinterpret_cast<const char*>(value), size));

+ // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+ ::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() {

+ set_has_source_file();

+ // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+ return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ ::std::string* GeneratedCodeInfo_Annotation::release_source_file() {

+ // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+ clear_has_source_file();

+ return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) {

+ if (source_file != NULL) {

+ set_has_source_file();

+ } else {

+ clear_has_source_file();

+ }

+ source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file);

+ // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file)

+// optional int32 begin = 3;

+bool GeneratedCodeInfo_Annotation::has_begin() const {

+ return (_has_bits_[0] & 0x00000004u) != 0;

+void GeneratedCodeInfo_Annotation::set_has_begin() {

+ _has_bits_[0] |= 0x00000004u;

+void GeneratedCodeInfo_Annotation::clear_has_begin() {

+ _has_bits_[0] &= ~0x00000004u;

+void GeneratedCodeInfo_Annotation::clear_begin() {

+ begin_ = 0;

+ clear_has_begin();

+ ::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const {

+ // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin)

+ return begin_;

+ void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) {

+ set_has_begin();

+ begin_ = value;

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

+// optional int32 end = 4;

+bool GeneratedCodeInfo_Annotation::has_end() const {

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

+void GeneratedCodeInfo_Annotation::set_has_end() {

+ _has_bits_[0] |= 0x00000008u;

+void GeneratedCodeInfo_Annotation::clear_has_end() {

+ _has_bits_[0] &= ~0x00000008u;

+void GeneratedCodeInfo_Annotation::clear_end() {

+ end_ = 0;

+ clear_has_end();

+ ::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const {

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

+ return end_;

+ void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) {

+ set_has_end();

+ end_ = value;

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

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

// GeneratedCodeInfo

// repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;