| 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 f53e604898106937109375b6f5d68e9e8ebd0485..48d28646bc763483beab31e0aace32cdbefa71ec 100644
|
| --- a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc
|
| @@ -2,7 +2,7 @@
|
| // source: google/protobuf/descriptor.proto
|
|
|
| #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
|
| -#include "google/protobuf/descriptor.pb.h"
|
| +#include <google/protobuf/descriptor.pb.h>
|
|
|
| #include <algorithm>
|
|
|
| @@ -33,17 +33,11 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
|
| 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;
|
| @@ -67,7 +61,6 @@ 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;
|
| @@ -107,18 +100,18 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, file_),
|
| };
|
| FileDescriptorSet_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| FileDescriptorSet_descriptor_,
|
| FileDescriptorSet::default_instance_,
|
| FileDescriptorSet_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(FileDescriptorSet),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(FileDescriptorSet));
|
| FileDescriptorProto_descriptor_ = file->message_type(1);
|
| - static const int FileDescriptorProto_offsets_[12] = {
|
| + static const int FileDescriptorProto_offsets_[11] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, package_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, dependency_),
|
| @@ -130,77 +123,57 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, extension_),
|
| 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_),
|
| };
|
| FileDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| FileDescriptorProto_descriptor_,
|
| FileDescriptorProto::default_instance_,
|
| FileDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(FileDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(FileDescriptorProto));
|
| DescriptorProto_descriptor_ = file->message_type(2);
|
| - static const int DescriptorProto_offsets_[10] = {
|
| + static const int DescriptorProto_offsets_[7] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, field_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, extension_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, nested_type_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, enum_type_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, extension_range_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, oneof_decl_),
|
| 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_),
|
| };
|
| DescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| DescriptorProto_descriptor_,
|
| DescriptorProto::default_instance_,
|
| DescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(DescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(DescriptorProto));
|
| 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(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| DescriptorProto_ExtensionRange_descriptor_,
|
| DescriptorProto_ExtensionRange::default_instance_,
|
| DescriptorProto_ExtensionRange_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _unknown_fields_),
|
| -1,
|
| - -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,
|
| - -1,
|
| - sizeof(DescriptorProto_ReservedRange),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(DescriptorProto_ExtensionRange));
|
| FieldDescriptorProto_descriptor_ = file->message_type(3);
|
| - static const int FieldDescriptorProto_offsets_[9] = {
|
| + static const int FieldDescriptorProto_offsets_[8] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, number_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, label_),
|
| @@ -208,248 +181,217 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, type_name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, extendee_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, default_value_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, oneof_index_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, options_),
|
| };
|
| FieldDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| FieldDescriptorProto_descriptor_,
|
| FieldDescriptorProto::default_instance_,
|
| FieldDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(FieldDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(FieldDescriptorProto));
|
| 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_),
|
| - };
|
| - 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,
|
| - -1,
|
| - sizeof(OneofDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_),
|
| - -1);
|
| - EnumDescriptorProto_descriptor_ = file->message_type(5);
|
| + EnumDescriptorProto_descriptor_ = file->message_type(4);
|
| 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_),
|
| };
|
| EnumDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| EnumDescriptorProto_descriptor_,
|
| EnumDescriptorProto::default_instance_,
|
| EnumDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(EnumDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_),
|
| - -1);
|
| - EnumValueDescriptorProto_descriptor_ = file->message_type(6);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(EnumDescriptorProto));
|
| + EnumValueDescriptorProto_descriptor_ = file->message_type(5);
|
| 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_),
|
| };
|
| EnumValueDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| EnumValueDescriptorProto_descriptor_,
|
| EnumValueDescriptorProto::default_instance_,
|
| EnumValueDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(EnumValueDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_),
|
| - -1);
|
| - ServiceDescriptorProto_descriptor_ = file->message_type(7);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(EnumValueDescriptorProto));
|
| + ServiceDescriptorProto_descriptor_ = file->message_type(6);
|
| 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_),
|
| };
|
| ServiceDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| ServiceDescriptorProto_descriptor_,
|
| ServiceDescriptorProto::default_instance_,
|
| ServiceDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -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::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(ServiceDescriptorProto));
|
| + MethodDescriptorProto_descriptor_ = file->message_type(7);
|
| + static const int MethodDescriptorProto_offsets_[4] = {
|
| 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_),
|
| };
|
| MethodDescriptorProto_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| MethodDescriptorProto_descriptor_,
|
| MethodDescriptorProto::default_instance_,
|
| MethodDescriptorProto_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(MethodDescriptorProto),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_),
|
| - -1);
|
| - FileOptions_descriptor_ = file->message_type(9);
|
| - static const int FileOptions_offsets_[17] = {
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(MethodDescriptorProto));
|
| + FileOptions_descriptor_ = file->message_type(8);
|
| + static const int FileOptions_offsets_[11] = {
|
| 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_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, retain_unknown_fields_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_generate_equals_and_hash_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_string_check_utf8_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, optimize_for_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, go_package_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, cc_generic_services_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_generic_services_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, py_generic_services_),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, deprecated_),
|
| - 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, javanano_use_deprecated_package_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_),
|
| };
|
| FileOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_),
|
| - sizeof(FileOptions),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(FileOptions));
|
| FileOptions_OptimizeMode_descriptor_ = FileOptions_descriptor_->enum_type(0);
|
| - MessageOptions_descriptor_ = file->message_type(10);
|
| - static const int MessageOptions_offsets_[5] = {
|
| + MessageOptions_descriptor_ = file->message_type(9);
|
| + static const int MessageOptions_offsets_[3] = {
|
| 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_),
|
| };
|
| MessageOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| 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);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(MessageOptions));
|
| + FieldOptions_descriptor_ = file->message_type(10);
|
| 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_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, lazy_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, deprecated_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, experimental_map_key_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, weak_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, uninterpreted_option_),
|
| };
|
| FieldOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_),
|
| - sizeof(FieldOptions),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(FieldOptions));
|
| 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] = {
|
| + EnumOptions_descriptor_ = file->message_type(11);
|
| + static const int EnumOptions_offsets_[2] = {
|
| 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_),
|
| };
|
| EnumOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| 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::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(EnumOptions));
|
| + EnumValueOptions_descriptor_ = file->message_type(12);
|
| + static const int EnumValueOptions_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, uninterpreted_option_),
|
| };
|
| EnumValueOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| 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::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(EnumValueOptions));
|
| + ServiceOptions_descriptor_ = file->message_type(13);
|
| + static const int ServiceOptions_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, uninterpreted_option_),
|
| };
|
| ServiceOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| 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::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(ServiceOptions));
|
| + MethodOptions_descriptor_ = file->message_type(14);
|
| + static const int MethodOptions_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, uninterpreted_option_),
|
| };
|
| MethodOptions_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| 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, _unknown_fields_),
|
| 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);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(MethodOptions));
|
| + UninterpretedOption_descriptor_ = file->message_type(15);
|
| static const int UninterpretedOption_offsets_[7] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, name_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, identifier_value_),
|
| @@ -460,66 +402,65 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, aggregate_value_),
|
| };
|
| UninterpretedOption_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| UninterpretedOption_descriptor_,
|
| UninterpretedOption::default_instance_,
|
| UninterpretedOption_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(UninterpretedOption),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(UninterpretedOption));
|
| 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(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| UninterpretedOption_NamePart_descriptor_,
|
| UninterpretedOption_NamePart::default_instance_,
|
| UninterpretedOption_NamePart_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(UninterpretedOption_NamePart),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_),
|
| - -1);
|
| - SourceCodeInfo_descriptor_ = file->message_type(17);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(UninterpretedOption_NamePart));
|
| + SourceCodeInfo_descriptor_ = file->message_type(16);
|
| static const int SourceCodeInfo_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_),
|
| };
|
| SourceCodeInfo_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| SourceCodeInfo_descriptor_,
|
| SourceCodeInfo::default_instance_,
|
| SourceCodeInfo_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(SourceCodeInfo),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(SourceCodeInfo));
|
| SourceCodeInfo_Location_descriptor_ = SourceCodeInfo_descriptor_->nested_type(0);
|
| - static const int SourceCodeInfo_Location_offsets_[5] = {
|
| + static const int SourceCodeInfo_Location_offsets_[4] = {
|
| 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_),
|
| };
|
| SourceCodeInfo_Location_reflection_ =
|
| - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + new ::google::protobuf::internal::GeneratedMessageReflection(
|
| SourceCodeInfo_Location_descriptor_,
|
| SourceCodeInfo_Location::default_instance_,
|
| SourceCodeInfo_Location_offsets_,
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_[0]),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _unknown_fields_),
|
| -1,
|
| - -1,
|
| - sizeof(SourceCodeInfo_Location),
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_),
|
| - -1);
|
| + ::google::protobuf::DescriptorPool::generated_pool(),
|
| + ::google::protobuf::MessageFactory::generated_factory(),
|
| + sizeof(SourceCodeInfo_Location));
|
| }
|
|
|
| namespace {
|
| @@ -533,49 +474,45 @@ inline void protobuf_AssignDescriptorsOnce() {
|
| void protobuf_RegisterTypes(const ::std::string&) {
|
| protobuf_AssignDescriptorsOnce();
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - FileDescriptorSet_descriptor_, &FileDescriptorSet::default_instance());
|
| + FileDescriptorSet_descriptor_, &FileDescriptorSet::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - FileDescriptorProto_descriptor_, &FileDescriptorProto::default_instance());
|
| + FileDescriptorProto_descriptor_, &FileDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - DescriptorProto_descriptor_, &DescriptorProto::default_instance());
|
| + DescriptorProto_descriptor_, &DescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - DescriptorProto_ExtensionRange_descriptor_, &DescriptorProto_ExtensionRange::default_instance());
|
| + DescriptorProto_ExtensionRange_descriptor_, &DescriptorProto_ExtensionRange::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - DescriptorProto_ReservedRange_descriptor_, &DescriptorProto_ReservedRange::default_instance());
|
| + FieldDescriptorProto_descriptor_, &FieldDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - FieldDescriptorProto_descriptor_, &FieldDescriptorProto::default_instance());
|
| + EnumDescriptorProto_descriptor_, &EnumDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - OneofDescriptorProto_descriptor_, &OneofDescriptorProto::default_instance());
|
| + EnumValueDescriptorProto_descriptor_, &EnumValueDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - EnumDescriptorProto_descriptor_, &EnumDescriptorProto::default_instance());
|
| + ServiceDescriptorProto_descriptor_, &ServiceDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - EnumValueDescriptorProto_descriptor_, &EnumValueDescriptorProto::default_instance());
|
| + MethodDescriptorProto_descriptor_, &MethodDescriptorProto::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - ServiceDescriptorProto_descriptor_, &ServiceDescriptorProto::default_instance());
|
| + FileOptions_descriptor_, &FileOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - MethodDescriptorProto_descriptor_, &MethodDescriptorProto::default_instance());
|
| + MessageOptions_descriptor_, &MessageOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - FileOptions_descriptor_, &FileOptions::default_instance());
|
| + FieldOptions_descriptor_, &FieldOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - MessageOptions_descriptor_, &MessageOptions::default_instance());
|
| + EnumOptions_descriptor_, &EnumOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - FieldOptions_descriptor_, &FieldOptions::default_instance());
|
| + EnumValueOptions_descriptor_, &EnumValueOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - EnumOptions_descriptor_, &EnumOptions::default_instance());
|
| + ServiceOptions_descriptor_, &ServiceOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - EnumValueOptions_descriptor_, &EnumValueOptions::default_instance());
|
| + MethodOptions_descriptor_, &MethodOptions::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - ServiceOptions_descriptor_, &ServiceOptions::default_instance());
|
| + UninterpretedOption_descriptor_, &UninterpretedOption::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - MethodOptions_descriptor_, &MethodOptions::default_instance());
|
| + UninterpretedOption_NamePart_descriptor_, &UninterpretedOption_NamePart::default_instance());
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| - UninterpretedOption_descriptor_, &UninterpretedOption::default_instance());
|
| + SourceCodeInfo_descriptor_, &SourceCodeInfo::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());
|
| + SourceCodeInfo_Location_descriptor_, &SourceCodeInfo_Location::default_instance());
|
| }
|
|
|
| } // namespace
|
| @@ -589,12 +526,8 @@ void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto() {
|
| 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_;
|
| @@ -637,7 +570,7 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| "\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"
|
| + "roto\"\313\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"
|
| @@ -648,127 +581,104 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| "\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\"\251\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.\n\007options\030\010 \001(\0132\035.google.protobuf.F"
|
| - "ieldOptions\"\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_UI"
|
| - "NT64\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\013TYP"
|
| - "E_STRING\020\t\022\016\n\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSA"
|
| - "GE\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_SINT32\020\021\022\017\n\013TYPE_SINT"
|
| - "64\020\022\"C\n\005Label\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LAB"
|
| - "EL_REQUIRED\020\002\022\022\n\016LABEL_REPEATED\020\003\"$\n\024One"
|
| - "ofDescriptorProto\022\014\n\004name\030\001 \001(\t\"\214\001\n\023Enum"
|
| - "DescriptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002"
|
| - " \003(\0132).google.protobuf.EnumValueDescript"
|
| - "orProto\022-\n\007options\030\003 \001(\0132\034.google.protob"
|
| - "uf.EnumOptions\"l\n\030EnumValueDescriptorPro"
|
| - "to\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007opti"
|
| - "ons\030\003 \001(\0132!.google.protobuf.EnumValueOpt"
|
| - "ions\"\220\001\n\026ServiceDescriptorProto\022\014\n\004name\030"
|
| - "\001 \001(\t\0226\n\006method\030\002 \003(\0132&.google.protobuf."
|
| - "MethodDescriptorProto\0220\n\007options\030\003 \001(\0132\037"
|
| - ".google.protobuf.ServiceOptions\"\301\001\n\025Meth"
|
| - "odDescriptorProto\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\007opti"
|
| - "ons\030\004 \001(\0132\036.google.protobuf.MethodOption"
|
| - "s\022\037\n\020client_streaming\030\005 \001(\010:\005false\022\037\n\020se"
|
| - "rver_streaming\030\006 \001(\010:\005false\"\320\005\n\013FileOpti"
|
| - "ons\022\024\n\014java_package\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\025retain_unknown_fields\030\014 \001"
|
| - "(\010:\005false\022,\n\035java_generate_equals_and_ha"
|
| - "sh\030\024 \001(\010:\005false\022%\n\026java_string_check_utf"
|
| - "8\030\033 \001(\010:\005false\022F\n\014optimize_for\030\t \001(\0162).g"
|
| - "oogle.protobuf.FileOptions.OptimizeMode:"
|
| - "\005SPEED\022\022\n\ngo_package\030\013 \001(\t\022\"\n\023cc_generic"
|
| - "_services\030\020 \001(\010:\005false\022$\n\025java_generic_s"
|
| - "ervices\030\021 \001(\010:\005false\022\"\n\023py_generic_servi"
|
| - "ces\030\022 \001(\010:\005false\022\031\n\ndeprecated\030\027 \001(\010:\005fa"
|
| - "lse\022\037\n\020cc_enable_arenas\030\037 \001(\010:\005false\022\031\n\021"
|
| - "objc_class_prefix\030$ \001(\t\022\030\n\020csharp_namesp"
|
| - "ace\030% \001(\t\022\'\n\037javanano_use_deprecated_pac"
|
| - "kage\030& \001(\010\022C\n\024uninterpreted_option\030\347\007 \003("
|
| - "\0132$.google.protobuf.UninterpretedOption\""
|
| - ":\n\014OptimizeMode\022\t\n\005SPEED\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\002\"\346\001\n\016Messa"
|
| - "geOptions\022&\n\027message_set_wire_format\030\001 \001"
|
| - "(\010:\005false\022.\n\037no_standard_descriptor_acce"
|
| - "ssor\030\002 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005f"
|
| - "alse\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024uninterpreted"
|
| - "_option\030\347\007 \003(\0132$.google.protobuf.Uninter"
|
| - "pretedOption*\t\010\350\007\020\200\200\200\200\002\"\230\003\n\014FieldOptions"
|
| - "\022:\n\005ctype\030\001 \001(\0162#.google.protobuf.FieldO"
|
| - "ptions.CType:\006STRING\022\016\n\006packed\030\002 \001(\010\022\?\n\006"
|
| - "jstype\030\006 \001(\0162$.google.protobuf.FieldOpti"
|
| - "ons.JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005fal"
|
| - "se\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\023\n\004weak\030\n "
|
| - "\001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003("
|
| - "\0132$.google.protobuf.UninterpretedOption\""
|
| - "/\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\002\"\215\001\n\013E"
|
| - "numOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepre"
|
| - "cated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opti"
|
| - "on\030\347\007 \003(\0132$.google.protobuf.Uninterprete"
|
| - "dOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022\031"
|
| - "\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpret"
|
| - "ed_option\030\347\007 \003(\0132$.google.protobuf.Unint"
|
| - "erpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpti"
|
| - "ons\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024uninte"
|
| - "rpreted_option\030\347\007 \003(\0132$.google.protobuf."
|
| - "UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"z\n\rMethod"
|
| - "Options\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024un"
|
| - "interpreted_option\030\347\007 \003(\0132$.google.proto"
|
| - "buf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023U"
|
| - "ninterpretedOption\022;\n\004name\030\002 \003(\0132-.googl"
|
| - "e.protobuf.UninterpretedOption.NamePart\022"
|
| - "\030\n\020identifier_value\030\003 \001(\t\022\032\n\022positive_in"
|
| - "t_value\030\004 \001(\004\022\032\n\022negative_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\010NamePa"
|
| - "rt\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extension\030\002 "
|
| - "\002(\010\"\325\001\n\016SourceCodeInfo\022:\n\010location\030\001 \003(\013"
|
| - "2(.google.protobuf.SourceCodeInfo.Locati"
|
| - "on\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004spa"
|
| - "n\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031\n"
|
| - "\021trailing_comments\030\004 \001(\t\022!\n\031leading_deta"
|
| - "ched_comments\030\006 \003(\tB[\n\023com.google.protob"
|
| - "ufB\020DescriptorProtosH\001Z\ndescriptor\242\002\003GPB"
|
| - "\252\002\032Google.Protobuf.Reflection\260\002\001", 5032);
|
| + "le.protobuf.SourceCodeInfo\"\251\003\n\017Descripto"
|
| + "rProto\022\014\n\004name\030\001 \001(\t\0224\n\005field\030\002 \003(\0132%.go"
|
| + "ogle.protobuf.FieldDescriptorProto\0228\n\tex"
|
| + "tension\030\006 \003(\0132%.google.protobuf.FieldDes"
|
| + "criptorProto\0225\n\013nested_type\030\003 \003(\0132 .goog"
|
| + "le.protobuf.DescriptorProto\0227\n\tenum_type"
|
| + "\030\004 \003(\0132$.google.protobuf.EnumDescriptorP"
|
| + "roto\022H\n\017extension_range\030\005 \003(\0132/.google.p"
|
| + "rotobuf.DescriptorProto.ExtensionRange\0220"
|
| + "\n\007options\030\007 \001(\0132\037.google.protobuf.Messag"
|
| + "eOptions\032,\n\016ExtensionRange\022\r\n\005start\030\001 \001("
|
| + "\005\022\013\n\003end\030\002 \001(\005\"\224\005\n\024FieldDescriptorProto\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.FieldDescriptorPr"
|
| + "oto.Label\0228\n\004type\030\005 \001(\0162*.google.protobu"
|
| + "f.FieldDescriptorProto.Type\022\021\n\ttype_name"
|
| + "\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022\025\n\rdefault_valu"
|
| + "e\030\007 \001(\t\022.\n\007options\030\010 \001(\0132\035.google.protob"
|
| + "uf.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\013TYP"
|
| + "E_UINT64\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014TYPE_FIXED"
|
| + "64\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_GROUP\020\n\022\020\n\014TYPE_M"
|
| + "ESSAGE\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\rT"
|
| + "YPE_SFIXED64\020\020\022\017\n\013TYPE_SINT32\020\021\022\017\n\013TYPE_"
|
| + "SINT64\020\022\"C\n\005Label\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n"
|
| + "\016LABEL_REQUIRED\020\002\022\022\n\016LABEL_REPEATED\020\003\"\214\001"
|
| + "\n\023EnumDescriptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005v"
|
| + "alue\030\002 \003(\0132).google.protobuf.EnumValueDe"
|
| + "scriptorProto\022-\n\007options\030\003 \001(\0132\034.google."
|
| + "protobuf.EnumOptions\"l\n\030EnumValueDescrip"
|
| + "torProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222"
|
| + "\n\007options\030\003 \001(\0132!.google.protobuf.EnumVa"
|
| + "lueOptions\"\220\001\n\026ServiceDescriptorProto\022\014\n"
|
| + "\004name\030\001 \001(\t\0226\n\006method\030\002 \003(\0132&.google.pro"
|
| + "tobuf.MethodDescriptorProto\0220\n\007options\030\003"
|
| + " \001(\0132\037.google.protobuf.ServiceOptions\"\177\n"
|
| + "\025MethodDescriptorProto\022\014\n\004name\030\001 \001(\t\022\022\n\n"
|
| + "input_type\030\002 \001(\t\022\023\n\013output_type\030\003 \001(\t\022/\n"
|
| + "\007options\030\004 \001(\0132\036.google.protobuf.MethodO"
|
| + "ptions\"\217\004\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\025retain"
|
| + "_unknown_fields\030\014 \001(\010:\005false\022,\n\035java_gen"
|
| + "erate_equals_and_hash\030\024 \001(\010:\005false\022F\n\014op"
|
| + "timize_for\030\t \001(\0162).google.protobuf.FileO"
|
| + "ptions.OptimizeMode:\005SPEED\022\022\n\ngo_package"
|
| + "\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(\010:\005fal"
|
| + "se\022$\n\025java_generic_services\030\021 \001(\010:\005false"
|
| + "\022\"\n\023py_generic_services\030\022 \001(\010:\005false\022C\n\024"
|
| + "uninterpreted_option\030\347\007 \003(\0132$.google.pro"
|
| + "tobuf.UninterpretedOption\":\n\014OptimizeMod"
|
| + "e\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNT"
|
| + "IME\020\003*\t\010\350\007\020\200\200\200\200\002\"\270\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\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.goo"
|
| + "gle.protobuf.UninterpretedOption*\t\010\350\007\020\200\200"
|
| + "\200\200\002\"\276\002\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.go"
|
| + "ogle.protobuf.FieldOptions.CType:\006STRING"
|
| + "\022\016\n\006packed\030\002 \001(\010\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n"
|
| + "\ndeprecated\030\003 \001(\010:\005false\022\034\n\024experimental"
|
| + "_map_key\030\t \001(\t\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024u"
|
| + "ninterpreted_option\030\347\007 \003(\0132$.google.prot"
|
| + "obuf.UninterpretedOption\"/\n\005CType\022\n\n\006STR"
|
| + "ING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002*\t\010\350\007\020\200"
|
| + "\200\200\200\002\"x\n\013EnumOptions\022\031\n\013allow_alias\030\002 \001(\010"
|
| + ":\004true\022C\n\024uninterpreted_option\030\347\007 \003(\0132$."
|
| + "google.protobuf.UninterpretedOption*\t\010\350\007"
|
| + "\020\200\200\200\200\002\"b\n\020EnumValueOptions\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\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go"
|
| + "ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200"
|
| + "\200\200\200\002\"_\n\rMethodOptions\022C\n\024uninterpreted_o"
|
| + "ption\030\347\007 \003(\0132$.google.protobuf.Uninterpr"
|
| + "etedOption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedO"
|
| + "ption\022;\n\004name\030\002 \003(\0132-.google.protobuf.Un"
|
| + "interpretedOption.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_v"
|
| + "alue\030\006 \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggr"
|
| + "egate_value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_pa"
|
| + "rt\030\001 \002(\t\022\024\n\014is_extension\030\002 \002(\010\"\261\001\n\016Sourc"
|
| + "eCodeInfo\022:\n\010location\030\001 \003(\0132(.google.pro"
|
| + "tobuf.SourceCodeInfo.Location\032c\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(\tB)\n\023com.google.protobufB\020Descr"
|
| + "iptorProtosH\001", 4173);
|
| ::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();
|
| @@ -788,9 +698,7 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() {
|
| 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();
|
| @@ -816,16 +724,6 @@ struct StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto {
|
| }
|
| } static_descriptor_initializer_google_2fprotobuf_2fdescriptor_2eproto_;
|
|
|
| -namespace {
|
| -
|
| -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;
|
| -static void MergeFromFail(int line) {
|
| - GOOGLE_CHECK(false) << __FILE__ << ":" << line;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| @@ -833,20 +731,17 @@ const int FileDescriptorSet::kFileFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| FileDescriptorSet::FileDescriptorSet()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorSet)
|
| }
|
|
|
| void FileDescriptorSet::InitAsDefaultInstance() {
|
| }
|
|
|
| FileDescriptorSet::FileDescriptorSet(const FileDescriptorSet& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet)
|
| }
|
|
|
| void FileDescriptorSet::SharedCtor() {
|
| @@ -855,7 +750,6 @@ void FileDescriptorSet::SharedCtor() {
|
| }
|
|
|
| FileDescriptorSet::~FileDescriptorSet() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.FileDescriptorSet)
|
| SharedDtor();
|
| }
|
|
|
| @@ -881,54 +775,42 @@ const FileDescriptorSet& FileDescriptorSet::default_instance() {
|
|
|
| FileDescriptorSet* FileDescriptorSet::default_instance_ = NULL;
|
|
|
| -FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) const {
|
| - FileDescriptorSet* n = new FileDescriptorSet;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +FileDescriptorSet* FileDescriptorSet::New() const {
|
| + return new FileDescriptorSet;
|
| }
|
|
|
| void FileDescriptorSet::Clear() {
|
| file_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool FileDescriptorSet::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorSet)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // repeated .google.protobuf.FileDescriptorProto file = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_file:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_file:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_file()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(10)) goto parse_loop_file;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(10)) goto parse_file;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -936,46 +818,37 @@ bool FileDescriptorSet::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.FileDescriptorSet)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.FileDescriptorSet)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void FileDescriptorSet::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.FileDescriptorSet)
|
| // repeated .google.protobuf.FileDescriptorProto file = 1;
|
| - for (unsigned int i = 0, n = this->file_size(); i < n; i++) {
|
| + for (int i = 0; i < this->file_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 1, this->file(i), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorSet)
|
| }
|
|
|
| ::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++) {
|
| + for (int i = 0; i < this->file_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 1, this->file(i), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileDescriptorSet)
|
| return target;
|
| }
|
|
|
| @@ -990,7 +863,7 @@ int FileDescriptorSet::ByteSize() const {
|
| this->file(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -1002,10 +875,10 @@ int FileDescriptorSet::ByteSize() const {
|
| }
|
|
|
| void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const FileDescriptorSet* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorSet>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const FileDescriptorSet* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const FileDescriptorSet*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -1014,11 +887,9 @@ void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void FileDescriptorSet::MergeFrom(const FileDescriptorSet& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| file_.MergeFrom(from.file_);
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void FileDescriptorSet::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -1035,19 +906,19 @@ void FileDescriptorSet::CopyFrom(const FileDescriptorSet& from) {
|
|
|
| bool FileDescriptorSet::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->file())) return false;
|
| + for (int i = 0; i < file_size(); i++) {
|
| + if (!this->file(i).IsInitialized()) return false;
|
| + }
|
| return true;
|
| }
|
|
|
| void FileDescriptorSet::Swap(FileDescriptorSet* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) {
|
| - file_.UnsafeArenaSwap(&other->file_);
|
| - std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| + if (other != this) {
|
| + file_.Swap(&other->file_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata FileDescriptorSet::GetMetadata() const {
|
| @@ -1058,40 +929,6 @@ void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// FileDescriptorSet
|
| -
|
| -// repeated .google.protobuf.FileDescriptorProto file = 1;
|
| -int FileDescriptorSet::file_size() const {
|
| - return file_.size();
|
| -}
|
| -void FileDescriptorSet::clear_file() {
|
| - file_.Clear();
|
| -}
|
| - const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorSet.file)
|
| - return file_.Get(index);
|
| -}
|
| - ::google::protobuf::FileDescriptorProto* FileDescriptorSet::mutable_file(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorSet.file)
|
| - return file_.Mutable(index);
|
| -}
|
| - ::google::protobuf::FileDescriptorProto* FileDescriptorSet::add_file() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorSet.file)
|
| - return file_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >&
|
| -FileDescriptorSet::file() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorSet.file)
|
| - return file_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
|
| -FileDescriptorSet::mutable_file() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorSet.file)
|
| - return &file_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -1107,13 +944,11 @@ const int FileDescriptorProto::kServiceFieldNumber;
|
| const int FileDescriptorProto::kExtensionFieldNumber;
|
| const int FileDescriptorProto::kOptionsFieldNumber;
|
| const int FileDescriptorProto::kSourceCodeInfoFieldNumber;
|
| -const int FileDescriptorProto::kSyntaxFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| FileDescriptorProto::FileDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorProto)
|
| }
|
|
|
| void FileDescriptorProto::InitAsDefaultInstance() {
|
| @@ -1122,33 +957,31 @@ void FileDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| source_code_info_ = NULL;
|
| - syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| FileDescriptorProto::~FileDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.FileDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void FileDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - syntax_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| + if (package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete package_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| delete source_code_info_;
|
| @@ -1172,33 +1005,30 @@ const FileDescriptorProto& FileDescriptorProto::default_instance() {
|
|
|
| FileDescriptorProto* FileDescriptorProto::default_instance_ = NULL;
|
|
|
| -FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - FileDescriptorProto* n = new FileDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +FileDescriptorProto* FileDescriptorProto::New() const {
|
| + return new FileDescriptorProto;
|
| }
|
|
|
| void FileDescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| if (has_package()) {
|
| - package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + package_->clear();
|
| + }
|
| }
|
| }
|
| - if (_has_bits_[8 / 32] & 3584u) {
|
| + if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();
|
| }
|
| if (has_source_code_info()) {
|
| if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();
|
| }
|
| - if (has_syntax()) {
|
| - syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - }
|
| }
|
| dependency_.Clear();
|
| public_dependency_.Clear();
|
| @@ -1208,32 +1038,26 @@ void FileDescriptorProto::Clear() {
|
| service_.Clear();
|
| extension_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool FileDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_package;
|
| break;
|
| @@ -1241,16 +1065,16 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string package = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_package:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_package()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->package().data(), this->package().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileDescriptorProto.package");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(26)) goto parse_dependency;
|
| break;
|
| @@ -1258,17 +1082,17 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated string dependency = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_dependency:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->add_dependency()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->dependency(this->dependency_size() - 1).data(),
|
| this->dependency(this->dependency_size() - 1).length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileDescriptorProto.dependency");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(26)) goto parse_dependency;
|
| if (input->ExpectTag(34)) goto parse_message_type;
|
| @@ -1277,77 +1101,73 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_message_type:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_message_type:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_message_type()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(34)) goto parse_loop_message_type;
|
| - if (input->ExpectTag(42)) goto parse_loop_enum_type;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(34)) goto parse_message_type;
|
| + if (input->ExpectTag(42)) goto parse_enum_type;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| case 5: {
|
| - if (tag == 42) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_enum_type:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_enum_type:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_enum_type()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(42)) goto parse_loop_enum_type;
|
| - if (input->ExpectTag(50)) goto parse_loop_service;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(42)) goto parse_enum_type;
|
| + if (input->ExpectTag(50)) goto parse_service;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| case 6: {
|
| - if (tag == 50) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_service:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_service:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_service()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_loop_service;
|
| - if (input->ExpectTag(58)) goto parse_loop_extension;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(50)) goto parse_service;
|
| + if (input->ExpectTag(58)) goto parse_extension;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| case 7: {
|
| - if (tag == 58) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_extension:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_extension:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_extension()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(58)) goto parse_loop_extension;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(58)) goto parse_extension;
|
| if (input->ExpectTag(66)) goto parse_options;
|
| break;
|
| }
|
|
|
| // optional .google.protobuf.FileOptions options = 8;
|
| case 8: {
|
| - if (tag == 66) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_options()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(74)) goto parse_source_code_info;
|
| break;
|
| @@ -1355,12 +1175,13 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| case 9: {
|
| - if (tag == 74) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_source_code_info:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_source_code_info()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(80)) goto parse_public_dependency;
|
| break;
|
| @@ -1368,17 +1189,20 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated int32 public_dependency = 10;
|
| case 10: {
|
| - if (tag == 80) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_public_dependency:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| 1, 80, input, this->mutable_public_dependency())));
|
| - } else if (tag == 82) {
|
| + } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
|
| + == ::google::protobuf::internal::WireFormatLite::
|
| + WIRETYPE_LENGTH_DELIMITED) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, this->mutable_public_dependency())));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(80)) goto parse_public_dependency;
|
| if (input->ExpectTag(88)) goto parse_weak_dependency;
|
| @@ -1387,46 +1211,31 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated int32 weak_dependency = 11;
|
| case 11: {
|
| - if (tag == 88) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_weak_dependency:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| 1, 88, input, this->mutable_weak_dependency())));
|
| - } else if (tag == 90) {
|
| + } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
|
| + == ::google::protobuf::internal::WireFormatLite::
|
| + WIRETYPE_LENGTH_DELIMITED) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, this->mutable_weak_dependency())));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(88)) goto parse_weak_dependency;
|
| - if (input->ExpectTag(98)) goto parse_syntax;
|
| - break;
|
| - }
|
| -
|
| - // optional string syntax = 12;
|
| - case 12: {
|
| - if (tag == 98) {
|
| - parse_syntax:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->mutable_syntax()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->syntax().data(), this->syntax().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileDescriptorProto.syntax");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -1434,68 +1243,59 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.FileDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.FileDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void FileDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.FileDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // optional string package = 2;
|
| if (has_package()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->package().data(), this->package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.package");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 2, this->package(), output);
|
| }
|
|
|
| // repeated string dependency = 3;
|
| for (int i = 0; i < this->dependency_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->dependency(i).data(), this->dependency(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.dependency");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->dependency(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| - for (unsigned int i = 0, n = this->message_type_size(); i < n; i++) {
|
| + for (int i = 0; i < this->message_type_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 4, this->message_type(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| - for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) {
|
| + for (int i = 0; i < this->enum_type_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 5, this->enum_type(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| - for (unsigned int i = 0, n = this->service_size(); i < n; i++) {
|
| + for (int i = 0; i < this->service_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 6, this->service(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| - for (unsigned int i = 0, n = this->extension_size(); i < n; i++) {
|
| + for (int i = 0; i < this->extension_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 7, this->extension(i), output);
|
| }
|
| @@ -1503,13 +1303,13 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
| // optional .google.protobuf.FileOptions options = 8;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 8, *this->options_, output);
|
| + 8, this->options(), output);
|
| }
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| if (has_source_code_info()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 9, *this->source_code_info_, output);
|
| + 9, this->source_code_info(), output);
|
| }
|
|
|
| // repeated int32 public_dependency = 10;
|
| @@ -1524,32 +1324,19 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
| 11, this->weak_dependency(i), output);
|
| }
|
|
|
| - // optional string syntax = 12;
|
| - if (has_syntax()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->syntax().data(), this->syntax().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.syntax");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| - 12, this->syntax(), output);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| @@ -1557,10 +1344,9 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // optional string package = 2;
|
| if (has_package()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->package().data(), this->package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.package");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 2, this->package(), target);
|
| @@ -1568,37 +1354,36 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // repeated string dependency = 3;
|
| for (int i = 0; i < this->dependency_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->dependency(i).data(), this->dependency(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.dependency");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteStringToArray(3, this->dependency(i), target);
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| - for (unsigned int i = 0, n = this->message_type_size(); i < n; i++) {
|
| + for (int i = 0; i < this->message_type_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->enum_type_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->service_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 6, this->service(i), target);
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| - for (unsigned int i = 0, n = this->extension_size(); i < n; i++) {
|
| + for (int i = 0; i < this->extension_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 7, this->extension(i), target);
|
| @@ -1608,14 +1393,14 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 8, *this->options_, target);
|
| + 8, this->options(), target);
|
| }
|
|
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| if (has_source_code_info()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 9, *this->source_code_info_, target);
|
| + 9, this->source_code_info(), target);
|
| }
|
|
|
| // repeated int32 public_dependency = 10;
|
| @@ -1630,29 +1415,17 @@ void FileDescriptorProto::SerializeWithCachedSizes(
|
| WriteInt32ToArray(11, this->weak_dependency(i), target);
|
| }
|
|
|
| - // optional string syntax = 12;
|
| - if (has_syntax()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->syntax().data(), this->syntax().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileDescriptorProto.syntax");
|
| - target =
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 12, this->syntax(), target);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileDescriptorProto)
|
| return target;
|
| }
|
|
|
| int FileDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -1668,26 +1441,19 @@ int FileDescriptorProto::ByteSize() const {
|
| }
|
|
|
| }
|
| - if (_has_bits_[9 / 32] & 3584u) {
|
| + if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| // optional .google.protobuf.FileOptions options = 8;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| + 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());
|
| + this->source_code_info());
|
| }
|
|
|
| }
|
| @@ -1750,7 +1516,7 @@ int FileDescriptorProto::ByteSize() const {
|
| this->extension(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -1762,10 +1528,10 @@ int FileDescriptorProto::ByteSize() const {
|
| }
|
|
|
| void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const FileDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const FileDescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const FileDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const FileDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -1774,7 +1540,7 @@ void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| dependency_.MergeFrom(from.dependency_);
|
| public_dependency_.MergeFrom(from.public_dependency_);
|
| weak_dependency_.MergeFrom(from.weak_dependency_);
|
| @@ -1784,12 +1550,10 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {
|
| extension_.MergeFrom(from.extension_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_package()) {
|
| - set_has_package();
|
| - package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_);
|
| + set_package(from.package());
|
| }
|
| }
|
| if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| @@ -1799,14 +1563,8 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {
|
| 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());
|
| }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void FileDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -1823,36 +1581,41 @@ 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;
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->extension())) return false;
|
| + for (int i = 0; i < message_type_size(); i++) {
|
| + if (!this->message_type(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < enum_type_size(); i++) {
|
| + if (!this->enum_type(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < service_size(); i++) {
|
| + if (!this->service(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < extension_size(); i++) {
|
| + if (!this->extension(i).IsInitialized()) return false;
|
| + }
|
| if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| return true;
|
| }
|
|
|
| void FileDescriptorProto::Swap(FileDescriptorProto* other) {
|
| - if (other == this) return;
|
| - 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_);
|
| - message_type_.UnsafeArenaSwap(&other->message_type_);
|
| - enum_type_.UnsafeArenaSwap(&other->enum_type_);
|
| - service_.UnsafeArenaSwap(&other->service_);
|
| - extension_.UnsafeArenaSwap(&other->extension_);
|
| - 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_);
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + std::swap(package_, other->package_);
|
| + dependency_.Swap(&other->dependency_);
|
| + public_dependency_.Swap(&other->public_dependency_);
|
| + weak_dependency_.Swap(&other->weak_dependency_);
|
| + message_type_.Swap(&other->message_type_);
|
| + enum_type_.Swap(&other->enum_type_);
|
| + service_.Swap(&other->service_);
|
| + extension_.Swap(&other->extension_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(source_code_info_, other->source_code_info_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata FileDescriptorProto::GetMetadata() const {
|
| @@ -1863,489 +1626,6 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// FileDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool FileDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void FileDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void FileDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void FileDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& FileDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* FileDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.name)
|
| -}
|
| -
|
| -// optional string package = 2;
|
| -bool FileDescriptorProto::has_package() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void FileDescriptorProto::set_has_package() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void FileDescriptorProto::clear_has_package() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -void FileDescriptorProto::clear_package() {
|
| - package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_package();
|
| -}
|
| - const ::std::string& FileDescriptorProto::package() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package)
|
| - return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_package();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package)
|
| - return package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* FileDescriptorProto::release_package() {
|
| - clear_has_package();
|
| - return package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileDescriptorProto::set_allocated_package(::std::string* package) {
|
| - if (package != NULL) {
|
| - set_has_package();
|
| - } else {
|
| - clear_has_package();
|
| - }
|
| - package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), package);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.package)
|
| -}
|
| -
|
| -// repeated string dependency = 3;
|
| -int FileDescriptorProto::dependency_size() const {
|
| - return dependency_.size();
|
| -}
|
| -void FileDescriptorProto::clear_dependency() {
|
| - dependency_.Clear();
|
| -}
|
| - 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) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency)
|
| - return dependency_.Mutable(index);
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - return dependency_.Add();
|
| -}
|
| - 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) {
|
| - dependency_.Add()->assign(value);
|
| - // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency)
|
| -}
|
| - 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>&
|
| -FileDescriptorProto::dependency() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency)
|
| - return dependency_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::std::string>*
|
| -FileDescriptorProto::mutable_dependency() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency)
|
| - return &dependency_;
|
| -}
|
| -
|
| -// repeated int32 public_dependency = 10;
|
| -int FileDescriptorProto::public_dependency_size() const {
|
| - return public_dependency_.size();
|
| -}
|
| -void FileDescriptorProto::clear_public_dependency() {
|
| - public_dependency_.Clear();
|
| -}
|
| - ::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) {
|
| - public_dependency_.Set(index, value);
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency)
|
| -}
|
| - 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 >&
|
| -FileDescriptorProto::public_dependency() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency)
|
| - return public_dependency_;
|
| -}
|
| - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| -FileDescriptorProto::mutable_public_dependency() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency)
|
| - return &public_dependency_;
|
| -}
|
| -
|
| -// repeated int32 weak_dependency = 11;
|
| -int FileDescriptorProto::weak_dependency_size() const {
|
| - return weak_dependency_.size();
|
| -}
|
| -void FileDescriptorProto::clear_weak_dependency() {
|
| - weak_dependency_.Clear();
|
| -}
|
| - ::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) {
|
| - weak_dependency_.Set(index, value);
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency)
|
| -}
|
| - 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 >&
|
| -FileDescriptorProto::weak_dependency() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency)
|
| - return weak_dependency_;
|
| -}
|
| - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| -FileDescriptorProto::mutable_weak_dependency() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency)
|
| - return &weak_dependency_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.DescriptorProto message_type = 4;
|
| -int FileDescriptorProto::message_type_size() const {
|
| - return message_type_.size();
|
| -}
|
| -void FileDescriptorProto::clear_message_type() {
|
| - message_type_.Clear();
|
| -}
|
| - const ::google::protobuf::DescriptorProto& FileDescriptorProto::message_type(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.message_type)
|
| - return message_type_.Get(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto* FileDescriptorProto::mutable_message_type(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.message_type)
|
| - return message_type_.Mutable(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto* FileDescriptorProto::add_message_type() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.message_type)
|
| - return message_type_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| -FileDescriptorProto::message_type() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.message_type)
|
| - return message_type_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| -FileDescriptorProto::mutable_message_type() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.message_type)
|
| - return &message_type_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| -int FileDescriptorProto::enum_type_size() const {
|
| - return enum_type_.size();
|
| -}
|
| -void FileDescriptorProto::clear_enum_type() {
|
| - enum_type_.Clear();
|
| -}
|
| - const ::google::protobuf::EnumDescriptorProto& FileDescriptorProto::enum_type(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.enum_type)
|
| - return enum_type_.Get(index);
|
| -}
|
| - ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::mutable_enum_type(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.enum_type)
|
| - return enum_type_.Mutable(index);
|
| -}
|
| - ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::add_enum_type() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.enum_type)
|
| - return enum_type_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| -FileDescriptorProto::enum_type() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.enum_type)
|
| - return enum_type_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| -FileDescriptorProto::mutable_enum_type() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.enum_type)
|
| - return &enum_type_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| -int FileDescriptorProto::service_size() const {
|
| - return service_.size();
|
| -}
|
| -void FileDescriptorProto::clear_service() {
|
| - service_.Clear();
|
| -}
|
| - const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::service(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.service)
|
| - return service_.Get(index);
|
| -}
|
| - ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::mutable_service(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.service)
|
| - return service_.Mutable(index);
|
| -}
|
| - ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::add_service() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.service)
|
| - return service_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >&
|
| -FileDescriptorProto::service() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.service)
|
| - return service_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >*
|
| -FileDescriptorProto::mutable_service() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.service)
|
| - return &service_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| -int FileDescriptorProto::extension_size() const {
|
| - return extension_.size();
|
| -}
|
| -void FileDescriptorProto::clear_extension() {
|
| - extension_.Clear();
|
| -}
|
| - const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::extension(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.extension)
|
| - return extension_.Get(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::mutable_extension(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.extension)
|
| - return extension_.Mutable(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::add_extension() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.extension)
|
| - return extension_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -FileDescriptorProto::extension() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.extension)
|
| - return extension_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| -FileDescriptorProto::mutable_extension() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.extension)
|
| - return &extension_;
|
| -}
|
| -
|
| -// optional .google.protobuf.FileOptions options = 8;
|
| -bool FileDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000200u) != 0;
|
| -}
|
| -void FileDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000200u;
|
| -}
|
| -void FileDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000200u;
|
| -}
|
| -void FileDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::FileOptions& FileDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::FileOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::FileOptions* FileDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::FileOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.options)
|
| -}
|
| -
|
| -// optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| -bool FileDescriptorProto::has_source_code_info() const {
|
| - return (_has_bits_[0] & 0x00000400u) != 0;
|
| -}
|
| -void FileDescriptorProto::set_has_source_code_info() {
|
| - _has_bits_[0] |= 0x00000400u;
|
| -}
|
| -void FileDescriptorProto::clear_has_source_code_info() {
|
| - _has_bits_[0] &= ~0x00000400u;
|
| -}
|
| -void FileDescriptorProto::clear_source_code_info() {
|
| - if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();
|
| - clear_has_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_ : *default_instance_->source_code_info_;
|
| -}
|
| - ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() {
|
| - set_has_source_code_info();
|
| - if (source_code_info_ == NULL) {
|
| - source_code_info_ = new ::google::protobuf::SourceCodeInfo;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.source_code_info)
|
| - return source_code_info_;
|
| -}
|
| - ::google::protobuf::SourceCodeInfo* FileDescriptorProto::release_source_code_info() {
|
| - clear_has_source_code_info();
|
| - ::google::protobuf::SourceCodeInfo* temp = source_code_info_;
|
| - source_code_info_ = NULL;
|
| - return temp;
|
| -}
|
| - void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* source_code_info) {
|
| - delete source_code_info_;
|
| - source_code_info_ = source_code_info;
|
| - if (source_code_info) {
|
| - set_has_source_code_info();
|
| - } else {
|
| - clear_has_source_code_info();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.source_code_info)
|
| -}
|
| -
|
| -// optional string syntax = 12;
|
| -bool FileDescriptorProto::has_syntax() const {
|
| - return (_has_bits_[0] & 0x00000800u) != 0;
|
| -}
|
| -void FileDescriptorProto::set_has_syntax() {
|
| - _has_bits_[0] |= 0x00000800u;
|
| -}
|
| -void FileDescriptorProto::clear_has_syntax() {
|
| - _has_bits_[0] &= ~0x00000800u;
|
| -}
|
| -void FileDescriptorProto::clear_syntax() {
|
| - syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_syntax();
|
| -}
|
| - const ::std::string& FileDescriptorProto::syntax() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax)
|
| - return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_syntax();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.syntax)
|
| - return syntax_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* FileDescriptorProto::release_syntax() {
|
| - clear_has_syntax();
|
| - return syntax_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) {
|
| - if (syntax != NULL) {
|
| - set_has_syntax();
|
| - } else {
|
| - clear_has_syntax();
|
| - }
|
| - syntax_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), syntax);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.syntax)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -2355,20 +1635,17 @@ const int DescriptorProto_ExtensionRange::kEndFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange)
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::SharedCtor() {
|
| @@ -2379,7 +1656,6 @@ void DescriptorProto_ExtensionRange::SharedCtor() {
|
| }
|
|
|
| DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto.ExtensionRange)
|
| SharedDtor();
|
| }
|
|
|
| @@ -2405,53 +1681,35 @@ const DescriptorProto_ExtensionRange& DescriptorProto_ExtensionRange::default_in
|
|
|
| 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) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New() const {
|
| + return new DescriptorProto_ExtensionRange;
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::Clear() {
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<DescriptorProto_ExtensionRange*>(16)->f)
|
| -
|
| -#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();
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + start_ = 0;
|
| + end_ = 0;
|
| }
|
| + ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ExtensionRange)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional int32 start = 1;
|
| case 1: {
|
| - if (tag == 8) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, &start_)));
|
| set_has_start();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(16)) goto parse_end;
|
| break;
|
| @@ -2459,25 +1717,25 @@ bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream(
|
|
|
| // optional int32 end = 2;
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -2485,18 +1743,12 @@ bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.DescriptorProto.ExtensionRange)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.DescriptorProto.ExtensionRange)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.DescriptorProto.ExtensionRange)
|
| // optional int32 start = 1;
|
| if (has_start()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->start(), output);
|
| @@ -2507,16 +1759,14 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes(
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->end(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ExtensionRange)
|
| }
|
|
|
| ::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()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->start(), target);
|
| @@ -2527,18 +1777,17 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes(
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->end(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto.ExtensionRange)
|
| return target;
|
| }
|
|
|
| int DescriptorProto_ExtensionRange::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional int32 start = 1;
|
| if (has_start()) {
|
| total_size += 1 +
|
| @@ -2554,7 +1803,7 @@ int DescriptorProto_ExtensionRange::ByteSize() const {
|
| }
|
|
|
| }
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -2566,10 +1815,10 @@ int DescriptorProto_ExtensionRange::ByteSize() const {
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const DescriptorProto_ExtensionRange* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto_ExtensionRange>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const DescriptorProto_ExtensionRange* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const DescriptorProto_ExtensionRange*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -2578,7 +1827,7 @@ void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRange& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_start()) {
|
| set_start(from.start());
|
| @@ -2587,9 +1836,7 @@ 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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -2610,15 +1857,13 @@ bool DescriptorProto_ExtensionRange::IsInitialized() const {
|
| }
|
|
|
| void DescriptorProto_ExtensionRange::Swap(DescriptorProto_ExtensionRange* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange* other) {
|
| - std::swap(start_, other->start_);
|
| - 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_);
|
| + if (other != this) {
|
| + std::swap(start_, other->start_);
|
| + std::swap(end_, other->end_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata DescriptorProto_ExtensionRange::GetMetadata() const {
|
| @@ -2633,305 +1878,18 @@ void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange
|
| // -------------------------------------------------------------------
|
|
|
| #ifndef _MSC_VER
|
| -const int DescriptorProto_ReservedRange::kStartFieldNumber;
|
| -const int DescriptorProto_ReservedRange::kEndFieldNumber;
|
| -#endif // !_MSC_VER
|
| -
|
| -DescriptorProto_ReservedRange::DescriptorProto_ReservedRange()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - 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) {
|
| - SharedCtor();
|
| - MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ReservedRange)
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::SharedCtor() {
|
| - _cached_size_ = 0;
|
| - start_ = 0;
|
| - end_ = 0;
|
| - ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| -}
|
| -
|
| -DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto.ReservedRange)
|
| - SharedDtor();
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::SharedDtor() {
|
| - if (this != default_instance_) {
|
| - }
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::SetCachedSize(int size) const {
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = size;
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| -}
|
| -const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange::descriptor() {
|
| - protobuf_AssignDescriptorsOnce();
|
| - return DescriptorProto_ReservedRange_descriptor_;
|
| -}
|
| -
|
| -const DescriptorProto_ReservedRange& DescriptorProto_ReservedRange::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) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::Clear() {
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<DescriptorProto_ReservedRange*>(16)->f)
|
| -
|
| -#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();
|
| - }
|
| -}
|
| -
|
| -bool DescriptorProto_ReservedRange::MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| - ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ReservedRange)
|
| - 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)) {
|
| - // optional int32 start = 1;
|
| - case 1: {
|
| - 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 == 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;
|
| - }
|
| -
|
| - 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::WireFormatLite::SkipField(
|
| - input, tag, mutable_unknown_fields()));
|
| - break;
|
| - }
|
| - }
|
| - }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.DescriptorProto.ReservedRange)
|
| - return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.DescriptorProto.ReservedRange)
|
| - return false;
|
| -#undef DO_
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::SerializeWithCachedSizes(
|
| - ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.DescriptorProto.ReservedRange)
|
| - // optional int32 start = 1;
|
| - if (has_start()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->start(), output);
|
| - }
|
| -
|
| - // optional int32 end = 2;
|
| - if (has_end()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->end(), output);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| - unknown_fields(), output);
|
| - }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ReservedRange)
|
| -}
|
| -
|
| -::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()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->start(), target);
|
| - }
|
| -
|
| - // optional int32 end = 2;
|
| - if (has_end()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->end(), target);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| - unknown_fields(), target);
|
| - }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto.ReservedRange)
|
| - return target;
|
| -}
|
| -
|
| -int DescriptorProto_ReservedRange::ByteSize() const {
|
| - int total_size = 0;
|
| -
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| - // optional int32 start = 1;
|
| - if (has_start()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::Int32Size(
|
| - this->start());
|
| - }
|
| -
|
| - // optional int32 end = 2;
|
| - if (has_end()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::Int32Size(
|
| - this->end());
|
| - }
|
| -
|
| - }
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| - unknown_fields());
|
| - }
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| - return total_size;
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const DescriptorProto_ReservedRange* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto_ReservedRange>(
|
| - &from);
|
| - if (source == NULL) {
|
| - ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| - } else {
|
| - MergeFrom(*source);
|
| - }
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRange& from) {
|
| - 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());
|
| - }
|
| - if (from.has_end()) {
|
| - 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) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::CopyFrom(const DescriptorProto_ReservedRange& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -bool DescriptorProto_ReservedRange::IsInitialized() const {
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void DescriptorProto_ReservedRange::Swap(DescriptorProto_ReservedRange* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void DescriptorProto_ReservedRange::InternalSwap(DescriptorProto_ReservedRange* other) {
|
| - std::swap(start_, other->start_);
|
| - 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 DescriptorProto_ReservedRange::GetMetadata() const {
|
| - protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = DescriptorProto_ReservedRange_descriptor_;
|
| - metadata.reflection = DescriptorProto_ReservedRange_reflection_;
|
| - return metadata;
|
| -}
|
| -
|
| -
|
| -// -------------------------------------------------------------------
|
| -
|
| -#ifndef _MSC_VER
|
| const int DescriptorProto::kNameFieldNumber;
|
| const int DescriptorProto::kFieldFieldNumber;
|
| const int DescriptorProto::kExtensionFieldNumber;
|
| const int DescriptorProto::kNestedTypeFieldNumber;
|
| const int DescriptorProto::kEnumTypeFieldNumber;
|
| const int DescriptorProto::kExtensionRangeFieldNumber;
|
| -const int DescriptorProto::kOneofDeclFieldNumber;
|
| const int DescriptorProto::kOptionsFieldNumber;
|
| -const int DescriptorProto::kReservedRangeFieldNumber;
|
| -const int DescriptorProto::kReservedNameFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| DescriptorProto::DescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto)
|
| }
|
|
|
| void DescriptorProto::InitAsDefaultInstance() {
|
| @@ -2939,28 +1897,26 @@ void DescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| DescriptorProto::DescriptorProto(const DescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| DescriptorProto::~DescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void DescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -2983,18 +1939,16 @@ const DescriptorProto& DescriptorProto::default_instance() {
|
|
|
| DescriptorProto* DescriptorProto::default_instance_ = NULL;
|
|
|
| -DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - DescriptorProto* n = new DescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +DescriptorProto* DescriptorProto::New() const {
|
| + return new DescriptorProto;
|
| }
|
|
|
| void DescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 129u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();
|
| @@ -3005,36 +1959,27 @@ void DescriptorProto::Clear() {
|
| nested_type_.Clear();
|
| enum_type_.Clear();
|
| extension_range_.Clear();
|
| - oneof_decl_.Clear();
|
| - reserved_range_.Clear();
|
| - reserved_name_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool DescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.DescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_field;
|
| break;
|
| @@ -3042,156 +1987,98 @@ bool DescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_field:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_field:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_field()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_loop_field;
|
| - if (input->ExpectTag(26)) goto parse_loop_nested_type;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(18)) goto parse_field;
|
| + if (input->ExpectTag(26)) goto parse_nested_type;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_nested_type:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_nested_type:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_nested_type()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(26)) goto parse_loop_nested_type;
|
| - if (input->ExpectTag(34)) goto parse_loop_enum_type;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(26)) goto parse_nested_type;
|
| + if (input->ExpectTag(34)) goto parse_enum_type;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_enum_type:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_enum_type:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_enum_type()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(34)) goto parse_loop_enum_type;
|
| - if (input->ExpectTag(42)) goto parse_loop_extension_range;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(34)) goto parse_enum_type;
|
| + if (input->ExpectTag(42)) goto parse_extension_range;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| case 5: {
|
| - if (tag == 42) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_extension_range:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_extension_range:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_extension_range()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(42)) goto parse_loop_extension_range;
|
| - if (input->ExpectTag(50)) goto parse_loop_extension;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(42)) goto parse_extension_range;
|
| + if (input->ExpectTag(50)) goto parse_extension;
|
| break;
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| case 6: {
|
| - if (tag == 50) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_extension:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_extension:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_extension()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_loop_extension;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(50)) goto parse_extension;
|
| if (input->ExpectTag(58)) goto parse_options;
|
| break;
|
| }
|
|
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| case 7: {
|
| - if (tag == 58) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| 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 == 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 == 74) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_reserved_range:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| - input, add_reserved_range()));
|
| - } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - 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 == 82) {
|
| - parse_reserved_name:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->add_reserved_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->reserved_name(this->reserved_name_size() - 1).data(),
|
| - this->reserved_name(this->reserved_name_size() - 1).length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.DescriptorProto.reserved_name");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - if (input->ExpectTag(82)) goto parse_reserved_name;
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -3199,54 +2086,47 @@ bool DescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.DescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.DescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void DescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.DescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.DescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| - for (unsigned int i = 0, n = this->field_size(); i < n; i++) {
|
| + for (int i = 0; i < this->field_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->field(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| - for (unsigned int i = 0, n = this->nested_type_size(); i < n; i++) {
|
| + for (int i = 0; i < this->nested_type_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 3, this->nested_type(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| - for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) {
|
| + for (int i = 0; i < this->enum_type_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 4, this->enum_type(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| - for (unsigned int i = 0, n = this->extension_range_size(); i < n; i++) {
|
| + for (int i = 0; i < this->extension_range_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 5, this->extension_range(i), output);
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| - for (unsigned int i = 0, n = this->extension_size(); i < n; i++) {
|
| + for (int i = 0; i < this->extension_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 6, this->extension(i), output);
|
| }
|
| @@ -3254,82 +2134,57 @@ void DescriptorProto::SerializeWithCachedSizes(
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 7, *this->options_, output);
|
| - }
|
| -
|
| - // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
|
| - for (unsigned int i = 0, n = this->oneof_decl_size(); i < n; i++) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 8, this->oneof_decl(i), output);
|
| + 7, this->options(), output);
|
| }
|
|
|
| - // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
|
| - for (unsigned int i = 0, n = this->reserved_range_size(); i < n; i++) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 9, this->reserved_range(i), output);
|
| - }
|
| -
|
| - // repeated string reserved_name = 10;
|
| - for (int i = 0; i < this->reserved_name_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->reserved_name(i).data(), this->reserved_name(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.DescriptorProto.reserved_name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteString(
|
| - 10, this->reserved_name(i), output);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.DescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
|
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| - for (unsigned int i = 0, n = this->field_size(); i < n; i++) {
|
| + for (int i = 0; i < this->field_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->nested_type_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->enum_type_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->extension_range_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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++) {
|
| + for (int i = 0; i < this->extension_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 6, this->extension(i), target);
|
| @@ -3339,45 +2194,20 @@ void DescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| 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::
|
| - 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::
|
| - WriteMessageNoVirtualToArray(
|
| - 9, this->reserved_range(i), target);
|
| - }
|
| -
|
| - // repeated string reserved_name = 10;
|
| - for (int i = 0; i < this->reserved_name_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->reserved_name(i).data(), this->reserved_name(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.DescriptorProto.reserved_name");
|
| - target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteStringToArray(10, this->reserved_name(i), target);
|
| + 7, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto)
|
| return target;
|
| }
|
|
|
| int DescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 129u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -3389,7 +2219,7 @@ int DescriptorProto::ByteSize() const {
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| + this->options());
|
| }
|
|
|
| }
|
| @@ -3433,45 +2263,22 @@ int DescriptorProto::ByteSize() const {
|
| this->extension_range(i));
|
| }
|
|
|
| - // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
|
| - total_size += 1 * this->oneof_decl_size();
|
| - for (int i = 0; i < this->oneof_decl_size(); i++) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - this->oneof_decl(i));
|
| + ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| + unknown_fields());
|
| }
|
| -
|
| - // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
|
| - 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 * 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 (_internal_metadata_.have_unknown_fields()) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| - unknown_fields());
|
| - }
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| - return total_size;
|
| -}
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| + _cached_size_ = total_size;
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| + return total_size;
|
| +}
|
|
|
| void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const DescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const DescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const DescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const DescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -3480,27 +2287,21 @@ void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void DescriptorProto::MergeFrom(const DescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| field_.MergeFrom(from.field_);
|
| extension_.MergeFrom(from.extension_);
|
| nested_type_.MergeFrom(from.nested_type_);
|
| enum_type_.MergeFrom(from.enum_type_);
|
| extension_range_.MergeFrom(from.extension_range_);
|
| - oneof_decl_.MergeFrom(from.oneof_decl_);
|
| - reserved_range_.MergeFrom(from.reserved_range_);
|
| - reserved_name_.MergeFrom(from.reserved_name_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_options()) {
|
| mutable_options()->::google::protobuf::MessageOptions::MergeFrom(from.options());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void DescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -3517,34 +2318,37 @@ 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;
|
| + for (int i = 0; i < field_size(); i++) {
|
| + if (!this->field(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < extension_size(); i++) {
|
| + if (!this->extension(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < nested_type_size(); i++) {
|
| + if (!this->nested_type(i).IsInitialized()) return false;
|
| + }
|
| + for (int i = 0; i < enum_type_size(); i++) {
|
| + if (!this->enum_type(i).IsInitialized()) return false;
|
| + }
|
| if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| return true;
|
| }
|
|
|
| void DescriptorProto::Swap(DescriptorProto* other) {
|
| - if (other == this) return;
|
| - 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_);
|
| - std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + field_.Swap(&other->field_);
|
| + extension_.Swap(&other->extension_);
|
| + nested_type_.Swap(&other->nested_type_);
|
| + enum_type_.Swap(&other->enum_type_);
|
| + extension_range_.Swap(&other->extension_range_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata DescriptorProto::GetMetadata() const {
|
| @@ -3555,474 +2359,6 @@ void DescriptorProto::InternalSwap(DescriptorProto* other) {
|
| 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;
|
| -bool DescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void DescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void DescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void DescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& DescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* DescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void DescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.name)
|
| -}
|
| -
|
| -// repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| -int DescriptorProto::field_size() const {
|
| - return field_.size();
|
| -}
|
| -void DescriptorProto::clear_field() {
|
| - field_.Clear();
|
| -}
|
| - const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.field)
|
| - return field_.Get(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_field(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.field)
|
| - return field_.Mutable(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_field() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.field)
|
| - return field_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -DescriptorProto::field() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.field)
|
| - return field_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| -DescriptorProto::mutable_field() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.field)
|
| - return &field_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| -int DescriptorProto::extension_size() const {
|
| - return extension_.size();
|
| -}
|
| -void DescriptorProto::clear_extension() {
|
| - extension_.Clear();
|
| -}
|
| - const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extension(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension)
|
| - return extension_.Get(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_extension(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension)
|
| - return extension_.Mutable(index);
|
| -}
|
| - ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_extension() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension)
|
| - return extension_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >&
|
| -DescriptorProto::extension() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension)
|
| - return extension_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
|
| -DescriptorProto::mutable_extension() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension)
|
| - return &extension_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| -int DescriptorProto::nested_type_size() const {
|
| - return nested_type_.size();
|
| -}
|
| -void DescriptorProto::clear_nested_type() {
|
| - nested_type_.Clear();
|
| -}
|
| - const ::google::protobuf::DescriptorProto& DescriptorProto::nested_type(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.nested_type)
|
| - return nested_type_.Get(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto* DescriptorProto::mutable_nested_type(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.nested_type)
|
| - return nested_type_.Mutable(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto* DescriptorProto::add_nested_type() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.nested_type)
|
| - return nested_type_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >&
|
| -DescriptorProto::nested_type() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.nested_type)
|
| - return nested_type_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
|
| -DescriptorProto::mutable_nested_type() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.nested_type)
|
| - return &nested_type_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| -int DescriptorProto::enum_type_size() const {
|
| - return enum_type_.size();
|
| -}
|
| -void DescriptorProto::clear_enum_type() {
|
| - enum_type_.Clear();
|
| -}
|
| - const ::google::protobuf::EnumDescriptorProto& DescriptorProto::enum_type(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.enum_type)
|
| - return enum_type_.Get(index);
|
| -}
|
| - ::google::protobuf::EnumDescriptorProto* DescriptorProto::mutable_enum_type(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.enum_type)
|
| - return enum_type_.Mutable(index);
|
| -}
|
| - ::google::protobuf::EnumDescriptorProto* DescriptorProto::add_enum_type() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.enum_type)
|
| - return enum_type_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >&
|
| -DescriptorProto::enum_type() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.enum_type)
|
| - return enum_type_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
|
| -DescriptorProto::mutable_enum_type() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.enum_type)
|
| - return &enum_type_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| -int DescriptorProto::extension_range_size() const {
|
| - return extension_range_.size();
|
| -}
|
| -void DescriptorProto::clear_extension_range() {
|
| - extension_range_.Clear();
|
| -}
|
| - const ::google::protobuf::DescriptorProto_ExtensionRange& DescriptorProto::extension_range(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension_range)
|
| - return extension_range_.Get(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::mutable_extension_range(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension_range)
|
| - return extension_range_.Mutable(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::add_extension_range() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension_range)
|
| - return extension_range_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >&
|
| -DescriptorProto::extension_range() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension_range)
|
| - return extension_range_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
|
| -DescriptorProto::mutable_extension_range() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension_range)
|
| - return &extension_range_;
|
| -}
|
| -
|
| -// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
|
| -int DescriptorProto::oneof_decl_size() const {
|
| - return oneof_decl_.size();
|
| -}
|
| -void DescriptorProto::clear_oneof_decl() {
|
| - oneof_decl_.Clear();
|
| -}
|
| - const ::google::protobuf::OneofDescriptorProto& DescriptorProto::oneof_decl(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.oneof_decl)
|
| - return oneof_decl_.Get(index);
|
| -}
|
| - ::google::protobuf::OneofDescriptorProto* DescriptorProto::mutable_oneof_decl(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.oneof_decl)
|
| - return oneof_decl_.Mutable(index);
|
| -}
|
| - ::google::protobuf::OneofDescriptorProto* DescriptorProto::add_oneof_decl() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.oneof_decl)
|
| - return oneof_decl_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >&
|
| -DescriptorProto::oneof_decl() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.oneof_decl)
|
| - return oneof_decl_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >*
|
| -DescriptorProto::mutable_oneof_decl() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.oneof_decl)
|
| - return &oneof_decl_;
|
| -}
|
| -
|
| -// optional .google.protobuf.MessageOptions options = 7;
|
| -bool DescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000080u) != 0;
|
| -}
|
| -void DescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000080u;
|
| -}
|
| -void DescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000080u;
|
| -}
|
| -void DescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::MessageOptions& DescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::MessageOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::MessageOptions* DescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::MessageOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void DescriptorProto::set_allocated_options(::google::protobuf::MessageOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.options)
|
| -}
|
| -
|
| -// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
|
| -int DescriptorProto::reserved_range_size() const {
|
| - return reserved_range_.size();
|
| -}
|
| -void DescriptorProto::clear_reserved_range() {
|
| - reserved_range_.Clear();
|
| -}
|
| - const ::google::protobuf::DescriptorProto_ReservedRange& DescriptorProto::reserved_range(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_range)
|
| - return reserved_range_.Get(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::mutable_reserved_range(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_range)
|
| - return reserved_range_.Mutable(index);
|
| -}
|
| - ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::add_reserved_range() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_range)
|
| - return reserved_range_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >&
|
| -DescriptorProto::reserved_range() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_range)
|
| - return reserved_range_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >*
|
| -DescriptorProto::mutable_reserved_range() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_range)
|
| - return &reserved_range_;
|
| -}
|
| -
|
| -// repeated string reserved_name = 10;
|
| -int DescriptorProto::reserved_name_size() const {
|
| - return reserved_name_.size();
|
| -}
|
| -void DescriptorProto::clear_reserved_name() {
|
| - reserved_name_.Clear();
|
| -}
|
| - 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) {
|
| - // @@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) {
|
| - // @@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) {
|
| - 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) {
|
| - 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() {
|
| - return reserved_name_.Add();
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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>&
|
| -DescriptorProto::reserved_name() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name)
|
| - return reserved_name_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::std::string>*
|
| -DescriptorProto::mutable_reserved_name() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name)
|
| - return &reserved_name_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -4110,14 +2446,12 @@ const int FieldDescriptorProto::kTypeFieldNumber;
|
| const int FieldDescriptorProto::kTypeNameFieldNumber;
|
| const int FieldDescriptorProto::kExtendeeFieldNumber;
|
| const int FieldDescriptorProto::kDefaultValueFieldNumber;
|
| -const int FieldDescriptorProto::kOneofIndexFieldNumber;
|
| const int FieldDescriptorProto::kOptionsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| FieldDescriptorProto::FieldDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.FieldDescriptorProto)
|
| }
|
|
|
| void FieldDescriptorProto::InitAsDefaultInstance() {
|
| @@ -4125,38 +2459,41 @@ void FieldDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| 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;
|
| + type_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + extendee_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + default_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| FieldDescriptorProto::~FieldDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.FieldDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void FieldDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - type_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - extendee_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - default_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| + if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete type_name_;
|
| + }
|
| + if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete extendee_;
|
| + }
|
| + if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete default_value_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -4179,63 +2516,60 @@ const FieldDescriptorProto& FieldDescriptorProto::default_instance() {
|
|
|
| FieldDescriptorProto* FieldDescriptorProto::default_instance_ = NULL;
|
|
|
| -FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - FieldDescriptorProto* n = new FieldDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +FieldDescriptorProto* FieldDescriptorProto::New() const {
|
| + return new FieldDescriptorProto;
|
| }
|
|
|
| void FieldDescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 255u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| number_ = 0;
|
| label_ = 1;
|
| type_ = 1;
|
| if (has_type_name()) {
|
| - type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (type_name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + type_name_->clear();
|
| + }
|
| }
|
| if (has_extendee()) {
|
| - extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (extendee_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + extendee_->clear();
|
| + }
|
| }
|
| if (has_default_value()) {
|
| - default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (default_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + default_value_->clear();
|
| + }
|
| + }
|
| + if (has_options()) {
|
| + if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();
|
| }
|
| - oneof_index_ = 0;
|
| - }
|
| - if (has_options()) {
|
| - if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();
|
| }
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool FieldDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.FieldDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FieldDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_extendee;
|
| break;
|
| @@ -4243,16 +2577,16 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string extendee = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_extendee:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_extendee()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->extendee().data(), this->extendee().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FieldDescriptorProto.extendee");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(24)) goto parse_number;
|
| break;
|
| @@ -4260,14 +2594,15 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional int32 number = 3;
|
| case 3: {
|
| - if (tag == 24) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(32)) goto parse_label;
|
| break;
|
| @@ -4275,7 +2610,8 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| case 4: {
|
| - if (tag == 32) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_label:
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| @@ -4287,7 +2623,7 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
| mutable_unknown_fields()->AddVarint(4, value);
|
| }
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(40)) goto parse_type;
|
| break;
|
| @@ -4295,7 +2631,8 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| case 5: {
|
| - if (tag == 40) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_type:
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| @@ -4307,7 +2644,7 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
| mutable_unknown_fields()->AddVarint(5, value);
|
| }
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(50)) goto parse_type_name;
|
| break;
|
| @@ -4315,16 +2652,16 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string type_name = 6;
|
| case 6: {
|
| - if (tag == 50) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_type_name:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_type_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->type_name().data(), this->type_name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FieldDescriptorProto.type_name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(58)) goto parse_default_value;
|
| break;
|
| @@ -4332,16 +2669,16 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string default_value = 7;
|
| case 7: {
|
| - if (tag == 58) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_default_value:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_default_value()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->default_value().data(), this->default_value().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FieldDescriptorProto.default_value");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(66)) goto parse_options;
|
| break;
|
| @@ -4349,38 +2686,23 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| case 8: {
|
| - if (tag == 66) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_options()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(72)) goto parse_oneof_index;
|
| - break;
|
| - }
|
| -
|
| - // optional int32 oneof_index = 9;
|
| - case 9: {
|
| - 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->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -4388,35 +2710,27 @@ bool FieldDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.FieldDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.FieldDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void FieldDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.FieldDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // optional string extendee = 2;
|
| if (has_extendee()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->extendee().data(), this->extendee().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.extendee");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 2, this->extendee(), output);
|
| }
|
|
|
| @@ -4439,51 +2753,41 @@ void FieldDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // optional string type_name = 6;
|
| if (has_type_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->type_name().data(), this->type_name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.type_name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 6, this->type_name(), output);
|
| }
|
|
|
| // optional string default_value = 7;
|
| if (has_default_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->default_value().data(), this->default_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.default_value");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 7, this->default_value(), output);
|
| }
|
|
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 8, *this->options_, output);
|
| + 8, this->options(), output);
|
| }
|
|
|
| - // optional int32 oneof_index = 9;
|
| - if (has_oneof_index()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteInt32(9, this->oneof_index(), output);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.FieldDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| @@ -4491,787 +2795,125 @@ void FieldDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // optional string extendee = 2;
|
| if (has_extendee()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->extendee().data(), this->extendee().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.extendee");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 2, this->extendee(), target);
|
| }
|
|
|
| // optional int32 number = 3;
|
| - if (has_number()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->number(), target);
|
| - }
|
| -
|
| - // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| - if (has_label()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| - 4, this->label(), target);
|
| - }
|
| -
|
| - // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| - if (has_type()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| - 5, this->type(), target);
|
| - }
|
| -
|
| - // optional string type_name = 6;
|
| - if (has_type_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->type_name().data(), this->type_name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.type_name");
|
| - target =
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 6, this->type_name(), target);
|
| - }
|
| -
|
| - // optional string default_value = 7;
|
| - if (has_default_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->default_value().data(), this->default_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FieldDescriptorProto.default_value");
|
| - target =
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 7, this->default_value(), target);
|
| - }
|
| -
|
| - // optional .google.protobuf.FieldOptions options = 8;
|
| - if (has_options()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteMessageNoVirtualToArray(
|
| - 8, *this->options_, target);
|
| - }
|
| -
|
| - // optional int32 oneof_index = 9;
|
| - if (has_oneof_index()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(9, this->oneof_index(), target);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| - unknown_fields(), target);
|
| - }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldDescriptorProto)
|
| - return target;
|
| -}
|
| -
|
| -int FieldDescriptorProto::ByteSize() const {
|
| - int total_size = 0;
|
| -
|
| - if (_has_bits_[0 / 32] & 255u) {
|
| - // optional string name = 1;
|
| - if (has_name()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - 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 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - this->type_name());
|
| - }
|
| -
|
| - // optional string extendee = 2;
|
| - if (has_extendee()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - this->extendee());
|
| - }
|
| -
|
| - // optional string default_value = 7;
|
| - if (has_default_value()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - this->default_value());
|
| - }
|
| -
|
| - // optional int32 oneof_index = 9;
|
| - if (has_oneof_index()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::Int32Size(
|
| - this->oneof_index());
|
| - }
|
| -
|
| - }
|
| - // optional .google.protobuf.FieldOptions options = 8;
|
| - if (has_options()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - total_size +=
|
| - ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| - unknown_fields());
|
| - }
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = total_size;
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| - return total_size;
|
| -}
|
| -
|
| -void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const FieldDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const FieldDescriptorProto>(
|
| - &from);
|
| - if (source == NULL) {
|
| - ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| - } else {
|
| - MergeFrom(*source);
|
| - }
|
| -}
|
| -
|
| -void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) {
|
| - 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_);
|
| - }
|
| - if (from.has_extendee()) {
|
| - set_has_extendee();
|
| - extendee_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.extendee_);
|
| - }
|
| - if (from.has_default_value()) {
|
| - 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_options()) {
|
| - mutable_options()->::google::protobuf::FieldOptions::MergeFrom(from.options());
|
| - }
|
| - }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| -}
|
| -
|
| -void FieldDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -bool FieldDescriptorProto::IsInitialized() const {
|
| -
|
| - if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| -void FieldDescriptorProto::Swap(FieldDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(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_);
|
| - 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_);
|
| -}
|
| -
|
| -::google::protobuf::Metadata FieldDescriptorProto::GetMetadata() const {
|
| - protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = FieldDescriptorProto_descriptor_;
|
| - metadata.reflection = FieldDescriptorProto_reflection_;
|
| - return metadata;
|
| -}
|
| -
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// FieldDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool FieldDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void FieldDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& FieldDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* FieldDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FieldDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.name)
|
| -}
|
| -
|
| -// optional int32 number = 3;
|
| -bool FieldDescriptorProto::has_number() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_number() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_number() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -void FieldDescriptorProto::clear_number() {
|
| - number_ = 0;
|
| - clear_has_number();
|
| -}
|
| - ::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) {
|
| - set_has_number();
|
| - number_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)
|
| -}
|
| -
|
| -// optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| -bool FieldDescriptorProto::has_label() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_label() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_label() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void FieldDescriptorProto::clear_label() {
|
| - label_ = 1;
|
| - clear_has_label();
|
| -}
|
| - ::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) {
|
| - assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));
|
| - set_has_label();
|
| - label_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.label)
|
| -}
|
| -
|
| -// optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| -bool FieldDescriptorProto::has_type() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_type() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_type() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| -}
|
| -void FieldDescriptorProto::clear_type() {
|
| - type_ = 1;
|
| - clear_has_type();
|
| -}
|
| - ::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) {
|
| - assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));
|
| - set_has_type();
|
| - type_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type)
|
| -}
|
| -
|
| -// optional string type_name = 6;
|
| -bool FieldDescriptorProto::has_type_name() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_type_name() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_type_name() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name)
|
| - return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_type_name();
|
| - return type_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) {
|
| - if (type_name != NULL) {
|
| - set_has_type_name();
|
| - } else {
|
| - clear_has_type_name();
|
| - }
|
| - type_name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.type_name)
|
| -}
|
| -
|
| -// optional string extendee = 2;
|
| -bool FieldDescriptorProto::has_extendee() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_extendee() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_extendee() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| -}
|
| -void FieldDescriptorProto::clear_extendee() {
|
| - extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_extendee();
|
| -}
|
| - const ::std::string& FieldDescriptorProto::extendee() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee)
|
| - return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_extendee();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee)
|
| - return extendee_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* FieldDescriptorProto::release_extendee() {
|
| - clear_has_extendee();
|
| - return extendee_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) {
|
| - if (extendee != NULL) {
|
| - set_has_extendee();
|
| - } else {
|
| - clear_has_extendee();
|
| - }
|
| - extendee_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), extendee);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.extendee)
|
| -}
|
| -
|
| -// optional string default_value = 7;
|
| -bool FieldDescriptorProto::has_default_value() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_default_value() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_default_value() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value)
|
| - return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_default_value();
|
| - return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) {
|
| - if (default_value != NULL) {
|
| - set_has_default_value();
|
| - } else {
|
| - clear_has_default_value();
|
| - }
|
| - default_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.default_value)
|
| -}
|
| -
|
| -// optional int32 oneof_index = 9;
|
| -bool FieldDescriptorProto::has_oneof_index() const {
|
| - return (_has_bits_[0] & 0x00000080u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_oneof_index() {
|
| - _has_bits_[0] |= 0x00000080u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_oneof_index() {
|
| - _has_bits_[0] &= ~0x00000080u;
|
| -}
|
| -void FieldDescriptorProto::clear_oneof_index() {
|
| - oneof_index_ = 0;
|
| - clear_has_oneof_index();
|
| -}
|
| - ::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) {
|
| - set_has_oneof_index();
|
| - oneof_index_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)
|
| -}
|
| -
|
| -// optional .google.protobuf.FieldOptions options = 8;
|
| -bool FieldDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000100u) != 0;
|
| -}
|
| -void FieldDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000100u;
|
| -}
|
| -void FieldDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000100u;
|
| -}
|
| -void FieldDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::FieldOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::FieldOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.options)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -
|
| -// ===================================================================
|
| -
|
| -#ifndef _MSC_VER
|
| -const int OneofDescriptorProto::kNameFieldNumber;
|
| -#endif // !_MSC_VER
|
| -
|
| -OneofDescriptorProto::OneofDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.OneofDescriptorProto)
|
| -}
|
| -
|
| -void OneofDescriptorProto::InitAsDefaultInstance() {
|
| -}
|
| -
|
| -OneofDescriptorProto::OneofDescriptorProto(const OneofDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _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());
|
| - ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| -}
|
| -
|
| -OneofDescriptorProto::~OneofDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.OneofDescriptorProto)
|
| - SharedDtor();
|
| -}
|
| -
|
| -void OneofDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (this != default_instance_) {
|
| - }
|
| -}
|
| -
|
| -void OneofDescriptorProto::SetCachedSize(int size) const {
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = size;
|
| - GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| -}
|
| -const ::google::protobuf::Descriptor* OneofDescriptorProto::descriptor() {
|
| - protobuf_AssignDescriptorsOnce();
|
| - return OneofDescriptorProto_descriptor_;
|
| -}
|
| -
|
| -const OneofDescriptorProto& OneofDescriptorProto::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) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| -}
|
| -
|
| -void OneofDescriptorProto::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();
|
| - }
|
| -}
|
| -
|
| -bool OneofDescriptorProto::MergePartialFromCodedStream(
|
| - ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| - ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.OneofDescriptorProto)
|
| - 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)) {
|
| - // optional string name = 1;
|
| - case 1: {
|
| - if (tag == 10) {
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.OneofDescriptorProto.name");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - 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::WireFormatLite::SkipField(
|
| - input, tag, mutable_unknown_fields()));
|
| - break;
|
| - }
|
| - }
|
| + if (has_number()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->number(), target);
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.OneofDescriptorProto)
|
| - return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.OneofDescriptorProto)
|
| - return false;
|
| -#undef DO_
|
| -}
|
|
|
| -void OneofDescriptorProto::SerializeWithCachedSizes(
|
| - ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.OneofDescriptorProto)
|
| - // optional string name = 1;
|
| - if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.OneofDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| - 1, this->name(), output);
|
| + // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| + if (has_label()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| + 4, this->label(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| - unknown_fields(), output);
|
| + // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| + if (has_type()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| + 5, this->type(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.OneofDescriptorProto)
|
| -}
|
|
|
| -::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.OneofDescriptorProto.name");
|
| + // optional string type_name = 6;
|
| + if (has_type_name()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->type_name().data(), this->type_name().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 1, this->name(), target);
|
| + 6, this->type_name(), target);
|
| + }
|
| +
|
| + // optional string default_value = 7;
|
| + if (has_default_value()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->default_value().data(), this->default_value().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + target =
|
| + ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| + 7, this->default_value(), target);
|
| + }
|
| +
|
| + // optional .google.protobuf.FieldOptions options = 8;
|
| + if (has_options()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::
|
| + WriteMessageNoVirtualToArray(
|
| + 8, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofDescriptorProto)
|
| return target;
|
| }
|
|
|
| -int OneofDescriptorProto::ByteSize() const {
|
| +int FieldDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - // optional string name = 1;
|
| - if (has_name()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - this->name());
|
| - }
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + // optional string name = 1;
|
| + if (has_name()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + 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 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->type_name());
|
| + }
|
| +
|
| + // optional string extendee = 2;
|
| + if (has_extendee()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->extendee());
|
| + }
|
| +
|
| + // optional string default_value = 7;
|
| + if (has_default_value()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->default_value());
|
| + }
|
| +
|
| + // optional .google.protobuf.FieldOptions options = 8;
|
| + if (has_options()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| + this->options());
|
| + }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + }
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -5282,11 +2924,11 @@ int OneofDescriptorProto::ByteSize() const {
|
| return total_size;
|
| }
|
|
|
| -void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const OneofDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const OneofDescriptorProto>(
|
| - &from);
|
| +void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const FieldDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const FieldDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -5294,112 +2936,81 @@ void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
| }
|
|
|
| -void OneofDescriptorProto::MergeFrom(const OneofDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| +void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) {
|
| + GOOGLE_CHECK_NE(&from, this);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(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_type_name(from.type_name());
|
| + }
|
| + if (from.has_extendee()) {
|
| + set_extendee(from.extendee());
|
| + }
|
| + if (from.has_default_value()) {
|
| + set_default_value(from.default_value());
|
| + }
|
| + if (from.has_options()) {
|
| + mutable_options()->::google::protobuf::FieldOptions::MergeFrom(from.options());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| -void OneofDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| +void FieldDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| if (&from == this) return;
|
| Clear();
|
| MergeFrom(from);
|
| }
|
|
|
| -void OneofDescriptorProto::CopyFrom(const OneofDescriptorProto& from) {
|
| +void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) {
|
| if (&from == this) return;
|
| Clear();
|
| MergeFrom(from);
|
| }
|
|
|
| -bool OneofDescriptorProto::IsInitialized() const {
|
| +bool FieldDescriptorProto::IsInitialized() const {
|
|
|
| + if (has_options()) {
|
| + if (!this->options().IsInitialized()) return false;
|
| + }
|
| return true;
|
| }
|
|
|
| -void OneofDescriptorProto::Swap(OneofDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) {
|
| - name_.Swap(&other->name_);
|
| - std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| +void FieldDescriptorProto::Swap(FieldDescriptorProto* other) {
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + std::swap(number_, other->number_);
|
| + std::swap(label_, other->label_);
|
| + std::swap(type_, other->type_);
|
| + std::swap(type_name_, other->type_name_);
|
| + std::swap(extendee_, other->extendee_);
|
| + std::swap(default_value_, other->default_value_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| -::google::protobuf::Metadata OneofDescriptorProto::GetMetadata() const {
|
| +::google::protobuf::Metadata FieldDescriptorProto::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = OneofDescriptorProto_descriptor_;
|
| - metadata.reflection = OneofDescriptorProto_reflection_;
|
| + metadata.descriptor = FieldDescriptorProto_descriptor_;
|
| + metadata.reflection = FieldDescriptorProto_reflection_;
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// OneofDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool OneofDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void OneofDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void OneofDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void OneofDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& OneofDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* OneofDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void OneofDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -5410,9 +3021,8 @@ const int EnumDescriptorProto::kOptionsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| EnumDescriptorProto::EnumDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.EnumDescriptorProto)
|
| }
|
|
|
| void EnumDescriptorProto::InitAsDefaultInstance() {
|
| @@ -5420,28 +3030,26 @@ void EnumDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| EnumDescriptorProto::~EnumDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.EnumDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void EnumDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -5464,18 +3072,16 @@ const EnumDescriptorProto& EnumDescriptorProto::default_instance() {
|
|
|
| EnumDescriptorProto* EnumDescriptorProto::default_instance_ = NULL;
|
|
|
| -EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - EnumDescriptorProto* n = new EnumDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +EnumDescriptorProto* EnumDescriptorProto::New() const {
|
| + return new EnumDescriptorProto;
|
| }
|
|
|
| void EnumDescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 5u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear();
|
| @@ -5483,32 +3089,26 @@ void EnumDescriptorProto::Clear() {
|
| }
|
| value_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool EnumDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.EnumDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.EnumDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_value;
|
| break;
|
| @@ -5516,40 +3116,38 @@ bool EnumDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_value:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_value:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_value()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_loop_value;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(18)) goto parse_value;
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| }
|
|
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_options()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -5557,30 +3155,23 @@ bool EnumDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.EnumDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void EnumDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.EnumDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| - for (unsigned int i = 0, n = this->value_size(); i < n; i++) {
|
| + for (int i = 0; i < this->value_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->value(i), output);
|
| }
|
| @@ -5588,32 +3179,29 @@ void EnumDescriptorProto::SerializeWithCachedSizes(
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 3, *this->options_, output);
|
| + 3, this->options(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.EnumDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
|
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| - for (unsigned int i = 0, n = this->value_size(); i < n; i++) {
|
| + for (int i = 0; i < this->value_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 2, this->value(i), target);
|
| @@ -5623,21 +3211,20 @@ void EnumDescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 3, *this->options_, target);
|
| + 3, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumDescriptorProto)
|
| return target;
|
| }
|
|
|
| int EnumDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 5u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -5649,7 +3236,7 @@ int EnumDescriptorProto::ByteSize() const {
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| + this->options());
|
| }
|
|
|
| }
|
| @@ -5661,7 +3248,7 @@ int EnumDescriptorProto::ByteSize() const {
|
| this->value(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -5673,10 +3260,10 @@ int EnumDescriptorProto::ByteSize() const {
|
| }
|
|
|
| void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const EnumDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const EnumDescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const EnumDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const EnumDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -5685,20 +3272,17 @@ void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| value_.MergeFrom(from.value_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_options()) {
|
| mutable_options()->::google::protobuf::EnumOptions::MergeFrom(from.options());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void EnumDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -5715,24 +3299,24 @@ void EnumDescriptorProto::CopyFrom(const EnumDescriptorProto& from) {
|
|
|
| bool EnumDescriptorProto::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->value())) return false;
|
| + for (int i = 0; i < value_size(); i++) {
|
| + if (!this->value(i).IsInitialized()) return false;
|
| + }
|
| if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| return true;
|
| }
|
|
|
| void EnumDescriptorProto::Swap(EnumDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) {
|
| - 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_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + value_.Swap(&other->value_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata EnumDescriptorProto::GetMetadata() const {
|
| @@ -5743,136 +3327,6 @@ void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// EnumDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool EnumDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void EnumDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void EnumDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void EnumDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& EnumDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* EnumDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void EnumDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.name)
|
| -}
|
| -
|
| -// repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| -int EnumDescriptorProto::value_size() const {
|
| - return value_.size();
|
| -}
|
| -void EnumDescriptorProto::clear_value() {
|
| - value_.Clear();
|
| -}
|
| - const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::value(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.value)
|
| - return value_.Get(index);
|
| -}
|
| - ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::mutable_value(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.value)
|
| - return value_.Mutable(index);
|
| -}
|
| - ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::add_value() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.value)
|
| - return value_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >&
|
| -EnumDescriptorProto::value() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.value)
|
| - return value_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >*
|
| -EnumDescriptorProto::mutable_value() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.value)
|
| - return &value_;
|
| -}
|
| -
|
| -// optional .google.protobuf.EnumOptions options = 3;
|
| -bool EnumDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void EnumDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void EnumDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void EnumDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::EnumOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::EnumOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.options)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -5883,9 +3337,8 @@ const int EnumValueDescriptorProto::kOptionsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| EnumValueDescriptorProto::EnumValueDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.EnumValueDescriptorProto)
|
| }
|
|
|
| void EnumValueDescriptorProto::InitAsDefaultInstance() {
|
| @@ -5893,29 +3346,27 @@ void EnumValueDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| number_ = 0;
|
| options_ = NULL;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| EnumValueDescriptorProto::~EnumValueDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.EnumValueDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void EnumValueDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -5938,18 +3389,16 @@ const EnumValueDescriptorProto& EnumValueDescriptorProto::default_instance() {
|
|
|
| EnumValueDescriptorProto* EnumValueDescriptorProto::default_instance_ = NULL;
|
|
|
| -EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - EnumValueDescriptorProto* n = new EnumValueDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +EnumValueDescriptorProto* EnumValueDescriptorProto::New() const {
|
| + return new EnumValueDescriptorProto;
|
| }
|
|
|
| void EnumValueDescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 7u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| number_ = 0;
|
| if (has_options()) {
|
| @@ -5957,32 +3406,26 @@ void EnumValueDescriptorProto::Clear() {
|
| }
|
| }
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool EnumValueDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.EnumValueDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(16)) goto parse_number;
|
| break;
|
| @@ -5990,14 +3433,15 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional int32 number = 2;
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| @@ -6005,23 +3449,23 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_options()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -6029,25 +3473,18 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void EnumValueDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.EnumValueDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| @@ -6059,25 +3496,22 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes(
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 3, *this->options_, output);
|
| + 3, this->options(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.EnumValueDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| @@ -6092,21 +3526,20 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 3, *this->options_, target);
|
| + 3, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueDescriptorProto)
|
| return target;
|
| }
|
|
|
| int EnumValueDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 7u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -6125,11 +3558,11 @@ int EnumValueDescriptorProto::ByteSize() const {
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| + this->options());
|
| }
|
|
|
| }
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -6141,10 +3574,10 @@ int EnumValueDescriptorProto::ByteSize() const {
|
| }
|
|
|
| void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const EnumValueDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const EnumValueDescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const EnumValueDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const EnumValueDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -6153,11 +3586,10 @@ void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from
|
| }
|
|
|
| void EnumValueDescriptorProto::MergeFrom(const EnumValueDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_number()) {
|
| set_number(from.number());
|
| @@ -6166,9 +3598,7 @@ void EnumValueDescriptorProto::MergeFrom(const EnumValueDescriptorProto& from) {
|
| mutable_options()->::google::protobuf::EnumValueOptions::MergeFrom(from.options());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void EnumValueDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -6176,166 +3606,40 @@ void EnumValueDescriptorProto::CopyFrom(const ::google::protobuf::Message& from)
|
| Clear();
|
| MergeFrom(from);
|
| }
|
| -
|
| -void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -bool EnumValueDescriptorProto::IsInitialized() const {
|
| -
|
| - if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| -void EnumValueDescriptorProto::Swap(EnumValueDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) {
|
| - name_.Swap(&other->name_);
|
| - 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_);
|
| -}
|
| -
|
| -::google::protobuf::Metadata EnumValueDescriptorProto::GetMetadata() const {
|
| - protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = EnumValueDescriptorProto_descriptor_;
|
| - metadata.reflection = EnumValueDescriptorProto_reflection_;
|
| - return metadata;
|
| -}
|
| -
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// EnumValueDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool EnumValueDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void EnumValueDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& EnumValueDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* EnumValueDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void EnumValueDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.name)
|
| -}
|
| -
|
| -// optional int32 number = 2;
|
| -bool EnumValueDescriptorProto::has_number() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void EnumValueDescriptorProto::set_has_number() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_has_number() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_number() {
|
| - number_ = 0;
|
| - clear_has_number();
|
| -}
|
| - ::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) {
|
| - set_has_number();
|
| - number_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)
|
| -}
|
| -
|
| -// optional .google.protobuf.EnumValueOptions options = 3;
|
| -bool EnumValueDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void EnumValueDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void EnumValueDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| +
|
| +void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) {
|
| + if (&from == this) return;
|
| + Clear();
|
| + MergeFrom(from);
|
| }
|
| - ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::EnumValueOptions;
|
| +
|
| +bool EnumValueDescriptorProto::IsInitialized() const {
|
| +
|
| + if (has_options()) {
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::EnumValueOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| + return true;
|
| }
|
| - void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::EnumValueOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| +
|
| +void EnumValueDescriptorProto::Swap(EnumValueDescriptorProto* other) {
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + std::swap(number_, other->number_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.options)
|
| }
|
|
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
| +::google::protobuf::Metadata EnumValueDescriptorProto::GetMetadata() const {
|
| + protobuf_AssignDescriptorsOnce();
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = EnumValueDescriptorProto_descriptor_;
|
| + metadata.reflection = EnumValueDescriptorProto_reflection_;
|
| + return metadata;
|
| +}
|
| +
|
|
|
| // ===================================================================
|
|
|
| @@ -6346,9 +3650,8 @@ const int ServiceDescriptorProto::kOptionsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| ServiceDescriptorProto::ServiceDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.ServiceDescriptorProto)
|
| }
|
|
|
| void ServiceDescriptorProto::InitAsDefaultInstance() {
|
| @@ -6356,28 +3659,26 @@ void ServiceDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| ServiceDescriptorProto::~ServiceDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.ServiceDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void ServiceDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -6400,18 +3701,16 @@ const ServiceDescriptorProto& ServiceDescriptorProto::default_instance() {
|
|
|
| ServiceDescriptorProto* ServiceDescriptorProto::default_instance_ = NULL;
|
|
|
| -ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - ServiceDescriptorProto* n = new ServiceDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +ServiceDescriptorProto* ServiceDescriptorProto::New() const {
|
| + return new ServiceDescriptorProto;
|
| }
|
|
|
| void ServiceDescriptorProto::Clear() {
|
| - if (_has_bits_[0 / 32] & 5u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear();
|
| @@ -6419,32 +3718,26 @@ void ServiceDescriptorProto::Clear() {
|
| }
|
| method_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool ServiceDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.ServiceDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.ServiceDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_method;
|
| break;
|
| @@ -6452,40 +3745,38 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_method:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_method:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_method()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_loop_method;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(18)) goto parse_method;
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| }
|
|
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_options:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, mutable_options()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -6493,30 +3784,23 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.ServiceDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void ServiceDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.ServiceDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| - for (unsigned int i = 0, n = this->method_size(); i < n; i++) {
|
| + for (int i = 0; i < this->method_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->method(i), output);
|
| }
|
| @@ -6524,32 +3808,29 @@ void ServiceDescriptorProto::SerializeWithCachedSizes(
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 3, *this->options_, output);
|
| + 3, this->options(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.ServiceDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
|
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| - for (unsigned int i = 0, n = this->method_size(); i < n; i++) {
|
| + for (int i = 0; i < this->method_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 2, this->method(i), target);
|
| @@ -6559,21 +3840,20 @@ void ServiceDescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 3, *this->options_, target);
|
| + 3, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceDescriptorProto)
|
| return target;
|
| }
|
|
|
| int ServiceDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 5u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -6585,7 +3865,7 @@ int ServiceDescriptorProto::ByteSize() const {
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| + this->options());
|
| }
|
|
|
| }
|
| @@ -6597,7 +3877,7 @@ int ServiceDescriptorProto::ByteSize() const {
|
| this->method(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -6609,10 +3889,10 @@ int ServiceDescriptorProto::ByteSize() const {
|
| }
|
|
|
| void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const ServiceDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const ServiceDescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const ServiceDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const ServiceDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -6621,20 +3901,17 @@ void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from)
|
| }
|
|
|
| void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| method_.MergeFrom(from.method_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_options()) {
|
| mutable_options()->::google::protobuf::ServiceOptions::MergeFrom(from.options());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void ServiceDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -6651,24 +3928,24 @@ void ServiceDescriptorProto::CopyFrom(const ServiceDescriptorProto& from) {
|
|
|
| bool ServiceDescriptorProto::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->method())) return false;
|
| + for (int i = 0; i < method_size(); i++) {
|
| + if (!this->method(i).IsInitialized()) return false;
|
| + }
|
| if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| return true;
|
| }
|
|
|
| void ServiceDescriptorProto::Swap(ServiceDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) {
|
| - 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_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + method_.Swap(&other->method_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata ServiceDescriptorProto::GetMetadata() const {
|
| @@ -6679,136 +3956,6 @@ void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// ServiceDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool ServiceDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void ServiceDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void ServiceDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void ServiceDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& ServiceDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* ServiceDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void ServiceDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.name)
|
| -}
|
| -
|
| -// repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| -int ServiceDescriptorProto::method_size() const {
|
| - return method_.size();
|
| -}
|
| -void ServiceDescriptorProto::clear_method() {
|
| - method_.Clear();
|
| -}
|
| - const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::method(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.method)
|
| - return method_.Get(index);
|
| -}
|
| - ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::mutable_method(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.method)
|
| - return method_.Mutable(index);
|
| -}
|
| - ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::add_method() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.ServiceDescriptorProto.method)
|
| - return method_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >&
|
| -ServiceDescriptorProto::method() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.ServiceDescriptorProto.method)
|
| - return method_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >*
|
| -ServiceDescriptorProto::mutable_method() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceDescriptorProto.method)
|
| - return &method_;
|
| -}
|
| -
|
| -// optional .google.protobuf.ServiceOptions options = 3;
|
| -bool ServiceDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void ServiceDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void ServiceDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void ServiceDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::ServiceOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::ServiceOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void ServiceDescriptorProto::set_allocated_options(::google::protobuf::ServiceOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.options)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -6817,14 +3964,11 @@ const int MethodDescriptorProto::kNameFieldNumber;
|
| const int MethodDescriptorProto::kInputTypeFieldNumber;
|
| const int MethodDescriptorProto::kOutputTypeFieldNumber;
|
| const int MethodDescriptorProto::kOptionsFieldNumber;
|
| -const int MethodDescriptorProto::kClientStreamingFieldNumber;
|
| -const int MethodDescriptorProto::kServerStreamingFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| MethodDescriptorProto::MethodDescriptorProto()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.MethodDescriptorProto)
|
| }
|
|
|
| void MethodDescriptorProto::InitAsDefaultInstance() {
|
| @@ -6832,34 +3976,34 @@ void MethodDescriptorProto::InitAsDefaultInstance() {
|
| }
|
|
|
| MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + input_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + output_type_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| options_ = NULL;
|
| - client_streaming_ = false;
|
| - server_streaming_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| MethodDescriptorProto::~MethodDescriptorProto() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.MethodDescriptorProto)
|
| SharedDtor();
|
| }
|
|
|
| void MethodDescriptorProto::SharedDtor() {
|
| - name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - input_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - output_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_;
|
| + }
|
| + if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete input_type_;
|
| + }
|
| + if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete output_type_;
|
| + }
|
| if (this != default_instance_) {
|
| delete options_;
|
| }
|
| @@ -6882,69 +4026,52 @@ const MethodDescriptorProto& MethodDescriptorProto::default_instance() {
|
|
|
| MethodDescriptorProto* MethodDescriptorProto::default_instance_ = NULL;
|
|
|
| -MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* arena) const {
|
| - MethodDescriptorProto* n = new MethodDescriptorProto;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +MethodDescriptorProto* MethodDescriptorProto::New() const {
|
| + return new MethodDescriptorProto;
|
| }
|
|
|
| void MethodDescriptorProto::Clear() {
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<MethodDescriptorProto*>(16)->f)
|
| -
|
| -#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_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name()) {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_->clear();
|
| + }
|
| }
|
| if (has_input_type()) {
|
| - input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (input_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + input_type_->clear();
|
| + }
|
| }
|
| if (has_output_type()) {
|
| - output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (output_type_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + output_type_->clear();
|
| + }
|
| }
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::MethodOptions::Clear();
|
| }
|
| }
|
| -
|
| -#undef ZR_HELPER_
|
| -#undef ZR_
|
| -
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool MethodDescriptorProto::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.MethodDescriptorProto)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string name = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.MethodDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_input_type;
|
| break;
|
| @@ -6952,16 +4079,16 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string input_type = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_input_type:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_input_type()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->input_type().data(), this->input_type().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.MethodDescriptorProto.input_type");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(26)) goto parse_output_type;
|
| break;
|
| @@ -6969,16 +4096,16 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional string output_type = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_output_type:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_output_type()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->output_type().data(), this->output_type().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.MethodDescriptorProto.output_type");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(34)) goto parse_options;
|
| break;
|
| @@ -6986,53 +4113,23 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| 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 == 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 == 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;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -7040,80 +4137,58 @@ bool MethodDescriptorProto::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.MethodDescriptorProto)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.MethodDescriptorProto)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void MethodDescriptorProto::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.MethodDescriptorProto)
|
| // optional string name = 1;
|
| if (has_name()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.name");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
|
|
| // optional string input_type = 2;
|
| if (has_input_type()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->input_type().data(), this->input_type().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.input_type");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 2, this->input_type(), output);
|
| }
|
|
|
| // optional string output_type = 3;
|
| if (has_output_type()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->output_type().data(), this->output_type().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.output_type");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->output_type(), output);
|
| }
|
|
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| - 4, *this->options_, output);
|
| + 4, this->options(), output);
|
| }
|
|
|
| - // optional bool client_streaming = 5 [default = false];
|
| - if (has_client_streaming()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->client_streaming(), output);
|
| - }
|
| -
|
| - // optional bool server_streaming = 6 [default = false];
|
| - if (has_server_streaming()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->server_streaming(), output);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.MethodDescriptorProto)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name().data(), this->name().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.name");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| @@ -7121,10 +4196,9 @@ void MethodDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // optional string input_type = 2;
|
| if (has_input_type()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->input_type().data(), this->input_type().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.input_type");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 2, this->input_type(), target);
|
| @@ -7132,10 +4206,9 @@ void MethodDescriptorProto::SerializeWithCachedSizes(
|
|
|
| // optional string output_type = 3;
|
| if (has_output_type()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->output_type().data(), this->output_type().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.MethodDescriptorProto.output_type");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 3, this->output_type(), target);
|
| @@ -7145,31 +4218,20 @@ void MethodDescriptorProto::SerializeWithCachedSizes(
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| - 4, *this->options_, target);
|
| - }
|
| -
|
| - // optional bool client_streaming = 5 [default = false];
|
| - if (has_client_streaming()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->client_streaming(), target);
|
| - }
|
| -
|
| - // optional bool server_streaming = 6 [default = false];
|
| - if (has_server_streaming()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->server_streaming(), target);
|
| + 4, this->options(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodDescriptorProto)
|
| return target;
|
| }
|
|
|
| int MethodDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 63u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| total_size += 1 +
|
| @@ -7195,21 +4257,11 @@ int MethodDescriptorProto::ByteSize() const {
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| - *this->options_);
|
| - }
|
| -
|
| - // optional bool client_streaming = 5 [default = false];
|
| - if (has_client_streaming()) {
|
| - total_size += 1 + 1;
|
| - }
|
| -
|
| - // optional bool server_streaming = 6 [default = false];
|
| - if (has_server_streaming()) {
|
| - total_size += 1 + 1;
|
| + this->options());
|
| }
|
|
|
| }
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -7221,10 +4273,10 @@ int MethodDescriptorProto::ByteSize() const {
|
| }
|
|
|
| void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const MethodDescriptorProto* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const MethodDescriptorProto>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const MethodDescriptorProto* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const MethodDescriptorProto*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -7233,33 +4285,22 @@ void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_name()) {
|
| - set_has_name();
|
| - name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_);
|
| + set_name(from.name());
|
| }
|
| if (from.has_input_type()) {
|
| - set_has_input_type();
|
| - input_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.input_type_);
|
| + set_input_type(from.input_type());
|
| }
|
| if (from.has_output_type()) {
|
| - set_has_output_type();
|
| - output_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_type_);
|
| + set_output_type(from.output_type());
|
| }
|
| if (from.has_options()) {
|
| mutable_options()->::google::protobuf::MethodOptions::MergeFrom(from.options());
|
| }
|
| - if (from.has_client_streaming()) {
|
| - set_client_streaming(from.client_streaming());
|
| - }
|
| - if (from.has_server_streaming()) {
|
| - set_server_streaming(from.server_streaming());
|
| - }
|
| - }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void MethodDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -7277,25 +4318,21 @@ void MethodDescriptorProto::CopyFrom(const MethodDescriptorProto& from) {
|
| bool MethodDescriptorProto::IsInitialized() const {
|
|
|
| if (has_options()) {
|
| - if (!this->options_->IsInitialized()) return false;
|
| + if (!this->options().IsInitialized()) return false;
|
| }
|
| return true;
|
| }
|
|
|
| void MethodDescriptorProto::Swap(MethodDescriptorProto* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) {
|
| - name_.Swap(&other->name_);
|
| - input_type_.Swap(&other->input_type_);
|
| - output_type_.Swap(&other->output_type_);
|
| - std::swap(options_, other->options_);
|
| - std::swap(client_streaming_, other->client_streaming_);
|
| - std::swap(server_streaming_, other->server_streaming_);
|
| - std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| - _internal_metadata_.Swap(&other->_internal_metadata_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| + if (other != this) {
|
| + std::swap(name_, other->name_);
|
| + std::swap(input_type_, other->input_type_);
|
| + std::swap(output_type_, other->output_type_);
|
| + std::swap(options_, other->options_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata MethodDescriptorProto::GetMetadata() const {
|
| @@ -7306,260 +4343,6 @@ void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// MethodDescriptorProto
|
| -
|
| -// optional string name = 1;
|
| -bool MethodDescriptorProto::has_name() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_name() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_name() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void MethodDescriptorProto::clear_name() {
|
| - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_name();
|
| -}
|
| - const ::std::string& MethodDescriptorProto::name() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name)
|
| - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - set_has_name();
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name)
|
| - return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - ::std::string* MethodDescriptorProto::release_name() {
|
| - clear_has_name();
|
| - return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void MethodDescriptorProto::set_allocated_name(::std::string* name) {
|
| - if (name != NULL) {
|
| - set_has_name();
|
| - } else {
|
| - clear_has_name();
|
| - }
|
| - name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.name)
|
| -}
|
| -
|
| -// optional string input_type = 2;
|
| -bool MethodDescriptorProto::has_input_type() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_input_type() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_input_type() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -void MethodDescriptorProto::clear_input_type() {
|
| - input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_input_type();
|
| -}
|
| - const ::std::string& MethodDescriptorProto::input_type() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type)
|
| - return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_input_type();
|
| - return input_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) {
|
| - if (input_type != NULL) {
|
| - set_has_input_type();
|
| - } else {
|
| - clear_has_input_type();
|
| - }
|
| - input_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), input_type);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.input_type)
|
| -}
|
| -
|
| -// optional string output_type = 3;
|
| -bool MethodDescriptorProto::has_output_type() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_output_type() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_output_type() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void MethodDescriptorProto::clear_output_type() {
|
| - output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_output_type();
|
| -}
|
| - const ::std::string& MethodDescriptorProto::output_type() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type)
|
| - return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_output_type();
|
| - return output_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) {
|
| - if (output_type != NULL) {
|
| - set_has_output_type();
|
| - } else {
|
| - clear_has_output_type();
|
| - }
|
| - output_type_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), output_type);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.output_type)
|
| -}
|
| -
|
| -// optional .google.protobuf.MethodOptions options = 4;
|
| -bool MethodDescriptorProto::has_options() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_options() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_options() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| -}
|
| -void MethodDescriptorProto::clear_options() {
|
| - if (options_ != NULL) options_->::google::protobuf::MethodOptions::Clear();
|
| - clear_has_options();
|
| -}
|
| - const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)
|
| - return options_ != NULL ? *options_ : *default_instance_->options_;
|
| -}
|
| - ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() {
|
| - set_has_options();
|
| - if (options_ == NULL) {
|
| - options_ = new ::google::protobuf::MethodOptions;
|
| - }
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.options)
|
| - return options_;
|
| -}
|
| - ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options() {
|
| - clear_has_options();
|
| - ::google::protobuf::MethodOptions* temp = options_;
|
| - options_ = NULL;
|
| - return temp;
|
| -}
|
| - void MethodDescriptorProto::set_allocated_options(::google::protobuf::MethodOptions* options) {
|
| - delete options_;
|
| - options_ = options;
|
| - if (options) {
|
| - set_has_options();
|
| - } else {
|
| - clear_has_options();
|
| - }
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.options)
|
| -}
|
| -
|
| -// optional bool client_streaming = 5 [default = false];
|
| -bool MethodDescriptorProto::has_client_streaming() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_client_streaming() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_client_streaming() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| -}
|
| -void MethodDescriptorProto::clear_client_streaming() {
|
| - client_streaming_ = false;
|
| - clear_has_client_streaming();
|
| -}
|
| - 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) {
|
| - set_has_client_streaming();
|
| - client_streaming_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming)
|
| -}
|
| -
|
| -// optional bool server_streaming = 6 [default = false];
|
| -bool MethodDescriptorProto::has_server_streaming() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -void MethodDescriptorProto::set_has_server_streaming() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -void MethodDescriptorProto::clear_has_server_streaming() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| -}
|
| -void MethodDescriptorProto::clear_server_streaming() {
|
| - server_streaming_ = false;
|
| - clear_has_server_streaming();
|
| -}
|
| - 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) {
|
| - set_has_server_streaming();
|
| - server_streaming_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -7592,70 +4375,57 @@ const int FileOptions::kJavaOuterClassnameFieldNumber;
|
| const int FileOptions::kJavaMultipleFilesFieldNumber;
|
| const int FileOptions::kRetainUnknownFieldsFieldNumber;
|
| const int FileOptions::kJavaGenerateEqualsAndHashFieldNumber;
|
| -const int FileOptions::kJavaStringCheckUtf8FieldNumber;
|
| const int FileOptions::kOptimizeForFieldNumber;
|
| const int FileOptions::kGoPackageFieldNumber;
|
| const int FileOptions::kCcGenericServicesFieldNumber;
|
| const int FileOptions::kJavaGenericServicesFieldNumber;
|
| const int FileOptions::kPyGenericServicesFieldNumber;
|
| -const int FileOptions::kDeprecatedFieldNumber;
|
| -const int FileOptions::kCcEnableArenasFieldNumber;
|
| -const int FileOptions::kObjcClassPrefixFieldNumber;
|
| -const int FileOptions::kCsharpNamespaceFieldNumber;
|
| -const int FileOptions::kJavananoUseDeprecatedPackageFieldNumber;
|
| const int FileOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| FileOptions::FileOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.FileOptions)
|
| }
|
|
|
| void FileOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| FileOptions::FileOptions(const FileOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + java_outer_classname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| java_multiple_files_ = false;
|
| retain_unknown_fields_ = false;
|
| java_generate_equals_and_hash_ = false;
|
| - java_string_check_utf8_ = false;
|
| optimize_for_ = 1;
|
| - go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| 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());
|
| - javanano_use_deprecated_package_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| FileOptions::~FileOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.FileOptions)
|
| SharedDtor();
|
| }
|
|
|
| void FileOptions::SharedDtor() {
|
| - java_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - java_outer_classname_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - go_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - objc_class_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - csharp_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete java_package_;
|
| + }
|
| + if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete java_outer_classname_;
|
| + }
|
| + if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete go_package_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -7677,78 +4447,60 @@ const FileOptions& FileOptions::default_instance() {
|
|
|
| FileOptions* FileOptions::default_instance_ = NULL;
|
|
|
| -FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const {
|
| - FileOptions* n = new FileOptions;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +FileOptions* FileOptions::New() const {
|
| + return new FileOptions;
|
| }
|
|
|
| void FileOptions::Clear() {
|
| _extensions_.Clear();
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<FileOptions*>(16)->f)
|
| -
|
| -#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_, java_string_check_utf8_);
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_java_package()) {
|
| - java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (java_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + java_package_->clear();
|
| + }
|
| }
|
| if (has_java_outer_classname()) {
|
| - java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (java_outer_classname_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + java_outer_classname_->clear();
|
| + }
|
| }
|
| + java_multiple_files_ = false;
|
| + retain_unknown_fields_ = false;
|
| + java_generate_equals_and_hash_ = false;
|
| optimize_for_ = 1;
|
| if (has_go_package()) {
|
| - go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (go_package_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + go_package_->clear();
|
| + }
|
| }
|
| + cc_generic_services_ = false;
|
| }
|
| - if (_has_bits_[8 / 32] & 65280u) {
|
| - ZR_(cc_generic_services_, javanano_use_deprecated_package_);
|
| - if (has_objc_class_prefix()) {
|
| - objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - }
|
| - if (has_csharp_namespace()) {
|
| - csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - }
|
| + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| + java_generic_services_ = false;
|
| + py_generic_services_ = false;
|
| }
|
| -
|
| -#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();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool FileOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.FileOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional string java_package = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_java_package()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_package().data(), this->java_package().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileOptions.java_package");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(66)) goto parse_java_outer_classname;
|
| break;
|
| @@ -7756,16 +4508,16 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional string java_outer_classname = 8;
|
| case 8: {
|
| - if (tag == 66) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_java_outer_classname:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_java_outer_classname()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_outer_classname().data(), this->java_outer_classname().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileOptions.java_outer_classname");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(72)) goto parse_optimize_for;
|
| break;
|
| @@ -7773,7 +4525,8 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| case 9: {
|
| - if (tag == 72) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_optimize_for:
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| @@ -7785,7 +4538,7 @@ bool FileOptions::MergePartialFromCodedStream(
|
| mutable_unknown_fields()->AddVarint(9, value);
|
| }
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(80)) goto parse_java_multiple_files;
|
| break;
|
| @@ -7793,14 +4546,15 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool java_multiple_files = 10 [default = false];
|
| case 10: {
|
| - if (tag == 80) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(90)) goto parse_go_package;
|
| break;
|
| @@ -7808,16 +4562,16 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional string go_package = 11;
|
| case 11: {
|
| - if (tag == 90) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_go_package:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_go_package()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->go_package().data(), this->go_package().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileOptions.go_package");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(96)) goto parse_retain_unknown_fields;
|
| break;
|
| @@ -7825,14 +4579,15 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool retain_unknown_fields = 12 [default = false];
|
| case 12: {
|
| - if (tag == 96) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_retain_unknown_fields:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &retain_unknown_fields_)));
|
| set_has_retain_unknown_fields();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(128)) goto parse_cc_generic_services;
|
| break;
|
| @@ -7840,14 +4595,15 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool cc_generic_services = 16 [default = false];
|
| case 16: {
|
| - if (tag == 128) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(136)) goto parse_java_generic_services;
|
| break;
|
| @@ -7855,14 +4611,15 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool java_generic_services = 17 [default = false];
|
| case 17: {
|
| - if (tag == 136) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(144)) goto parse_py_generic_services;
|
| break;
|
| @@ -7870,123 +4627,31 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool py_generic_services = 18 [default = false];
|
| case 18: {
|
| - if (tag == 144) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(160)) goto parse_java_generate_equals_and_hash;
|
| break;
|
| }
|
|
|
| - // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| - case 20: {
|
| - 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 == 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 == 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 == 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 == 290) {
|
| - parse_objc_class_prefix:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->mutable_objc_class_prefix()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->objc_class_prefix().data(), this->objc_class_prefix().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileOptions.objc_class_prefix");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - if (input->ExpectTag(298)) goto parse_csharp_namespace;
|
| - break;
|
| - }
|
| -
|
| - // optional string csharp_namespace = 37;
|
| - case 37: {
|
| - if (tag == 298) {
|
| - parse_csharp_namespace:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->mutable_csharp_namespace()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->csharp_namespace().data(), this->csharp_namespace().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.FileOptions.csharp_namespace");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - if (input->ExpectTag(304)) goto parse_javanano_use_deprecated_package;
|
| - break;
|
| - }
|
| -
|
| - // optional bool javanano_use_deprecated_package = 38;
|
| - case 38: {
|
| - if (tag == 304) {
|
| - parse_javanano_use_deprecated_package:
|
| + // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| + case 20: {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| + parse_java_generate_equals_and_hash:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| - input, &javanano_use_deprecated_package_)));
|
| - set_has_javanano_use_deprecated_package();
|
| + input, &java_generate_equals_and_hash_)));
|
| + set_has_java_generate_equals_and_hash();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| @@ -7994,27 +4659,24 @@ bool FileOptions::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| - if (tag == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -8027,35 +4689,27 @@ bool FileOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.FileOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.FileOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void FileOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.FileOptions)
|
| // optional string java_package = 1;
|
| if (has_java_package()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_package().data(), this->java_package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.java_package");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->java_package(), output);
|
| }
|
|
|
| // optional string java_outer_classname = 8;
|
| if (has_java_outer_classname()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_outer_classname().data(), this->java_outer_classname().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.java_outer_classname");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 8, this->java_outer_classname(), output);
|
| }
|
|
|
| @@ -8072,11 +4726,10 @@ void FileOptions::SerializeWithCachedSizes(
|
|
|
| // optional string go_package = 11;
|
| if (has_go_package()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->go_package().data(), this->go_package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.go_package");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 11, this->go_package(), output);
|
| }
|
|
|
| @@ -8105,48 +4758,8 @@ void FileOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->java_generate_equals_and_hash(), output);
|
| }
|
|
|
| - // optional bool deprecated = 23 [default = false];
|
| - if (has_deprecated()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(23, this->deprecated(), output);
|
| - }
|
| -
|
| - // optional bool java_string_check_utf8 = 27 [default = false];
|
| - if (has_java_string_check_utf8()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(27, this->java_string_check_utf8(), output);
|
| - }
|
| -
|
| - // optional bool cc_enable_arenas = 31 [default = false];
|
| - if (has_cc_enable_arenas()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(31, this->cc_enable_arenas(), output);
|
| - }
|
| -
|
| - // optional string objc_class_prefix = 36;
|
| - if (has_objc_class_prefix()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->objc_class_prefix().data(), this->objc_class_prefix().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.objc_class_prefix");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| - 36, this->objc_class_prefix(), output);
|
| - }
|
| -
|
| - // optional string csharp_namespace = 37;
|
| - if (has_csharp_namespace()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->csharp_namespace().data(), this->csharp_namespace().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.csharp_namespace");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| - 37, this->csharp_namespace(), output);
|
| - }
|
| -
|
| - // optional bool javanano_use_deprecated_package = 38;
|
| - if (has_javanano_use_deprecated_package()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(38, this->javanano_use_deprecated_package(), output);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -8155,22 +4768,19 @@ void FileOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.FileOptions)
|
| }
|
|
|
| ::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()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_package().data(), this->java_package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.java_package");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->java_package(), target);
|
| @@ -8178,10 +4788,9 @@ void FileOptions::SerializeWithCachedSizes(
|
|
|
| // optional string java_outer_classname = 8;
|
| if (has_java_outer_classname()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->java_outer_classname().data(), this->java_outer_classname().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.java_outer_classname");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 8, this->java_outer_classname(), target);
|
| @@ -8200,10 +4809,9 @@ void FileOptions::SerializeWithCachedSizes(
|
|
|
| // optional string go_package = 11;
|
| if (has_go_package()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->go_package().data(), this->go_package().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.go_package");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 11, this->go_package(), target);
|
| @@ -8234,50 +4842,8 @@ void FileOptions::SerializeWithCachedSizes(
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->java_generate_equals_and_hash(), target);
|
| }
|
|
|
| - // optional bool deprecated = 23 [default = false];
|
| - if (has_deprecated()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(23, this->deprecated(), target);
|
| - }
|
| -
|
| - // optional bool java_string_check_utf8 = 27 [default = false];
|
| - if (has_java_string_check_utf8()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(27, this->java_string_check_utf8(), target);
|
| - }
|
| -
|
| - // optional bool cc_enable_arenas = 31 [default = false];
|
| - if (has_cc_enable_arenas()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(31, this->cc_enable_arenas(), target);
|
| - }
|
| -
|
| - // optional string objc_class_prefix = 36;
|
| - if (has_objc_class_prefix()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->objc_class_prefix().data(), this->objc_class_prefix().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.objc_class_prefix");
|
| - target =
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 36, this->objc_class_prefix(), target);
|
| - }
|
| -
|
| - // optional string csharp_namespace = 37;
|
| - if (has_csharp_namespace()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->csharp_namespace().data(), this->csharp_namespace().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.FileOptions.csharp_namespace");
|
| - target =
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| - 37, this->csharp_namespace(), target);
|
| - }
|
| -
|
| - // optional bool javanano_use_deprecated_package = 38;
|
| - if (has_javanano_use_deprecated_package()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(38, this->javanano_use_deprecated_package(), target);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -8287,18 +4853,17 @@ void FileOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileOptions)
|
| return target;
|
| }
|
|
|
| int FileOptions::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 255u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string java_package = 1;
|
| if (has_java_package()) {
|
| total_size += 1 +
|
| @@ -8328,11 +4893,6 @@ int FileOptions::ByteSize() const {
|
| total_size += 2 + 1;
|
| }
|
|
|
| - // 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 +
|
| @@ -8346,13 +4906,13 @@ int FileOptions::ByteSize() const {
|
| this->go_package());
|
| }
|
|
|
| - }
|
| - if (_has_bits_[8 / 32] & 65280u) {
|
| // optional bool cc_generic_services = 16 [default = false];
|
| if (has_cc_generic_services()) {
|
| total_size += 2 + 1;
|
| }
|
|
|
| + }
|
| + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| // optional bool java_generic_services = 17 [default = false];
|
| if (has_java_generic_services()) {
|
| total_size += 2 + 1;
|
| @@ -8363,35 +4923,6 @@ int FileOptions::ByteSize() const {
|
| total_size += 2 + 1;
|
| }
|
|
|
| - // optional bool deprecated = 23 [default = false];
|
| - if (has_deprecated()) {
|
| - total_size += 2 + 1;
|
| - }
|
| -
|
| - // optional bool cc_enable_arenas = 31 [default = false];
|
| - if (has_cc_enable_arenas()) {
|
| - total_size += 2 + 1;
|
| - }
|
| -
|
| - // 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 bool javanano_use_deprecated_package = 38;
|
| - if (has_javanano_use_deprecated_package()) {
|
| - total_size += 2 + 1;
|
| - }
|
| -
|
| }
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| @@ -8403,7 +4934,7 @@ int FileOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -8415,10 +4946,10 @@ int FileOptions::ByteSize() const {
|
| }
|
|
|
| void FileOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const FileOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const FileOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const FileOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const FileOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -8427,16 +4958,14 @@ void FileOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void FileOptions::MergeFrom(const FileOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| 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_);
|
| + set_java_package(from.java_package());
|
| }
|
| if (from.has_java_outer_classname()) {
|
| - set_has_java_outer_classname();
|
| - java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_);
|
| + set_java_outer_classname(from.java_outer_classname());
|
| }
|
| if (from.has_java_multiple_files()) {
|
| set_java_multiple_files(from.java_multiple_files());
|
| @@ -8447,709 +4976,108 @@ void FileOptions::MergeFrom(const FileOptions& from) {
|
| if (from.has_java_generate_equals_and_hash()) {
|
| set_java_generate_equals_and_hash(from.java_generate_equals_and_hash());
|
| }
|
| - 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_);
|
| + set_go_package(from.go_package());
|
| }
|
| - }
|
| - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| 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());
|
| }
|
| if (from.has_py_generic_services()) {
|
| set_py_generic_services(from.py_generic_services());
|
| }
|
| - if (from.has_deprecated()) {
|
| - set_deprecated(from.deprecated());
|
| - }
|
| - if (from.has_cc_enable_arenas()) {
|
| - set_cc_enable_arenas(from.cc_enable_arenas());
|
| - }
|
| - 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_javanano_use_deprecated_package()) {
|
| - set_javanano_use_deprecated_package(from.javanano_use_deprecated_package());
|
| - }
|
| }
|
| _extensions_.MergeFrom(from._extensions_);
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void FileOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| if (&from == this) return;
|
| Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -void FileOptions::CopyFrom(const FileOptions& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -bool FileOptions::IsInitialized() const {
|
| -
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| -
|
| - if (!_extensions_.IsInitialized()) return false; return true;
|
| -}
|
| -
|
| -void FileOptions::Swap(FileOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void FileOptions::InternalSwap(FileOptions* other) {
|
| - java_package_.Swap(&other->java_package_);
|
| - java_outer_classname_.Swap(&other->java_outer_classname_);
|
| - std::swap(java_multiple_files_, other->java_multiple_files_);
|
| - std::swap(retain_unknown_fields_, other->retain_unknown_fields_);
|
| - 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_);
|
| - objc_class_prefix_.Swap(&other->objc_class_prefix_);
|
| - csharp_namespace_.Swap(&other->csharp_namespace_);
|
| - std::swap(javanano_use_deprecated_package_, other->javanano_use_deprecated_package_);
|
| - 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 FileOptions::GetMetadata() const {
|
| - protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = FileOptions_descriptor_;
|
| - metadata.reflection = FileOptions_reflection_;
|
| - return metadata;
|
| -}
|
| -
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// FileOptions
|
| -
|
| -// optional string java_package = 1;
|
| -bool FileOptions::has_java_package() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_package() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void FileOptions::clear_has_java_package() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void FileOptions::clear_java_package() {
|
| - java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_java_package();
|
| -}
|
| - const ::std::string& FileOptions::java_package() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package)
|
| - return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_java_package();
|
| - return java_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileOptions::set_allocated_java_package(::std::string* java_package) {
|
| - if (java_package != NULL) {
|
| - set_has_java_package();
|
| - } else {
|
| - clear_has_java_package();
|
| - }
|
| - java_package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), java_package);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_package)
|
| -}
|
| -
|
| -// optional string java_outer_classname = 8;
|
| -bool FileOptions::has_java_outer_classname() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_outer_classname() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void FileOptions::clear_has_java_outer_classname() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname)
|
| - return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - 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) {
|
| - if (java_outer_classname != NULL) {
|
| - set_has_java_outer_classname();
|
| - } else {
|
| - clear_has_java_outer_classname();
|
| - }
|
| - java_outer_classname_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), java_outer_classname);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_outer_classname)
|
| -}
|
| -
|
| -// optional bool java_multiple_files = 10 [default = false];
|
| -bool FileOptions::has_java_multiple_files() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_multiple_files() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void FileOptions::clear_has_java_multiple_files() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files)
|
| - return java_multiple_files_;
|
| -}
|
| - 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 retain_unknown_fields = 12 [default = false];
|
| -bool FileOptions::has_retain_unknown_fields() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void FileOptions::set_has_retain_unknown_fields() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void FileOptions::clear_has_retain_unknown_fields() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| -}
|
| -void FileOptions::clear_retain_unknown_fields() {
|
| - retain_unknown_fields_ = false;
|
| - clear_has_retain_unknown_fields();
|
| -}
|
| - bool FileOptions::retain_unknown_fields() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.retain_unknown_fields)
|
| - return retain_unknown_fields_;
|
| -}
|
| - void FileOptions::set_retain_unknown_fields(bool value) {
|
| - set_has_retain_unknown_fields();
|
| - retain_unknown_fields_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.retain_unknown_fields)
|
| -}
|
| -
|
| -// optional bool java_generate_equals_and_hash = 20 [default = false];
|
| -bool FileOptions::has_java_generate_equals_and_hash() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_generate_equals_and_hash() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -void FileOptions::clear_has_java_generate_equals_and_hash() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| -}
|
| -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 {
|
| - // @@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) {
|
| - 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)
|
| -}
|
| -
|
| -// optional bool java_string_check_utf8 = 27 [default = false];
|
| -bool FileOptions::has_java_string_check_utf8() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_string_check_utf8() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -void FileOptions::clear_has_java_string_check_utf8() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| -}
|
| -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 {
|
| - // @@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) {
|
| - set_has_java_string_check_utf8();
|
| - java_string_check_utf8_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)
|
| -}
|
| -
|
| -// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| -bool FileOptions::has_optimize_for() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| -}
|
| -void FileOptions::set_has_optimize_for() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| -}
|
| -void FileOptions::clear_has_optimize_for() {
|
| - _has_bits_[0] &= ~0x00000040u;
|
| -}
|
| -void FileOptions::clear_optimize_for() {
|
| - optimize_for_ = 1;
|
| - clear_has_optimize_for();
|
| -}
|
| - ::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) {
|
| - assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));
|
| - set_has_optimize_for();
|
| - optimize_for_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.optimize_for)
|
| -}
|
| -
|
| -// optional string go_package = 11;
|
| -bool FileOptions::has_go_package() const {
|
| - return (_has_bits_[0] & 0x00000080u) != 0;
|
| -}
|
| -void FileOptions::set_has_go_package() {
|
| - _has_bits_[0] |= 0x00000080u;
|
| -}
|
| -void FileOptions::clear_has_go_package() {
|
| - _has_bits_[0] &= ~0x00000080u;
|
| -}
|
| -void FileOptions::clear_go_package() {
|
| - go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_go_package();
|
| -}
|
| - const ::std::string& FileOptions::go_package() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package)
|
| - return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_go_package();
|
| - return go_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileOptions::set_allocated_go_package(::std::string* go_package) {
|
| - if (go_package != NULL) {
|
| - set_has_go_package();
|
| - } else {
|
| - clear_has_go_package();
|
| - }
|
| - go_package_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), go_package);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.go_package)
|
| -}
|
| -
|
| -// optional bool cc_generic_services = 16 [default = false];
|
| -bool FileOptions::has_cc_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000100u) != 0;
|
| -}
|
| -void FileOptions::set_has_cc_generic_services() {
|
| - _has_bits_[0] |= 0x00000100u;
|
| -}
|
| -void FileOptions::clear_has_cc_generic_services() {
|
| - _has_bits_[0] &= ~0x00000100u;
|
| -}
|
| -void FileOptions::clear_cc_generic_services() {
|
| - cc_generic_services_ = false;
|
| - clear_has_cc_generic_services();
|
| -}
|
| - 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) {
|
| - set_has_cc_generic_services();
|
| - cc_generic_services_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)
|
| -}
|
| -
|
| -// optional bool java_generic_services = 17 [default = false];
|
| -bool FileOptions::has_java_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000200u) != 0;
|
| -}
|
| -void FileOptions::set_has_java_generic_services() {
|
| - _has_bits_[0] |= 0x00000200u;
|
| -}
|
| -void FileOptions::clear_has_java_generic_services() {
|
| - _has_bits_[0] &= ~0x00000200u;
|
| -}
|
| -void FileOptions::clear_java_generic_services() {
|
| - java_generic_services_ = false;
|
| - clear_has_java_generic_services();
|
| -}
|
| - 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) {
|
| - set_has_java_generic_services();
|
| - java_generic_services_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)
|
| -}
|
| -
|
| -// optional bool py_generic_services = 18 [default = false];
|
| -bool FileOptions::has_py_generic_services() const {
|
| - return (_has_bits_[0] & 0x00000400u) != 0;
|
| -}
|
| -void FileOptions::set_has_py_generic_services() {
|
| - _has_bits_[0] |= 0x00000400u;
|
| -}
|
| -void FileOptions::clear_has_py_generic_services() {
|
| - _has_bits_[0] &= ~0x00000400u;
|
| -}
|
| -void FileOptions::clear_py_generic_services() {
|
| - py_generic_services_ = false;
|
| - clear_has_py_generic_services();
|
| -}
|
| - 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) {
|
| - set_has_py_generic_services();
|
| - py_generic_services_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)
|
| -}
|
| -
|
| -// optional bool deprecated = 23 [default = false];
|
| -bool FileOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000800u) != 0;
|
| -}
|
| -void FileOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000800u;
|
| -}
|
| -void FileOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000800u;
|
| -}
|
| -void FileOptions::clear_deprecated() {
|
| - deprecated_ = false;
|
| - clear_has_deprecated();
|
| -}
|
| - bool FileOptions::deprecated() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated)
|
| - return deprecated_;
|
| -}
|
| - void FileOptions::set_deprecated(bool value) {
|
| - set_has_deprecated();
|
| - deprecated_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)
|
| -}
|
| -
|
| -// optional bool cc_enable_arenas = 31 [default = false];
|
| -bool FileOptions::has_cc_enable_arenas() const {
|
| - return (_has_bits_[0] & 0x00001000u) != 0;
|
| -}
|
| -void FileOptions::set_has_cc_enable_arenas() {
|
| - _has_bits_[0] |= 0x00001000u;
|
| -}
|
| -void FileOptions::clear_has_cc_enable_arenas() {
|
| - _has_bits_[0] &= ~0x00001000u;
|
| -}
|
| -void FileOptions::clear_cc_enable_arenas() {
|
| - cc_enable_arenas_ = false;
|
| - clear_has_cc_enable_arenas();
|
| -}
|
| - 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) {
|
| - set_has_cc_enable_arenas();
|
| - cc_enable_arenas_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)
|
| -}
|
| -
|
| -// optional string objc_class_prefix = 36;
|
| -bool FileOptions::has_objc_class_prefix() const {
|
| - return (_has_bits_[0] & 0x00002000u) != 0;
|
| -}
|
| -void FileOptions::set_has_objc_class_prefix() {
|
| - _has_bits_[0] |= 0x00002000u;
|
| -}
|
| -void FileOptions::clear_has_objc_class_prefix() {
|
| - _has_bits_[0] &= ~0x00002000u;
|
| -}
|
| -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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix)
|
| - return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - 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) {
|
| - if (objc_class_prefix != NULL) {
|
| - set_has_objc_class_prefix();
|
| - } else {
|
| - clear_has_objc_class_prefix();
|
| - }
|
| - objc_class_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), objc_class_prefix);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.objc_class_prefix)
|
| -}
|
| -
|
| -// optional string csharp_namespace = 37;
|
| -bool FileOptions::has_csharp_namespace() const {
|
| - return (_has_bits_[0] & 0x00004000u) != 0;
|
| -}
|
| -void FileOptions::set_has_csharp_namespace() {
|
| - _has_bits_[0] |= 0x00004000u;
|
| -}
|
| -void FileOptions::clear_has_csharp_namespace() {
|
| - _has_bits_[0] &= ~0x00004000u;
|
| -}
|
| -void FileOptions::clear_csharp_namespace() {
|
| - csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - clear_has_csharp_namespace();
|
| -}
|
| - const ::std::string& FileOptions::csharp_namespace() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace)
|
| - return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_csharp_namespace();
|
| - return csharp_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) {
|
| - if (csharp_namespace != NULL) {
|
| - set_has_csharp_namespace();
|
| - } else {
|
| - clear_has_csharp_namespace();
|
| - }
|
| - csharp_namespace_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), csharp_namespace);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
|
| -}
|
| -
|
| -// optional bool javanano_use_deprecated_package = 38;
|
| -bool FileOptions::has_javanano_use_deprecated_package() const {
|
| - return (_has_bits_[0] & 0x00008000u) != 0;
|
| -}
|
| -void FileOptions::set_has_javanano_use_deprecated_package() {
|
| - _has_bits_[0] |= 0x00008000u;
|
| -}
|
| -void FileOptions::clear_has_javanano_use_deprecated_package() {
|
| - _has_bits_[0] &= ~0x00008000u;
|
| -}
|
| -void FileOptions::clear_javanano_use_deprecated_package() {
|
| - javanano_use_deprecated_package_ = false;
|
| - clear_has_javanano_use_deprecated_package();
|
| -}
|
| - bool FileOptions::javanano_use_deprecated_package() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.javanano_use_deprecated_package)
|
| - return javanano_use_deprecated_package_;
|
| -}
|
| - void FileOptions::set_javanano_use_deprecated_package(bool value) {
|
| - set_has_javanano_use_deprecated_package();
|
| - javanano_use_deprecated_package_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.javanano_use_deprecated_package)
|
| + MergeFrom(from);
|
| }
|
|
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -int FileOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void FileOptions::clear_uninterpreted_option() {
|
| - uninterpreted_option_.Clear();
|
| -}
|
| - const ::google::protobuf::UninterpretedOption& FileOptions::uninterpreted_option(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption* FileOptions::mutable_uninterpreted_option(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Mutable(index);
|
| +void FileOptions::CopyFrom(const FileOptions& from) {
|
| + if (&from == this) return;
|
| + Clear();
|
| + MergeFrom(from);
|
| }
|
| - ::google::protobuf::UninterpretedOption* FileOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FileOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| +
|
| +bool FileOptions::IsInitialized() const {
|
| +
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
| +
|
| + if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -FileOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FileOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| +
|
| +void FileOptions::Swap(FileOptions* other) {
|
| + if (other != this) {
|
| + std::swap(java_package_, other->java_package_);
|
| + std::swap(java_outer_classname_, other->java_outer_classname_);
|
| + std::swap(java_multiple_files_, other->java_multiple_files_);
|
| + std::swap(retain_unknown_fields_, other->retain_unknown_fields_);
|
| + std::swap(java_generate_equals_and_hash_, other->java_generate_equals_and_hash_);
|
| + std::swap(optimize_for_, other->optimize_for_);
|
| + std::swap(go_package_, 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_);
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -FileOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| +
|
| +::google::protobuf::Metadata FileOptions::GetMetadata() const {
|
| + protobuf_AssignDescriptorsOnce();
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = FileOptions_descriptor_;
|
| + metadata.reflection = FileOptions_reflection_;
|
| + return metadata;
|
| }
|
|
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| const int MessageOptions::kMessageSetWireFormatFieldNumber;
|
| const int MessageOptions::kNoStandardDescriptorAccessorFieldNumber;
|
| -const int MessageOptions::kDeprecatedFieldNumber;
|
| -const int MessageOptions::kMapEntryFieldNumber;
|
| const int MessageOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| MessageOptions::MessageOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.MessageOptions)
|
| }
|
|
|
| void MessageOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| MessageOptions::MessageOptions(const MessageOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions)
|
| }
|
|
|
| void MessageOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| message_set_wire_format_ = false;
|
| no_standard_descriptor_accessor_ = false;
|
| - deprecated_ = false;
|
| - map_entry_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| MessageOptions::~MessageOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.MessageOptions)
|
| SharedDtor();
|
| }
|
|
|
| @@ -9175,55 +5103,37 @@ const MessageOptions& MessageOptions::default_instance() {
|
|
|
| MessageOptions* MessageOptions::default_instance_ = NULL;
|
|
|
| -MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const {
|
| - MessageOptions* n = new MessageOptions;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +MessageOptions* MessageOptions::New() const {
|
| + return new MessageOptions;
|
| }
|
|
|
| void MessageOptions::Clear() {
|
| _extensions_.Clear();
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<MessageOptions*>(16)->f)
|
| -
|
| -#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_
|
| -
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + message_set_wire_format_ = false;
|
| + no_standard_descriptor_accessor_ = false;
|
| + }
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool MessageOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.MessageOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional bool message_set_wire_format = 1 [default = false];
|
| case 1: {
|
| - if (tag == 8) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(16)) goto parse_no_standard_descriptor_accessor;
|
| break;
|
| @@ -9231,44 +5141,15 @@ bool MessageOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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 == 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 == 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| @@ -9276,27 +5157,24 @@ bool MessageOptions::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| - if (tag == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -9309,18 +5187,12 @@ bool MessageOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.MessageOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.MessageOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void MessageOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.MessageOptions)
|
| // optional bool message_set_wire_format = 1 [default = false];
|
| if (has_message_set_wire_format()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->message_set_wire_format(), output);
|
| @@ -9331,18 +5203,8 @@ void MessageOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->no_standard_descriptor_accessor(), output);
|
| }
|
|
|
| - // optional bool deprecated = 3 [default = false];
|
| - if (has_deprecated()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output);
|
| - }
|
| -
|
| - // optional bool map_entry = 7;
|
| - if (has_map_entry()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->map_entry(), output);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -9351,16 +5213,14 @@ void MessageOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.MessageOptions)
|
| }
|
|
|
| ::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()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->message_set_wire_format(), target);
|
| @@ -9371,18 +5231,8 @@ void MessageOptions::SerializeWithCachedSizes(
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->no_standard_descriptor_accessor(), target);
|
| }
|
|
|
| - // optional bool deprecated = 3 [default = false];
|
| - if (has_deprecated()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target);
|
| - }
|
| -
|
| - // optional bool map_entry = 7;
|
| - if (has_map_entry()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->map_entry(), target);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -9392,18 +5242,17 @@ void MessageOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MessageOptions)
|
| return target;
|
| }
|
|
|
| int MessageOptions::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 15u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional bool message_set_wire_format = 1 [default = false];
|
| if (has_message_set_wire_format()) {
|
| total_size += 1 + 1;
|
| @@ -9414,16 +5263,6 @@ int MessageOptions::ByteSize() const {
|
| total_size += 1 + 1;
|
| }
|
|
|
| - // optional bool deprecated = 3 [default = false];
|
| - if (has_deprecated()) {
|
| - total_size += 1 + 1;
|
| - }
|
| -
|
| - // optional bool map_entry = 7;
|
| - if (has_map_entry()) {
|
| - total_size += 1 + 1;
|
| - }
|
| -
|
| }
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| @@ -9435,7 +5274,7 @@ int MessageOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -9447,10 +5286,10 @@ int MessageOptions::ByteSize() const {
|
| }
|
|
|
| void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const MessageOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const MessageOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const MessageOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const MessageOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -9459,7 +5298,7 @@ void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void MessageOptions::MergeFrom(const MessageOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_message_set_wire_format()) {
|
| @@ -9468,17 +5307,9 @@ void MessageOptions::MergeFrom(const MessageOptions& from) {
|
| if (from.has_no_standard_descriptor_accessor()) {
|
| set_no_standard_descriptor_accessor(from.no_standard_descriptor_accessor());
|
| }
|
| - if (from.has_deprecated()) {
|
| - set_deprecated(from.deprecated());
|
| - }
|
| - if (from.has_map_entry()) {
|
| - set_map_entry(from.map_entry());
|
| - }
|
| }
|
| _extensions_.MergeFrom(from._extensions_);
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void MessageOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -9495,25 +5326,23 @@ void MessageOptions::CopyFrom(const MessageOptions& from) {
|
|
|
| bool MessageOptions::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
|
|
| if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
|
|
| void MessageOptions::Swap(MessageOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void MessageOptions::InternalSwap(MessageOptions* other) {
|
| - 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_);
|
| - _extensions_.Swap(&other->_extensions_);
|
| + if (other != this) {
|
| + std::swap(message_set_wire_format_, other->message_set_wire_format_);
|
| + std::swap(no_standard_descriptor_accessor_, other->no_standard_descriptor_accessor_);
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata MessageOptions::GetMetadata() const {
|
| @@ -9524,136 +5353,6 @@ void MessageOptions::InternalSwap(MessageOptions* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// MessageOptions
|
| -
|
| -// optional bool message_set_wire_format = 1 [default = false];
|
| -bool MessageOptions::has_message_set_wire_format() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void MessageOptions::set_has_message_set_wire_format() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void MessageOptions::clear_has_message_set_wire_format() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -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 {
|
| - // @@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) {
|
| - set_has_message_set_wire_format();
|
| - message_set_wire_format_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)
|
| -}
|
| -
|
| -// optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| -bool MessageOptions::has_no_standard_descriptor_accessor() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void MessageOptions::set_has_no_standard_descriptor_accessor() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void MessageOptions::clear_has_no_standard_descriptor_accessor() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -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 {
|
| - // @@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) {
|
| - set_has_no_standard_descriptor_accessor();
|
| - no_standard_descriptor_accessor_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
|
| -}
|
| -
|
| -// optional bool deprecated = 3 [default = false];
|
| -bool MessageOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void MessageOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void MessageOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void MessageOptions::clear_deprecated() {
|
| - deprecated_ = false;
|
| - clear_has_deprecated();
|
| -}
|
| - bool MessageOptions::deprecated() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated)
|
| - return deprecated_;
|
| -}
|
| - void MessageOptions::set_deprecated(bool value) {
|
| - set_has_deprecated();
|
| - deprecated_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)
|
| -}
|
| -
|
| -// optional bool map_entry = 7;
|
| -bool MessageOptions::has_map_entry() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void MessageOptions::set_has_map_entry() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void MessageOptions::clear_has_map_entry() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| -}
|
| -void MessageOptions::clear_map_entry() {
|
| - map_entry_ = false;
|
| - clear_has_map_entry();
|
| -}
|
| - 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) {
|
| - set_has_map_entry();
|
| - map_entry_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)
|
| -}
|
| -
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -int MessageOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void MessageOptions::clear_uninterpreted_option() {
|
| - uninterpreted_option_.Clear();
|
| -}
|
| - const ::google::protobuf::UninterpretedOption& MessageOptions::uninterpreted_option(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption* MessageOptions::mutable_uninterpreted_option(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.MessageOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Mutable(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption* MessageOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.MessageOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -MessageOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.MessageOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -MessageOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.MessageOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -9680,73 +5379,49 @@ const FieldOptions_CType FieldOptions::CType_MIN;
|
| const FieldOptions_CType FieldOptions::CType_MAX;
|
| const int FieldOptions::CType_ARRAYSIZE;
|
| #endif // _MSC_VER
|
| -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;
|
| - }
|
| -}
|
| -
|
| -#ifndef _MSC_VER
|
| -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 // _MSC_VER
|
| #ifndef _MSC_VER
|
| const int FieldOptions::kCtypeFieldNumber;
|
| const int FieldOptions::kPackedFieldNumber;
|
| -const int FieldOptions::kJstypeFieldNumber;
|
| const int FieldOptions::kLazyFieldNumber;
|
| const int FieldOptions::kDeprecatedFieldNumber;
|
| +const int FieldOptions::kExperimentalMapKeyFieldNumber;
|
| const int FieldOptions::kWeakFieldNumber;
|
| const int FieldOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| FieldOptions::FieldOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.FieldOptions)
|
| }
|
|
|
| void FieldOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| FieldOptions::FieldOptions(const FieldOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions)
|
| }
|
|
|
| void FieldOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| ctype_ = 0;
|
| packed_ = false;
|
| - jstype_ = 0;
|
| lazy_ = false;
|
| deprecated_ = false;
|
| + experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| weak_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| FieldOptions::~FieldOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.FieldOptions)
|
| SharedDtor();
|
| }
|
|
|
| void FieldOptions::SharedDtor() {
|
| + if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete experimental_map_key_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -9768,52 +5443,39 @@ const FieldOptions& FieldOptions::default_instance() {
|
|
|
| FieldOptions* FieldOptions::default_instance_ = NULL;
|
|
|
| -FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const {
|
| - FieldOptions* n = new FieldOptions;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +FieldOptions* FieldOptions::New() const {
|
| + return new FieldOptions;
|
| }
|
|
|
| void FieldOptions::Clear() {
|
| _extensions_.Clear();
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<FieldOptions*>(16)->f)
|
| -
|
| -#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_(ctype_, jstype_);
|
| - ZR_(packed_, weak_);
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + ctype_ = 0;
|
| + packed_ = false;
|
| + lazy_ = false;
|
| + deprecated_ = false;
|
| + if (has_experimental_map_key()) {
|
| + if (experimental_map_key_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + experimental_map_key_->clear();
|
| + }
|
| + }
|
| + weak_ = false;
|
| }
|
| -
|
| -#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();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool FieldOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.FieldOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| case 1: {
|
| - if (tag == 8) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| int value;
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
|
| @@ -9824,7 +5486,7 @@ bool FieldOptions::MergePartialFromCodedStream(
|
| mutable_unknown_fields()->AddVarint(1, value);
|
| }
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(16)) goto parse_packed;
|
| break;
|
| @@ -9832,14 +5494,15 @@ bool FieldOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool packed = 2;
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_packed:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &packed_)));
|
| set_has_packed();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(24)) goto parse_deprecated;
|
| break;
|
| @@ -9847,14 +5510,15 @@ bool FieldOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool deprecated = 3 [default = false];
|
| case 3: {
|
| - if (tag == 24) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_deprecated:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &deprecated_)));
|
| set_has_deprecated();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(40)) goto parse_lazy;
|
| break;
|
| @@ -9862,34 +5526,32 @@ bool FieldOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool lazy = 5 [default = false];
|
| case 5: {
|
| - if (tag == 40) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_lazy:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &lazy_)));
|
| set_has_lazy();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(48)) goto parse_jstype;
|
| + if (input->ExpectTag(74)) goto parse_experimental_map_key;
|
| break;
|
| }
|
|
|
| - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| - case 6: {
|
| - if (tag == 48) {
|
| - parse_jstype:
|
| - int value;
|
| - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
|
| - input, &value)));
|
| - if (::google::protobuf::FieldOptions_JSType_IsValid(value)) {
|
| - set_jstype(static_cast< ::google::protobuf::FieldOptions_JSType >(value));
|
| - } else {
|
| - mutable_unknown_fields()->AddVarint(6, value);
|
| - }
|
| + // optional string experimental_map_key = 9;
|
| + case 9: {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_experimental_map_key:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| + input, this->mutable_experimental_map_key()));
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->experimental_map_key().data(), this->experimental_map_key().length(),
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(80)) goto parse_weak;
|
| break;
|
| @@ -9897,14 +5559,15 @@ bool FieldOptions::MergePartialFromCodedStream(
|
|
|
| // optional bool weak = 10 [default = false];
|
| case 10: {
|
| - if (tag == 80) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_weak:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &weak_)));
|
| set_has_weak();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| @@ -9912,27 +5575,24 @@ bool FieldOptions::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| - if (tag == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -9945,18 +5605,12 @@ bool FieldOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.FieldOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.FieldOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void FieldOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.FieldOptions)
|
| // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| if (has_ctype()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| @@ -9978,10 +5632,13 @@ void FieldOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->lazy(), output);
|
| }
|
|
|
| - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| - if (has_jstype()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| - 6, this->jstype(), output);
|
| + // optional string experimental_map_key = 9;
|
| + if (has_experimental_map_key()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->experimental_map_key().data(), this->experimental_map_key().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| + 9, this->experimental_map_key(), output);
|
| }
|
|
|
| // optional bool weak = 10 [default = false];
|
| @@ -9990,7 +5647,7 @@ void FieldOptions::SerializeWithCachedSizes(
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -9999,16 +5656,14 @@ void FieldOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.FieldOptions)
|
| }
|
|
|
| ::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()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| @@ -10030,10 +5685,14 @@ void FieldOptions::SerializeWithCachedSizes(
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->lazy(), target);
|
| }
|
|
|
| - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| - if (has_jstype()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| - 6, this->jstype(), target);
|
| + // optional string experimental_map_key = 9;
|
| + if (has_experimental_map_key()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->experimental_map_key().data(), this->experimental_map_key().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + target =
|
| + ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| + 9, this->experimental_map_key(), target);
|
| }
|
|
|
| // optional bool weak = 10 [default = false];
|
| @@ -10042,7 +5701,7 @@ void FieldOptions::SerializeWithCachedSizes(
|
| }
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -10052,18 +5711,17 @@ void FieldOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldOptions)
|
| return target;
|
| }
|
|
|
| int FieldOptions::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 63u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| if (has_ctype()) {
|
| total_size += 1 +
|
| @@ -10075,12 +5733,6 @@ int FieldOptions::ByteSize() const {
|
| total_size += 1 + 1;
|
| }
|
|
|
| - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| - if (has_jstype()) {
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::EnumSize(this->jstype());
|
| - }
|
| -
|
| // optional bool lazy = 5 [default = false];
|
| if (has_lazy()) {
|
| total_size += 1 + 1;
|
| @@ -10091,6 +5743,13 @@ int FieldOptions::ByteSize() const {
|
| total_size += 1 + 1;
|
| }
|
|
|
| + // optional string experimental_map_key = 9;
|
| + if (has_experimental_map_key()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->experimental_map_key());
|
| + }
|
| +
|
| // optional bool weak = 10 [default = false];
|
| if (has_weak()) {
|
| total_size += 1 + 1;
|
| @@ -10107,7 +5766,7 @@ int FieldOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -10119,10 +5778,10 @@ int FieldOptions::ByteSize() const {
|
| }
|
|
|
| void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const FieldOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const FieldOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const FieldOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const FieldOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -10131,7 +5790,7 @@ void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void FieldOptions::MergeFrom(const FieldOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (from.has_ctype()) {
|
| @@ -10140,23 +5799,21 @@ void FieldOptions::MergeFrom(const FieldOptions& from) {
|
| if (from.has_packed()) {
|
| set_packed(from.packed());
|
| }
|
| - if (from.has_jstype()) {
|
| - set_jstype(from.jstype());
|
| - }
|
| if (from.has_lazy()) {
|
| set_lazy(from.lazy());
|
| }
|
| if (from.has_deprecated()) {
|
| set_deprecated(from.deprecated());
|
| }
|
| + if (from.has_experimental_map_key()) {
|
| + set_experimental_map_key(from.experimental_map_key());
|
| + }
|
| if (from.has_weak()) {
|
| set_weak(from.weak());
|
| }
|
| }
|
| _extensions_.MergeFrom(from._extensions_);
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void FieldOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -10164,261 +5821,75 @@ void FieldOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| Clear();
|
| MergeFrom(from);
|
| }
|
| -
|
| -void FieldOptions::CopyFrom(const FieldOptions& from) {
|
| - if (&from == this) return;
|
| - Clear();
|
| - MergeFrom(from);
|
| -}
|
| -
|
| -bool FieldOptions::IsInitialized() const {
|
| -
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| -
|
| - if (!_extensions_.IsInitialized()) return false; return true;
|
| -}
|
| -
|
| -void FieldOptions::Swap(FieldOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void FieldOptions::InternalSwap(FieldOptions* other) {
|
| - std::swap(ctype_, other->ctype_);
|
| - 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_);
|
| - _extensions_.Swap(&other->_extensions_);
|
| -}
|
| -
|
| -::google::protobuf::Metadata FieldOptions::GetMetadata() const {
|
| - protobuf_AssignDescriptorsOnce();
|
| - ::google::protobuf::Metadata metadata;
|
| - metadata.descriptor = FieldOptions_descriptor_;
|
| - metadata.reflection = FieldOptions_reflection_;
|
| - return metadata;
|
| -}
|
| -
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// FieldOptions
|
| -
|
| -// optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| -bool FieldOptions::has_ctype() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void FieldOptions::set_has_ctype() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void FieldOptions::clear_has_ctype() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void FieldOptions::clear_ctype() {
|
| - ctype_ = 0;
|
| - clear_has_ctype();
|
| -}
|
| - ::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) {
|
| - assert(::google::protobuf::FieldOptions_CType_IsValid(value));
|
| - set_has_ctype();
|
| - ctype_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.ctype)
|
| -}
|
| -
|
| -// optional bool packed = 2;
|
| -bool FieldOptions::has_packed() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void FieldOptions::set_has_packed() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void FieldOptions::clear_has_packed() {
|
| - _has_bits_[0] &= ~0x00000002u;
|
| -}
|
| -void FieldOptions::clear_packed() {
|
| - packed_ = false;
|
| - clear_has_packed();
|
| -}
|
| - bool FieldOptions::packed() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed)
|
| - return packed_;
|
| -}
|
| - void FieldOptions::set_packed(bool value) {
|
| - set_has_packed();
|
| - packed_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)
|
| -}
|
| -
|
| -// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
|
| -bool FieldOptions::has_jstype() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void FieldOptions::set_has_jstype() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void FieldOptions::clear_has_jstype() {
|
| - _has_bits_[0] &= ~0x00000004u;
|
| -}
|
| -void FieldOptions::clear_jstype() {
|
| - jstype_ = 0;
|
| - clear_has_jstype();
|
| -}
|
| - ::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) {
|
| - assert(::google::protobuf::FieldOptions_JSType_IsValid(value));
|
| - set_has_jstype();
|
| - jstype_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.jstype)
|
| -}
|
| -
|
| -// optional bool lazy = 5 [default = false];
|
| -bool FieldOptions::has_lazy() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void FieldOptions::set_has_lazy() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void FieldOptions::clear_has_lazy() {
|
| - _has_bits_[0] &= ~0x00000008u;
|
| -}
|
| -void FieldOptions::clear_lazy() {
|
| - lazy_ = false;
|
| - clear_has_lazy();
|
| -}
|
| - bool FieldOptions::lazy() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy)
|
| - return lazy_;
|
| -}
|
| - void FieldOptions::set_lazy(bool value) {
|
| - set_has_lazy();
|
| - lazy_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)
|
| -}
|
| -
|
| -// optional bool deprecated = 3 [default = false];
|
| -bool FieldOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -void FieldOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -void FieldOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| -}
|
| -void FieldOptions::clear_deprecated() {
|
| - deprecated_ = false;
|
| - clear_has_deprecated();
|
| -}
|
| - bool FieldOptions::deprecated() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated)
|
| - return deprecated_;
|
| -}
|
| - void FieldOptions::set_deprecated(bool value) {
|
| - set_has_deprecated();
|
| - deprecated_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)
|
| -}
|
| -
|
| -// optional bool weak = 10 [default = false];
|
| -bool FieldOptions::has_weak() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -void FieldOptions::set_has_weak() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -void FieldOptions::clear_has_weak() {
|
| - _has_bits_[0] &= ~0x00000020u;
|
| -}
|
| -void FieldOptions::clear_weak() {
|
| - weak_ = false;
|
| - clear_has_weak();
|
| -}
|
| - bool FieldOptions::weak() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak)
|
| - return weak_;
|
| -}
|
| - void FieldOptions::set_weak(bool value) {
|
| - set_has_weak();
|
| - weak_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)
|
| -}
|
| -
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -int FieldOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void FieldOptions::clear_uninterpreted_option() {
|
| - uninterpreted_option_.Clear();
|
| -}
|
| - const ::google::protobuf::UninterpretedOption& FieldOptions::uninterpreted_option(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption* FieldOptions::mutable_uninterpreted_option(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.FieldOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Mutable(index);
|
| +
|
| +void FieldOptions::CopyFrom(const FieldOptions& from) {
|
| + if (&from == this) return;
|
| + Clear();
|
| + MergeFrom(from);
|
| }
|
| - ::google::protobuf::UninterpretedOption* FieldOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| +
|
| +bool FieldOptions::IsInitialized() const {
|
| +
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
| +
|
| + if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -FieldOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.FieldOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| +
|
| +void FieldOptions::Swap(FieldOptions* other) {
|
| + if (other != this) {
|
| + std::swap(ctype_, other->ctype_);
|
| + std::swap(packed_, other->packed_);
|
| + std::swap(lazy_, other->lazy_);
|
| + std::swap(deprecated_, other->deprecated_);
|
| + std::swap(experimental_map_key_, other->experimental_map_key_);
|
| + std::swap(weak_, other->weak_);
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -FieldOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| +
|
| +::google::protobuf::Metadata FieldOptions::GetMetadata() const {
|
| + protobuf_AssignDescriptorsOnce();
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = FieldOptions_descriptor_;
|
| + metadata.reflection = FieldOptions_reflection_;
|
| + return metadata;
|
| }
|
|
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| const int EnumOptions::kAllowAliasFieldNumber;
|
| -const int EnumOptions::kDeprecatedFieldNumber;
|
| const int EnumOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| EnumOptions::EnumOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions)
|
| }
|
|
|
| void EnumOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| EnumOptions::EnumOptions(const EnumOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions)
|
| }
|
|
|
| void EnumOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| - allow_alias_ = false;
|
| - deprecated_ = false;
|
| + allow_alias_ = true;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| EnumOptions::~EnumOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions)
|
| SharedDtor();
|
| }
|
|
|
| @@ -10444,70 +5915,36 @@ const EnumOptions& EnumOptions::default_instance() {
|
|
|
| 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;
|
| +EnumOptions* EnumOptions::New() const {
|
| + return new EnumOptions;
|
| }
|
|
|
| void EnumOptions::Clear() {
|
| _extensions_.Clear();
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<EnumOptions*>(16)->f)
|
| -
|
| -#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_
|
| -
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + allow_alias_ = true;
|
| + }
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool EnumOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // optional bool allow_alias = 2;
|
| + // optional bool allow_alias = 2 [default = true];
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| @@ -10515,27 +5952,24 @@ bool EnumOptions::MergePartialFromCodedStream(
|
|
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| - if (tag == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -10548,30 +5982,19 @@ bool EnumOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void EnumOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions)
|
| - // optional bool allow_alias = 2;
|
| + // optional bool allow_alias = 2 [default = true];
|
| 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++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -10580,28 +6003,21 @@ void EnumOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions)
|
| }
|
|
|
| ::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;
|
| + // optional bool allow_alias = 2 [default = true];
|
| 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++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -10611,28 +6027,22 @@ void EnumOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions)
|
| return target;
|
| }
|
|
|
| int EnumOptions::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| - // optional bool allow_alias = 2;
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + // optional bool allow_alias = 2 [default = true];
|
| 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();
|
| @@ -10644,7 +6054,7 @@ int EnumOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -10656,10 +6066,10 @@ int EnumOptions::ByteSize() const {
|
| }
|
|
|
| void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const EnumOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const EnumOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const EnumOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const EnumOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -10668,20 +6078,15 @@ void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void EnumOptions::MergeFrom(const EnumOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| 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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -10698,23 +6103,22 @@ void EnumOptions::CopyFrom(const EnumOptions& from) {
|
|
|
| bool EnumOptions::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
|
|
| if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
|
|
| void EnumOptions::Swap(EnumOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(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_);
|
| - std::swap(_cached_size_, other->_cached_size_);
|
| - _extensions_.Swap(&other->_extensions_);
|
| + if (other != this) {
|
| + std::swap(allow_alias_, other->allow_alias_);
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata EnumOptions::GetMetadata() const {
|
| @@ -10725,121 +6129,33 @@ void EnumOptions::InternalSwap(EnumOptions* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// 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 EnumOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void EnumOptions::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)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::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* EnumOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -EnumOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -EnumOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| -const int EnumValueOptions::kDeprecatedFieldNumber;
|
| const int EnumValueOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| EnumValueOptions::EnumValueOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions)
|
| }
|
|
|
| void EnumValueOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| EnumValueOptions::EnumValueOptions(const EnumValueOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions)
|
| }
|
|
|
| void EnumValueOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| - deprecated_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| EnumValueOptions::~EnumValueOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions)
|
| SharedDtor();
|
| }
|
|
|
| @@ -10865,71 +6181,43 @@ const EnumValueOptions& EnumValueOptions::default_instance() {
|
|
|
| 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;
|
| +EnumValueOptions* EnumValueOptions::New() const {
|
| + return new EnumValueOptions;
|
| }
|
|
|
| void EnumValueOptions::Clear() {
|
| _extensions_.Clear();
|
| - deprecated_ = false;
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool EnumValueOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // 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 == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -10942,25 +6230,14 @@ bool EnumValueOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void EnumValueOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions)
|
| - // optional bool deprecated = 1 [default = false];
|
| - if (has_deprecated()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -10969,23 +6246,16 @@ void EnumValueOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions)
|
| }
|
|
|
| ::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(1, this->deprecated(), target);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -10995,22 +6265,16 @@ void EnumValueOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions)
|
| return target;
|
| }
|
|
|
| int EnumValueOptions::ByteSize() const {
|
| 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++) {
|
| @@ -11021,7 +6285,7 @@ int EnumValueOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -11033,10 +6297,10 @@ int EnumValueOptions::ByteSize() const {
|
| }
|
|
|
| void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const EnumValueOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const EnumValueOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const EnumValueOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const EnumValueOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -11045,17 +6309,10 @@ void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void EnumValueOptions::MergeFrom(const EnumValueOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| - 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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -11072,22 +6329,21 @@ void EnumValueOptions::CopyFrom(const EnumValueOptions& from) {
|
|
|
| bool EnumValueOptions::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
|
|
| if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
|
|
| void EnumValueOptions::Swap(EnumValueOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -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_);
|
| + if (other != this) {
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata EnumValueOptions::GetMetadata() const {
|
| @@ -11098,97 +6354,33 @@ void EnumValueOptions::InternalSwap(EnumValueOptions* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// EnumValueOptions
|
| -
|
| -// optional bool deprecated = 1 [default = false];
|
| -bool EnumValueOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void EnumValueOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void EnumValueOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void EnumValueOptions::clear_deprecated() {
|
| - deprecated_ = false;
|
| - clear_has_deprecated();
|
| -}
|
| - bool EnumValueOptions::deprecated() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated)
|
| - return deprecated_;
|
| -}
|
| - void EnumValueOptions::set_deprecated(bool value) {
|
| - set_has_deprecated();
|
| - deprecated_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)
|
| -}
|
| -
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -int EnumValueOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void EnumValueOptions::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)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::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* EnumValueOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -EnumValueOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -EnumValueOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| -const int ServiceOptions::kDeprecatedFieldNumber;
|
| const int ServiceOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| ServiceOptions::ServiceOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions)
|
| }
|
|
|
| void ServiceOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| ServiceOptions::ServiceOptions(const ServiceOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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();
|
| }
|
|
|
| @@ -11214,71 +6406,43 @@ const ServiceOptions& ServiceOptions::default_instance() {
|
|
|
| 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;
|
| +ServiceOptions* ServiceOptions::New() const {
|
| + return new ServiceOptions;
|
| }
|
|
|
| void ServiceOptions::Clear() {
|
| _extensions_.Clear();
|
| - deprecated_ = false;
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool ServiceOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // 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 == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -11291,25 +6455,14 @@ bool ServiceOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void ServiceOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions)
|
| - // optional bool deprecated = 33 [default = false];
|
| - if (has_deprecated()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -11318,23 +6471,16 @@ void ServiceOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions)
|
| }
|
|
|
| ::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(33, this->deprecated(), target);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -11344,22 +6490,16 @@ void ServiceOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions)
|
| return target;
|
| }
|
|
|
| int ServiceOptions::ByteSize() const {
|
| 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++) {
|
| @@ -11370,7 +6510,7 @@ int ServiceOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -11382,10 +6522,10 @@ int ServiceOptions::ByteSize() const {
|
| }
|
|
|
| void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const ServiceOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const ServiceOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const ServiceOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const ServiceOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -11394,17 +6534,10 @@ void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void ServiceOptions::MergeFrom(const ServiceOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| - 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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -11421,22 +6554,21 @@ void ServiceOptions::CopyFrom(const ServiceOptions& from) {
|
|
|
| bool ServiceOptions::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
|
|
| if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
|
|
| void ServiceOptions::Swap(ServiceOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -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_);
|
| + if (other != this) {
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata ServiceOptions::GetMetadata() const {
|
| @@ -11447,97 +6579,33 @@ void ServiceOptions::InternalSwap(ServiceOptions* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// ServiceOptions
|
| -
|
| -// optional bool deprecated = 33 [default = false];
|
| -bool ServiceOptions::has_deprecated() const {
|
| - return (_has_bits_[0] & 0x00000001u) != 0;
|
| -}
|
| -void ServiceOptions::set_has_deprecated() {
|
| - _has_bits_[0] |= 0x00000001u;
|
| -}
|
| -void ServiceOptions::clear_has_deprecated() {
|
| - _has_bits_[0] &= ~0x00000001u;
|
| -}
|
| -void ServiceOptions::clear_deprecated() {
|
| - deprecated_ = false;
|
| - clear_has_deprecated();
|
| -}
|
| - bool ServiceOptions::deprecated() const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated)
|
| - return deprecated_;
|
| -}
|
| - void ServiceOptions::set_deprecated(bool value) {
|
| - set_has_deprecated();
|
| - deprecated_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)
|
| -}
|
| -
|
| -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| -int ServiceOptions::uninterpreted_option_size() const {
|
| - return uninterpreted_option_.size();
|
| -}
|
| -void ServiceOptions::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)
|
| - return uninterpreted_option_.Get(index);
|
| -}
|
| - ::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* ServiceOptions::add_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)
|
| - return uninterpreted_option_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -ServiceOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -ServiceOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| -const int MethodOptions::kDeprecatedFieldNumber;
|
| const int MethodOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| MethodOptions::MethodOptions()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions)
|
| }
|
|
|
| void MethodOptions::InitAsDefaultInstance() {
|
| }
|
|
|
| MethodOptions::MethodOptions(const MethodOptions& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions)
|
| }
|
|
|
| void MethodOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| - deprecated_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| MethodOptions::~MethodOptions() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions)
|
| SharedDtor();
|
| }
|
|
|
| @@ -11563,71 +6631,43 @@ const MethodOptions& MethodOptions::default_instance() {
|
|
|
| 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;
|
| +MethodOptions* MethodOptions::New() const {
|
| + return new MethodOptions;
|
| }
|
|
|
| void MethodOptions::Clear() {
|
| _extensions_.Clear();
|
| - deprecated_ = false;
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool MethodOptions::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // 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 == 7994) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_uninterpreted_option:
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_uninterpreted_option:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_uninterpreted_option()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| if ((8000u <= tag)) {
|
| DO_(_extensions_.ParseField(tag, input, default_instance_,
|
| @@ -11640,25 +6680,14 @@ bool MethodOptions::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void MethodOptions::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);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| @@ -11667,23 +6696,16 @@ void MethodOptions::SerializeWithCachedSizes(
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions)
|
| }
|
|
|
| ::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);
|
| - }
|
| -
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| - for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) {
|
| + for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| @@ -11693,22 +6715,16 @@ void MethodOptions::SerializeWithCachedSizes(
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions)
|
| return target;
|
| }
|
|
|
| int MethodOptions::ByteSize() const {
|
| 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++) {
|
| @@ -11719,7 +6735,7 @@ int MethodOptions::ByteSize() const {
|
|
|
| total_size += _extensions_.ByteSize();
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -11731,10 +6747,10 @@ int MethodOptions::ByteSize() const {
|
| }
|
|
|
| void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const MethodOptions* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const MethodOptions>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const MethodOptions* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const MethodOptions*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -11743,17 +6759,10 @@ void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void MethodOptions::MergeFrom(const MethodOptions& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| uninterpreted_option_.MergeFrom(from.uninterpreted_option_);
|
| - 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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -11770,22 +6779,21 @@ void MethodOptions::CopyFrom(const MethodOptions& from) {
|
|
|
| bool MethodOptions::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false;
|
| + for (int i = 0; i < uninterpreted_option_size(); i++) {
|
| + if (!this->uninterpreted_option(i).IsInitialized()) return false;
|
| + }
|
|
|
| if (!_extensions_.IsInitialized()) return false; return true;
|
| }
|
|
|
| void MethodOptions::Swap(MethodOptions* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -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_);
|
| + if (other != this) {
|
| + uninterpreted_option_.Swap(&other->uninterpreted_option_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + _extensions_.Swap(&other->_extensions_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata MethodOptions::GetMetadata() const {
|
| @@ -11796,64 +6804,6 @@ void MethodOptions::InternalSwap(MethodOptions* other) {
|
| return metadata;
|
| }
|
|
|
| -#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)
|
| -}
|
| -
|
| -// 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();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >&
|
| -MethodOptions::uninterpreted_option() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option)
|
| - return uninterpreted_option_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
|
| -MethodOptions::mutable_uninterpreted_option() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)
|
| - return &uninterpreted_option_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -11863,37 +6813,34 @@ const int UninterpretedOption_NamePart::kIsExtensionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| UninterpretedOption_NamePart::UninterpretedOption_NamePart()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart)
|
| }
|
|
|
| void UninterpretedOption_NamePart::InitAsDefaultInstance() {
|
| }
|
|
|
| UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart)
|
| }
|
|
|
| void UninterpretedOption_NamePart::SharedCtor() {
|
| - ::google::protobuf::internal::GetEmptyString();
|
| _cached_size_ = 0;
|
| - name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + name_part_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| is_extension_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| UninterpretedOption_NamePart::~UninterpretedOption_NamePart() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart)
|
| SharedDtor();
|
| }
|
|
|
| void UninterpretedOption_NamePart::SharedDtor() {
|
| - name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete name_part_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -11915,48 +6862,40 @@ const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instan
|
|
|
| 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;
|
| +UninterpretedOption_NamePart* UninterpretedOption_NamePart::New() const {
|
| + return new UninterpretedOption_NamePart;
|
| }
|
|
|
| void UninterpretedOption_NamePart::Clear() {
|
| - if (_has_bits_[0 / 32] & 3u) {
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| if (has_name_part()) {
|
| - name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (name_part_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + name_part_->clear();
|
| + }
|
| }
|
| is_extension_ = false;
|
| }
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool UninterpretedOption_NamePart::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // required string name_part = 1;
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_name_part()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name_part().data(), this->name_part().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.UninterpretedOption.NamePart.name_part");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(16)) goto parse_is_extension;
|
| break;
|
| @@ -11964,25 +6903,25 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream(
|
|
|
| // required bool is_extension = 2;
|
| case 2: {
|
| - if (tag == 16) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_is_extension:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &is_extension_)));
|
| set_has_is_extension();
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -11990,25 +6929,18 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -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(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name_part().data(), this->name_part().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.NamePart.name_part");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name_part(), output);
|
| }
|
|
|
| @@ -12017,22 +6949,19 @@ void UninterpretedOption_NamePart::SerializeWithCachedSizes(
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart)
|
| }
|
|
|
| ::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(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->name_part().data(), this->name_part().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.NamePart.name_part");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name_part(), target);
|
| @@ -12043,47 +6972,31 @@ void UninterpretedOption_NamePart::SerializeWithCachedSizes(
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart)
|
| return target;
|
| }
|
|
|
| -int UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const {
|
| - int 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_is_extension()) {
|
| - // required bool is_extension = 2;
|
| - total_size += 1 + 1;
|
| - }
|
| -
|
| - return total_size;
|
| -}
|
| int UninterpretedOption_NamePart::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present.
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // required string name_part = 1;
|
| - total_size += 1 +
|
| - ::google::protobuf::internal::WireFormatLite::StringSize(
|
| - this->name_part());
|
| + if (has_name_part()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->name_part());
|
| + }
|
|
|
| // required bool is_extension = 2;
|
| - total_size += 1 + 1;
|
| + if (has_is_extension()) {
|
| + total_size += 1 + 1;
|
| + }
|
|
|
| - } else {
|
| - total_size += RequiredFieldsByteSizeFallback();
|
| }
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -12095,10 +7008,10 @@ int UninterpretedOption_NamePart::ByteSize() const {
|
| }
|
|
|
| void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const UninterpretedOption_NamePart* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const UninterpretedOption_NamePart>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const UninterpretedOption_NamePart* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const UninterpretedOption_NamePart*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -12107,19 +7020,16 @@ void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message&
|
| }
|
|
|
| void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| 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_);
|
| + set_name_part(from.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());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -12141,15 +7051,13 @@ bool UninterpretedOption_NamePart::IsInitialized() const {
|
| }
|
|
|
| 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_);
|
| + if (other != this) {
|
| + std::swap(name_part_, other->name_part_);
|
| + std::swap(is_extension_, other->is_extension_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const {
|
| @@ -12174,43 +7082,44 @@ const int UninterpretedOption::kAggregateValueFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| UninterpretedOption::UninterpretedOption()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption)
|
| }
|
|
|
| void UninterpretedOption::InitAsDefaultInstance() {
|
| }
|
|
|
| UninterpretedOption::UninterpretedOption(const UninterpretedOption& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + identifier_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| 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());
|
| + string_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + aggregate_value_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| UninterpretedOption::~UninterpretedOption() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption)
|
| SharedDtor();
|
| }
|
|
|
| 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 (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete identifier_value_;
|
| + }
|
| + if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete string_value_;
|
| + }
|
| + if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete aggregate_value_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -12232,84 +7141,69 @@ const UninterpretedOption& UninterpretedOption::default_instance() {
|
|
|
| UninterpretedOption* UninterpretedOption::default_instance_ = NULL;
|
|
|
| -UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const {
|
| - UninterpretedOption* n = new UninterpretedOption;
|
| - if (arena != NULL) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +UninterpretedOption* UninterpretedOption::New() const {
|
| + return new UninterpretedOption;
|
| }
|
|
|
| void UninterpretedOption::Clear() {
|
| -#define ZR_HELPER_(f) reinterpret_cast<char*>(\
|
| - &reinterpret_cast<UninterpretedOption*>(16)->f)
|
| -
|
| -#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_bits_[1 / 32] & (0xffu << (1 % 32))) {
|
| if (has_identifier_value()) {
|
| - identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (identifier_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + identifier_value_->clear();
|
| + }
|
| }
|
| + positive_int_value_ = GOOGLE_ULONGLONG(0);
|
| + negative_int_value_ = GOOGLE_LONGLONG(0);
|
| + double_value_ = 0;
|
| if (has_string_value()) {
|
| - string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (string_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + string_value_->clear();
|
| + }
|
| }
|
| if (has_aggregate_value()) {
|
| - aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (aggregate_value_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + aggregate_value_->clear();
|
| + }
|
| }
|
| }
|
| -
|
| -#undef ZR_HELPER_
|
| -#undef ZR_
|
| -
|
| name_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool UninterpretedOption::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
|
| case 2: {
|
| - if (tag == 18) {
|
| - DO_(input->IncrementRecursionDepth());
|
| - parse_loop_name:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_name:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_name()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(18)) goto parse_loop_name;
|
| - input->UnsafeDecrementRecursionDepth();
|
| + if (input->ExpectTag(18)) goto parse_name;
|
| if (input->ExpectTag(26)) goto parse_identifier_value;
|
| break;
|
| }
|
|
|
| // optional string identifier_value = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_identifier_value:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_identifier_value()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->identifier_value().data(), this->identifier_value().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.UninterpretedOption.identifier_value");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(32)) goto parse_positive_int_value;
|
| break;
|
| @@ -12317,14 +7211,15 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
|
|
| // optional uint64 positive_int_value = 4;
|
| case 4: {
|
| - if (tag == 32) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(40)) goto parse_negative_int_value;
|
| break;
|
| @@ -12332,14 +7227,15 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
|
|
| // optional int64 negative_int_value = 5;
|
| case 5: {
|
| - if (tag == 40) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(49)) goto parse_double_value;
|
| break;
|
| @@ -12347,14 +7243,15 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
|
|
| // optional double double_value = 6;
|
| case 6: {
|
| - if (tag == 49) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
|
| 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;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(58)) goto parse_string_value;
|
| break;
|
| @@ -12362,12 +7259,13 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
|
|
| // optional bytes string_value = 7;
|
| case 7: {
|
| - if (tag == 58) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_string_value:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
|
| input, this->mutable_string_value()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(66)) goto parse_aggregate_value;
|
| break;
|
| @@ -12375,27 +7273,26 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
|
|
| // optional string aggregate_value = 8;
|
| case 8: {
|
| - if (tag == 66) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_aggregate_value:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_aggregate_value()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->aggregate_value().data(), this->aggregate_value().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.UninterpretedOption.aggregate_value");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -12403,31 +7300,24 @@ bool UninterpretedOption::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void UninterpretedOption::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption)
|
| // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
|
| - for (unsigned int i = 0, n = this->name_size(); i < n; i++) {
|
| + for (int i = 0; i < this->name_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->name(i), output);
|
| }
|
|
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->identifier_value().data(), this->identifier_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.identifier_value");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->identifier_value(), output);
|
| }
|
|
|
| @@ -12448,32 +7338,29 @@ void UninterpretedOption::SerializeWithCachedSizes(
|
|
|
| // optional bytes string_value = 7;
|
| if (has_string_value()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
|
| + ::google::protobuf::internal::WireFormatLite::WriteBytes(
|
| 7, this->string_value(), output);
|
| }
|
|
|
| // optional string aggregate_value = 8;
|
| if (has_aggregate_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->aggregate_value().data(), this->aggregate_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.aggregate_value");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 8, this->aggregate_value(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption)
|
| }
|
|
|
| ::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++) {
|
| + for (int i = 0; i < this->name_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 2, this->name(i), target);
|
| @@ -12481,10 +7368,9 @@ void UninterpretedOption::SerializeWithCachedSizes(
|
|
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->identifier_value().data(), this->identifier_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.identifier_value");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 3, this->identifier_value(), target);
|
| @@ -12514,27 +7400,25 @@ void UninterpretedOption::SerializeWithCachedSizes(
|
|
|
| // optional string aggregate_value = 8;
|
| if (has_aggregate_value()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->aggregate_value().data(), this->aggregate_value().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.UninterpretedOption.aggregate_value");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 8, this->aggregate_value(), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption)
|
| return target;
|
| }
|
|
|
| int UninterpretedOption::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[1 / 32] & 126u) {
|
| + if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| total_size += 1 +
|
| @@ -12584,7 +7468,7 @@ int UninterpretedOption::ByteSize() const {
|
| this->name(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -12596,10 +7480,10 @@ int UninterpretedOption::ByteSize() const {
|
| }
|
|
|
| void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const UninterpretedOption* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const UninterpretedOption>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const UninterpretedOption* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const UninterpretedOption*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -12608,12 +7492,11 @@ void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void UninterpretedOption::MergeFrom(const UninterpretedOption& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| name_.MergeFrom(from.name_);
|
| 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_);
|
| + set_identifier_value(from.identifier_value());
|
| }
|
| if (from.has_positive_int_value()) {
|
| set_positive_int_value(from.positive_int_value());
|
| @@ -12625,17 +7508,13 @@ void UninterpretedOption::MergeFrom(const UninterpretedOption& from) {
|
| 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_);
|
| + set_string_value(from.string_value());
|
| }
|
| if (from.has_aggregate_value()) {
|
| - set_has_aggregate_value();
|
| - aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_);
|
| + set_aggregate_value(from.aggregate_value());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void UninterpretedOption::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -12652,25 +7531,25 @@ void UninterpretedOption::CopyFrom(const UninterpretedOption& from) {
|
|
|
| bool UninterpretedOption::IsInitialized() const {
|
|
|
| - if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false;
|
| + for (int i = 0; i < name_size(); i++) {
|
| + if (!this->name(i).IsInitialized()) return false;
|
| + }
|
| return true;
|
| }
|
|
|
| void UninterpretedOption::Swap(UninterpretedOption* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -void UninterpretedOption::InternalSwap(UninterpretedOption* other) {
|
| - name_.UnsafeArenaSwap(&other->name_);
|
| - identifier_value_.Swap(&other->identifier_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_);
|
| + if (other != this) {
|
| + name_.Swap(&other->name_);
|
| + std::swap(identifier_value_, other->identifier_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_);
|
| + std::swap(string_value_, other->string_value_);
|
| + std::swap(aggregate_value_, other->aggregate_value_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata UninterpretedOption::GetMetadata() const {
|
| @@ -12681,352 +7560,6 @@ void UninterpretedOption::InternalSwap(UninterpretedOption* other) {
|
| 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() {
|
| - 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;
|
| -int UninterpretedOption::name_size() const {
|
| - return name_.size();
|
| -}
|
| -void UninterpretedOption::clear_name() {
|
| - name_.Clear();
|
| -}
|
| - const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name)
|
| - return name_.Get(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name)
|
| - return name_.Mutable(index);
|
| -}
|
| - ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name)
|
| - return name_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >&
|
| -UninterpretedOption::name() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name)
|
| - return name_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >*
|
| -UninterpretedOption::mutable_name() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name)
|
| - return &name_;
|
| -}
|
| -
|
| -// optional string identifier_value = 3;
|
| -bool UninterpretedOption::has_identifier_value() const {
|
| - return (_has_bits_[0] & 0x00000002u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_identifier_value() {
|
| - _has_bits_[0] |= 0x00000002u;
|
| -}
|
| -void UninterpretedOption::clear_has_identifier_value() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value)
|
| - return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_identifier_value();
|
| - return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) {
|
| - if (identifier_value != NULL) {
|
| - set_has_identifier_value();
|
| - } else {
|
| - clear_has_identifier_value();
|
| - }
|
| - identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value)
|
| -}
|
| -
|
| -// optional uint64 positive_int_value = 4;
|
| -bool UninterpretedOption::has_positive_int_value() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_positive_int_value() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void UninterpretedOption::clear_has_positive_int_value() {
|
| - _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 {
|
| - // @@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) {
|
| - set_has_positive_int_value();
|
| - positive_int_value_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)
|
| -}
|
| -
|
| -// optional int64 negative_int_value = 5;
|
| -bool UninterpretedOption::has_negative_int_value() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_negative_int_value() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void UninterpretedOption::clear_has_negative_int_value() {
|
| - _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 {
|
| - // @@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) {
|
| - set_has_negative_int_value();
|
| - negative_int_value_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)
|
| -}
|
| -
|
| -// optional double double_value = 6;
|
| -bool UninterpretedOption::has_double_value() const {
|
| - return (_has_bits_[0] & 0x00000010u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_double_value() {
|
| - _has_bits_[0] |= 0x00000010u;
|
| -}
|
| -void UninterpretedOption::clear_has_double_value() {
|
| - _has_bits_[0] &= ~0x00000010u;
|
| -}
|
| -void UninterpretedOption::clear_double_value() {
|
| - double_value_ = 0;
|
| - clear_has_double_value();
|
| -}
|
| - 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) {
|
| - set_has_double_value();
|
| - double_value_ = value;
|
| - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)
|
| -}
|
| -
|
| -// optional bytes string_value = 7;
|
| -bool UninterpretedOption::has_string_value() const {
|
| - return (_has_bits_[0] & 0x00000020u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_string_value() {
|
| - _has_bits_[0] |= 0x00000020u;
|
| -}
|
| -void UninterpretedOption::clear_has_string_value() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value)
|
| - return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_string_value();
|
| - return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void UninterpretedOption::set_allocated_string_value(::std::string* string_value) {
|
| - if (string_value != NULL) {
|
| - set_has_string_value();
|
| - } else {
|
| - clear_has_string_value();
|
| - }
|
| - string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value)
|
| -}
|
| -
|
| -// optional string aggregate_value = 8;
|
| -bool UninterpretedOption::has_aggregate_value() const {
|
| - return (_has_bits_[0] & 0x00000040u) != 0;
|
| -}
|
| -void UninterpretedOption::set_has_aggregate_value() {
|
| - _has_bits_[0] |= 0x00000040u;
|
| -}
|
| -void UninterpretedOption::clear_has_aggregate_value() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value)
|
| - return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_aggregate_value();
|
| - return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) {
|
| - if (aggregate_value != NULL) {
|
| - set_has_aggregate_value();
|
| - } else {
|
| - clear_has_aggregate_value();
|
| - }
|
| - aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value)
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // ===================================================================
|
|
|
| @@ -13035,42 +7568,40 @@ const int SourceCodeInfo_Location::kPathFieldNumber;
|
| const int SourceCodeInfo_Location::kSpanFieldNumber;
|
| const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber;
|
| const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber;
|
| -const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| SourceCodeInfo_Location::SourceCodeInfo_Location()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| 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) {
|
| + : ::google::protobuf::Message() {
|
| 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());
|
| + leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| + trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyString());
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| SourceCodeInfo_Location::~SourceCodeInfo_Location() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location)
|
| SharedDtor();
|
| }
|
|
|
| void SourceCodeInfo_Location::SharedDtor() {
|
| - leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete leading_comments_;
|
| + }
|
| + if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + delete trailing_comments_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -13092,54 +7623,50 @@ const SourceCodeInfo_Location& SourceCodeInfo_Location::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) {
|
| - arena->Own(n);
|
| - }
|
| - return n;
|
| +SourceCodeInfo_Location* SourceCodeInfo_Location::New() const {
|
| + return new SourceCodeInfo_Location;
|
| }
|
|
|
| void SourceCodeInfo_Location::Clear() {
|
| - if (_has_bits_[0 / 32] & 12u) {
|
| + if (_has_bits_[2 / 32] & (0xffu << (2 % 32))) {
|
| if (has_leading_comments()) {
|
| - leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (leading_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + leading_comments_->clear();
|
| + }
|
| }
|
| if (has_trailing_comments()) {
|
| - trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + if (trailing_comments_ != &::google::protobuf::internal::GetEmptyString()) {
|
| + trailing_comments_->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();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool SourceCodeInfo_Location::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::google::protobuf::uint32 tag;
|
| - // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location)
|
| - for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| - tag = p.first;
|
| - if (!p.second) goto handle_unusual;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| // repeated int32 path = 1 [packed = true];
|
| case 1: {
|
| - if (tag == 10) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, this->mutable_path())));
|
| - } else if (tag == 8) {
|
| + } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
|
| + == ::google::protobuf::internal::WireFormatLite::
|
| + WIRETYPE_VARINT) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| 1, 10, input, this->mutable_path())));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(18)) goto parse_span;
|
| break;
|
| @@ -13147,17 +7674,20 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(
|
|
|
| // repeated int32 span = 2 [packed = true];
|
| case 2: {
|
| - if (tag == 18) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_span:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, this->mutable_span())));
|
| - } else if (tag == 16) {
|
| + } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
|
| + == ::google::protobuf::internal::WireFormatLite::
|
| + WIRETYPE_VARINT) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| 1, 18, input, this->mutable_span())));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(26)) goto parse_leading_comments;
|
| break;
|
| @@ -13165,16 +7695,16 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(
|
|
|
| // optional string leading_comments = 3;
|
| case 3: {
|
| - if (tag == 26) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_leading_comments:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_leading_comments()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->leading_comments().data(), this->leading_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_comments");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| if (input->ExpectTag(34)) goto parse_trailing_comments;
|
| break;
|
| @@ -13182,46 +7712,26 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(
|
|
|
| // optional string trailing_comments = 4;
|
| case 4: {
|
| - if (tag == 34) {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| parse_trailing_comments:
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_trailing_comments()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->trailing_comments().data(), this->trailing_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.SourceCodeInfo.Location.trailing_comments");
|
| - } else {
|
| - goto handle_unusual;
|
| - }
|
| - if (input->ExpectTag(50)) goto parse_leading_detached_comments;
|
| - break;
|
| - }
|
| -
|
| - // repeated string leading_detached_comments = 6;
|
| - case 6: {
|
| - if (tag == 50) {
|
| - parse_leading_detached_comments:
|
| - DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| - input, this->add_leading_detached_comments()));
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->leading_detached_comments(this->leading_detached_comments_size() - 1).data(),
|
| - this->leading_detached_comments(this->leading_detached_comments_size() - 1).length(),
|
| - ::google::protobuf::internal::WireFormat::PARSE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(50)) goto parse_leading_detached_comments;
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -13229,18 +7739,12 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -success:
|
| - // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo.Location)
|
| return true;
|
| -failure:
|
| - // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo.Location)
|
| - return false;
|
| #undef DO_
|
| }
|
|
|
| void SourceCodeInfo_Location::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| - // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo.Location)
|
| // repeated int32 path = 1 [packed = true];
|
| if (this->path_size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
|
| @@ -13263,44 +7767,30 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes(
|
|
|
| // optional string leading_comments = 3;
|
| if (has_leading_comments()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->leading_comments().data(), this->leading_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_comments");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->leading_comments(), output);
|
| }
|
|
|
| // optional string trailing_comments = 4;
|
| if (has_trailing_comments()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->trailing_comments().data(), this->trailing_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.trailing_comments");
|
| - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
|
| - 4, this->trailing_comments(), output);
|
| - }
|
| -
|
| - // repeated string leading_detached_comments = 6;
|
| - for (int i = 0; i < this->leading_detached_comments_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| - 6, this->leading_detached_comments(i), output);
|
| + 4, this->trailing_comments(), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| }
|
| - // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location)
|
| }
|
|
|
| ::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) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
|
| @@ -13331,10 +7821,9 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes(
|
|
|
| // optional string leading_comments = 3;
|
| if (has_leading_comments()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->leading_comments().data(), this->leading_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_comments");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 3, this->leading_comments(), target);
|
| @@ -13342,37 +7831,25 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes(
|
|
|
| // optional string trailing_comments = 4;
|
| if (has_trailing_comments()) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| this->trailing_comments().data(), this->trailing_comments().length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.trailing_comments");
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 4, this->trailing_comments(), target);
|
| }
|
|
|
| - // repeated string leading_detached_comments = 6;
|
| - for (int i = 0; i < this->leading_detached_comments_size(); i++) {
|
| - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
|
| - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(),
|
| - ::google::protobuf::internal::WireFormat::SERIALIZE,
|
| - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
|
| - target = ::google::protobuf::internal::WireFormatLite::
|
| - WriteStringToArray(6, this->leading_detached_comments(i), target);
|
| - }
|
| -
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location)
|
| return target;
|
| }
|
|
|
| int SourceCodeInfo_Location::ByteSize() const {
|
| int total_size = 0;
|
|
|
| - if (_has_bits_[2 / 32] & 12u) {
|
| + if (_has_bits_[2 / 32] & (0xffu << (2 % 32))) {
|
| // optional string leading_comments = 3;
|
| if (has_leading_comments()) {
|
| total_size += 1 +
|
| @@ -13422,14 +7899,7 @@ int SourceCodeInfo_Location::ByteSize() const {
|
| total_size += data_size;
|
| }
|
|
|
| - // repeated string leading_detached_comments = 6;
|
| - 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 (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -13441,10 +7911,10 @@ int SourceCodeInfo_Location::ByteSize() const {
|
| }
|
|
|
| void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const SourceCodeInfo_Location* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const SourceCodeInfo_Location>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const SourceCodeInfo_Location* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const SourceCodeInfo_Location*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -13453,23 +7923,18 @@ void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from)
|
| }
|
|
|
| void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| path_.MergeFrom(from.path_);
|
| span_.MergeFrom(from.span_);
|
| - leading_detached_comments_.MergeFrom(from.leading_detached_comments_);
|
| 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_);
|
| + set_leading_comments(from.leading_comments());
|
| }
|
| if (from.has_trailing_comments()) {
|
| - set_has_trailing_comments();
|
| - trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_);
|
| + set_trailing_comments(from.trailing_comments());
|
| }
|
| }
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -13490,18 +7955,15 @@ bool SourceCodeInfo_Location::IsInitialized() const {
|
| }
|
|
|
| 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_);
|
| + if (other != this) {
|
| + path_.Swap(&other->path_);
|
| + span_.Swap(&other->span_);
|
| + std::swap(leading_comments_, other->leading_comments_);
|
| + std::swap(trailing_comments_, other->trailing_comments_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const {
|
| @@ -13520,20 +7982,17 @@ const int SourceCodeInfo::kLocationFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| SourceCodeInfo::SourceCodeInfo()
|
| - : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| - // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo)
|
| }
|
|
|
| void SourceCodeInfo::InitAsDefaultInstance() {
|
| }
|
|
|
| SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from)
|
| - : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL) {
|
| + : ::google::protobuf::Message() {
|
| SharedCtor();
|
| MergeFrom(from);
|
| - // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo)
|
| }
|
|
|
| void SourceCodeInfo::SharedCtor() {
|
| @@ -13542,7 +8001,6 @@ void SourceCodeInfo::SharedCtor() {
|
| }
|
|
|
| SourceCodeInfo::~SourceCodeInfo() {
|
| - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo)
|
| SharedDtor();
|
| }
|
|
|
| @@ -13568,54 +8026,42 @@ const SourceCodeInfo& SourceCodeInfo::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;
|
| +SourceCodeInfo* SourceCodeInfo::New() const {
|
| + return new SourceCodeInfo;
|
| }
|
|
|
| void SourceCodeInfo::Clear() {
|
| location_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->Clear();
|
| - }
|
| + mutable_unknown_fields()->Clear();
|
| }
|
|
|
| bool SourceCodeInfo::MergePartialFromCodedStream(
|
| ::google::protobuf::io::CodedInputStream* input) {
|
| -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
|
| +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
|
| ::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;
|
| + while ((tag = input->ReadTag()) != 0) {
|
| 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(
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
|
| + parse_location:
|
| + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
|
| input, add_location()));
|
| } else {
|
| - goto handle_unusual;
|
| + goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(10)) goto parse_loop_location;
|
| - input->UnsafeDecrementRecursionDepth();
|
| - if (input->ExpectAtEnd()) goto success;
|
| + if (input->ExpectTag(10)) goto parse_location;
|
| + if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
|
|
| default: {
|
| - handle_unusual:
|
| - if (tag == 0 ||
|
| - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| + handle_uninterpreted:
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| - goto success;
|
| + return true;
|
| }
|
| DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| input, tag, mutable_unknown_fields()));
|
| @@ -13623,46 +8069,37 @@ bool SourceCodeInfo::MergePartialFromCodedStream(
|
| }
|
| }
|
| }
|
| -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++) {
|
| + for (int i = 0; i < this->location_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 1, this->location(i), output);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::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++) {
|
| + for (int i = 0; i < this->location_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 1, this->location(i), target);
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| }
|
| - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo)
|
| return target;
|
| }
|
|
|
| @@ -13677,7 +8114,7 @@ int SourceCodeInfo::ByteSize() const {
|
| this->location(i));
|
| }
|
|
|
| - if (_internal_metadata_.have_unknown_fields()) {
|
| + if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| unknown_fields());
|
| @@ -13689,10 +8126,10 @@ int SourceCodeInfo::ByteSize() const {
|
| }
|
|
|
| void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| - const SourceCodeInfo* source =
|
| - ::google::protobuf::internal::DynamicCastToGenerated<const SourceCodeInfo>(
|
| - &from);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| + const SourceCodeInfo* source =
|
| + ::google::protobuf::internal::dynamic_cast_if_available<const SourceCodeInfo*>(
|
| + &from);
|
| if (source == NULL) {
|
| ::google::protobuf::internal::ReflectionOps::Merge(from, this);
|
| } else {
|
| @@ -13701,11 +8138,9 @@ void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) {
|
| }
|
|
|
| void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) {
|
| - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + GOOGLE_CHECK_NE(&from, this);
|
| location_.MergeFrom(from.location_);
|
| - if (from._internal_metadata_.have_unknown_fields()) {
|
| - mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| - }
|
| + mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) {
|
| @@ -13726,14 +8161,12 @@ bool SourceCodeInfo::IsInitialized() const {
|
| }
|
|
|
| void SourceCodeInfo::Swap(SourceCodeInfo* other) {
|
| - if (other == this) return;
|
| - InternalSwap(other);
|
| -}
|
| -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_);
|
| + if (other != this) {
|
| + location_.Swap(&other->location_);
|
| + std::swap(_has_bits_[0], other->_has_bits_[0]);
|
| + _unknown_fields_.Swap(&other->_unknown_fields_);
|
| + std::swap(_cached_size_, other->_cached_size_);
|
| + }
|
| }
|
|
|
| ::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const {
|
| @@ -13744,264 +8177,6 @@ void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) {
|
| return metadata;
|
| }
|
|
|
| -#if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| -// SourceCodeInfo_Location
|
| -
|
| -// repeated int32 path = 1 [packed = true];
|
| -int SourceCodeInfo_Location::path_size() const {
|
| - return path_.size();
|
| -}
|
| -void SourceCodeInfo_Location::clear_path() {
|
| - path_.Clear();
|
| -}
|
| - ::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) {
|
| - path_.Set(index, value);
|
| - // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path)
|
| -}
|
| - 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 >&
|
| -SourceCodeInfo_Location::path() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path)
|
| - return path_;
|
| -}
|
| - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| -SourceCodeInfo_Location::mutable_path() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path)
|
| - return &path_;
|
| -}
|
| -
|
| -// repeated int32 span = 2 [packed = true];
|
| -int SourceCodeInfo_Location::span_size() const {
|
| - return span_.size();
|
| -}
|
| -void SourceCodeInfo_Location::clear_span() {
|
| - span_.Clear();
|
| -}
|
| - ::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) {
|
| - span_.Set(index, value);
|
| - // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span)
|
| -}
|
| - 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 >&
|
| -SourceCodeInfo_Location::span() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span)
|
| - return span_;
|
| -}
|
| - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
|
| -SourceCodeInfo_Location::mutable_span() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span)
|
| - return &span_;
|
| -}
|
| -
|
| -// optional string leading_comments = 3;
|
| -bool SourceCodeInfo_Location::has_leading_comments() const {
|
| - return (_has_bits_[0] & 0x00000004u) != 0;
|
| -}
|
| -void SourceCodeInfo_Location::set_has_leading_comments() {
|
| - _has_bits_[0] |= 0x00000004u;
|
| -}
|
| -void SourceCodeInfo_Location::clear_has_leading_comments() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| - return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - clear_has_leading_comments();
|
| - return leading_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) {
|
| - if (leading_comments != NULL) {
|
| - set_has_leading_comments();
|
| - } else {
|
| - clear_has_leading_comments();
|
| - }
|
| - leading_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), leading_comments);
|
| - // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.leading_comments)
|
| -}
|
| -
|
| -// optional string trailing_comments = 4;
|
| -bool SourceCodeInfo_Location::has_trailing_comments() const {
|
| - return (_has_bits_[0] & 0x00000008u) != 0;
|
| -}
|
| -void SourceCodeInfo_Location::set_has_trailing_comments() {
|
| - _has_bits_[0] |= 0x00000008u;
|
| -}
|
| -void SourceCodeInfo_Location::clear_has_trailing_comments() {
|
| - _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 {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments)
|
| - return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| -}
|
| - 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) {
|
| - 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) {
|
| - 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() {
|
| - 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() {
|
| - 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() {
|
| - 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_;
|
| -}
|
| -
|
| -// -------------------------------------------------------------------
|
| -
|
| -// SourceCodeInfo
|
| -
|
| -// repeated .google.protobuf.SourceCodeInfo.Location location = 1;
|
| -int SourceCodeInfo::location_size() const {
|
| - return location_.size();
|
| -}
|
| -void SourceCodeInfo::clear_location() {
|
| - location_.Clear();
|
| -}
|
| - const ::google::protobuf::SourceCodeInfo_Location& SourceCodeInfo::location(int index) const {
|
| - // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.location)
|
| - return location_.Get(index);
|
| -}
|
| - ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::mutable_location(int index) {
|
| - // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.location)
|
| - return location_.Mutable(index);
|
| -}
|
| - ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::add_location() {
|
| - // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.location)
|
| - return location_.Add();
|
| -}
|
| - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >&
|
| -SourceCodeInfo::location() const {
|
| - // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.location)
|
| - return location_;
|
| -}
|
| - ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >*
|
| -SourceCodeInfo::mutable_location() {
|
| - // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.location)
|
| - return &location_;
|
| -}
|
| -
|
| -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS
|
|
|
| // @@protoc_insertion_point(namespace_scope)
|
|
|
|
|
Chromium Code Reviews
Issue 1322483002:
Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master