| Index: third_party/protobuf/src/google/protobuf/descriptor.pb.cc
|
| ===================================================================
|
| --- third_party/protobuf/src/google/protobuf/descriptor.pb.cc (revision 216642)
|
| +++ third_party/protobuf/src/google/protobuf/descriptor.pb.cc (working copy)
|
| @@ -1,14 +1,17 @@
|
| // Generated by the protocol buffer compiler. DO NOT EDIT!
|
| +// source: google/protobuf/descriptor.proto
|
|
|
| #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
|
| #include "google/protobuf/descriptor.pb.h"
|
|
|
| #include <algorithm>
|
|
|
| +#include <google/protobuf/stubs/common.h>
|
| #include <google/protobuf/stubs/once.h>
|
| #include <google/protobuf/io/coded_stream.h>
|
| #include <google/protobuf/wire_format_lite_inl.h>
|
| #include <google/protobuf/descriptor.h>
|
| +#include <google/protobuf/generated_message_reflection.h>
|
| #include <google/protobuf/reflection_ops.h>
|
| #include <google/protobuf/wire_format.h>
|
| // @@protoc_insertion_point(includes)
|
| @@ -108,10 +111,12 @@
|
| ::google::protobuf::MessageFactory::generated_factory(),
|
| sizeof(FileDescriptorSet));
|
| FileDescriptorProto_descriptor_ = file->message_type(1);
|
| - static const int FileDescriptorProto_offsets_[9] = {
|
| + 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_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, public_dependency_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, weak_dependency_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, message_type_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, enum_type_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, service_),
|
| @@ -261,13 +266,14 @@
|
| ::google::protobuf::MessageFactory::generated_factory(),
|
| sizeof(MethodDescriptorProto));
|
| FileOptions_descriptor_ = file->message_type(8);
|
| - static const int FileOptions_offsets_[10] = {
|
| + 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, 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_),
|
| @@ -303,11 +309,13 @@
|
| ::google::protobuf::MessageFactory::generated_factory(),
|
| sizeof(MessageOptions));
|
| FieldOptions_descriptor_ = file->message_type(10);
|
| - static const int FieldOptions_offsets_[5] = {
|
| + 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, 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_ =
|
| @@ -323,7 +331,8 @@
|
| sizeof(FieldOptions));
|
| FieldOptions_CType_descriptor_ = FieldOptions_descriptor_->enum_type(0);
|
| EnumOptions_descriptor_ = file->message_type(11);
|
| - static const int EnumOptions_offsets_[1] = {
|
| + static const int EnumOptions_offsets_[2] = {
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, allow_alias_),
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, uninterpreted_option_),
|
| };
|
| EnumOptions_reflection_ =
|
| @@ -435,9 +444,11 @@
|
| ::google::protobuf::MessageFactory::generated_factory(),
|
| sizeof(SourceCodeInfo));
|
| SourceCodeInfo_Location_descriptor_ = SourceCodeInfo_descriptor_->nested_type(0);
|
| - static const int SourceCodeInfo_Location_offsets_[2] = {
|
| + 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_),
|
| };
|
| SourceCodeInfo_Location_reflection_ =
|
| new ::google::protobuf::internal::GeneratedMessageReflection(
|
| @@ -554,107 +565,113 @@
|
| if (already_here) return;
|
| already_here = true;
|
| GOOGLE_PROTOBUF_VERIFY_VERSION;
|
| +
|
| ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
|
| "\n google/protobuf/descriptor.proto\022\017goog"
|
| "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file"
|
| "\030\001 \003(\0132$.google.protobuf.FileDescriptorP"
|
| - "roto\"\227\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"
|
| - "6\n\014message_type\030\004 \003(\0132 .google.protobuf."
|
| - "DescriptorProto\0227\n\tenum_type\030\005 \003(\0132$.goo"
|
| - "gle.protobuf.EnumDescriptorProto\0228\n\007serv"
|
| - "ice\030\006 \003(\0132\'.google.protobuf.ServiceDescr"
|
| - "iptorProto\0228\n\textension\030\007 \003(\0132%.google.p"
|
| - "rotobuf.FieldDescriptorProto\022-\n\007options\030"
|
| - "\010 \001(\0132\034.google.protobuf.FileOptions\0229\n\020s"
|
| - "ource_code_info\030\t \001(\0132\037.google.protobuf."
|
| - "SourceCodeInfo\"\251\003\n\017DescriptorProto\022\014\n\004na"
|
| - "me\030\001 \001(\t\0224\n\005field\030\002 \003(\0132%.google.protobu"
|
| - "f.FieldDescriptorProto\0228\n\textension\030\006 \003("
|
| + "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen"
|
| + "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog"
|
| + "le.protobuf.DescriptorProto\0227\n\tenum_type"
|
| + "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP"
|
| + "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf."
|
| + "ServiceDescriptorProto\0228\n\textension\030\007 \003("
|
| "\0132%.google.protobuf.FieldDescriptorProto"
|
| - "\0225\n\013nested_type\030\003 \003(\0132 .google.protobuf."
|
| - "DescriptorProto\0227\n\tenum_type\030\004 \003(\0132$.goo"
|
| - "gle.protobuf.EnumDescriptorProto\022H\n\017exte"
|
| - "nsion_range\030\005 \003(\0132/.google.protobuf.Desc"
|
| - "riptorProto.ExtensionRange\0220\n\007options\030\007 "
|
| - "\001(\0132\037.google.protobuf.MessageOptions\032,\n\016"
|
| - "ExtensionRange\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+.googl"
|
| - "e.protobuf.FieldDescriptorProto.Label\0228\n"
|
| - "\004type\030\005 \001(\0162*.google.protobuf.FieldDescr"
|
| - "iptorProto.Type\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010ex"
|
| - "tendee\030\002 \001(\t\022\025\n\rdefault_value\030\007 \001(\t\022.\n\007o"
|
| - "ptions\030\010 \001(\0132\035.google.protobuf.FieldOpti"
|
| - "ons\"\266\002\n\004Type\022\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FL"
|
| - "OAT\020\002\022\016\n\nTYPE_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016"
|
| - "\n\nTYPE_INT32\020\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE"
|
| - "_FIXED32\020\007\022\r\n\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING"
|
| - "\020\t\022\016\n\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\n"
|
| - "TYPE_BYTES\020\014\022\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_EN"
|
| - "UM\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_SINT64\020\022\"C\n\005"
|
| - "Label\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LABEL_REQUI"
|
| - "RED\020\002\022\022\n\016LABEL_REPEATED\020\003\"\214\001\n\023EnumDescri"
|
| - "ptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132)"
|
| - ".google.protobuf.EnumValueDescriptorProt"
|
| - "o\022-\n\007options\030\003 \001(\0132\034.google.protobuf.Enu"
|
| - "mOptions\"l\n\030EnumValueDescriptorProto\022\014\n\004"
|
| - "name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 "
|
| - "\001(\0132!.google.protobuf.EnumValueOptions\"\220"
|
| - "\001\n\026ServiceDescriptorProto\022\014\n\004name\030\001 \001(\t\022"
|
| - "6\n\006method\030\002 \003(\0132&.google.protobuf.Method"
|
| - "DescriptorProto\0220\n\007options\030\003 \001(\0132\037.googl"
|
| - "e.protobuf.ServiceOptions\"\177\n\025MethodDescr"
|
| - "iptorProto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002"
|
| - " \001(\t\022\023\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001"
|
| - "(\0132\036.google.protobuf.MethodOptions\"\373\003\n\013F"
|
| - "ileOptions\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_fie"
|
| - "lds\030\013 \001(\010:\005false\022,\n\035java_generate_equals"
|
| - "_and_hash\030\024 \001(\010:\005false\022F\n\014optimize_for\030\t"
|
| - " \001(\0162).google.protobuf.FileOptions.Optim"
|
| - "izeMode:\005SPEED\022\"\n\023cc_generic_services\030\020 "
|
| - "\001(\010:\005false\022$\n\025java_generic_services\030\021 \001("
|
| - "\010:\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005f"
|
| - "alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go"
|
| - "ogle.protobuf.UninterpretedOption\":\n\014Opt"
|
| - "imizeMode\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014L"
|
| - "ITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002\"\270\001\n\016MessageOpti"
|
| - "ons\022&\n\027message_set_wire_format\030\001 \001(\010:\005fa"
|
| - "lse\022.\n\037no_standard_descriptor_accessor\030\002"
|
| - " \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003"
|
| - "(\0132$.google.protobuf.UninterpretedOption"
|
| - "*\t\010\350\007\020\200\200\200\200\002\"\224\002\n\014FieldOptions\022:\n\005ctype\030\001 "
|
| - "\001(\0162#.google.protobuf.FieldOptions.CType"
|
| - ":\006STRING\022\016\n\006packed\030\002 \001(\010\022\031\n\ndeprecated\030\003"
|
| - " \001(\010:\005false\022\034\n\024experimental_map_key\030\t \001("
|
| - "\t\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl"
|
| - "e.protobuf.UninterpretedOption\"/\n\005CType\022"
|
| - "\n\n\006STRING\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\"]\n\013EnumOptions\022C\n\024uninterpret"
|
| - "ed_option\030\347\007 \003(\0132$.google.protobuf.Unint"
|
| - "erpretedOption*\t\010\350\007\020\200\200\200\200\002\"b\n\020EnumValueOp"
|
| - "tions\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.g"
|
| - "oogle.protobuf.UninterpretedOption*\t\010\350\007\020"
|
| - "\200\200\200\200\002\"`\n\016ServiceOptions\022C\n\024uninterpreted"
|
| - "_option\030\347\007 \003(\0132$.google.protobuf.Uninter"
|
| - "pretedOption*\t\010\350\007\020\200\200\200\200\002\"_\n\rMethodOptions"
|
| - "\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.google"
|
| - ".protobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002"
|
| - "\"\236\002\n\023UninterpretedOption\022;\n\004name\030\002 \003(\0132-"
|
| - ".google.protobuf.UninterpretedOption.Nam"
|
| - "ePart\022\030\n\020identifier_value\030\003 \001(\t\022\032\n\022posit"
|
| - "ive_int_value\030\004 \001(\004\022\032\n\022negative_int_valu"
|
| - "e\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\010"
|
| - "NamePart\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extens"
|
| - "ion\030\002 \002(\010\"|\n\016SourceCodeInfo\022:\n\010location\030"
|
| - "\001 \003(\0132(.google.protobuf.SourceCodeInfo.L"
|
| - "ocation\032.\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n"
|
| - "\004span\030\002 \003(\005B\002\020\001B)\n\023com.google.protobufB\020"
|
| - "DescriptorProtosH\001", 3978);
|
| + "\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\"\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();
|
| @@ -788,14 +805,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -811,7 +829,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 1, this->file(i), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -826,7 +844,7 @@
|
| WriteMessageNoVirtualToArray(
|
| 1, this->file(i), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -836,7 +854,7 @@
|
|
|
| int FileDescriptorSet::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| // repeated .google.protobuf.FileDescriptorProto file = 1;
|
| total_size += 1 * this->file_size();
|
| for (int i = 0; i < this->file_size(); i++) {
|
| @@ -844,7 +862,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->file(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -887,7 +905,7 @@
|
| }
|
|
|
| bool FileDescriptorSet::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < file_size(); i++) {
|
| if (!this->file(i).IsInitialized()) return false;
|
| }
|
| @@ -918,6 +936,8 @@
|
| const int FileDescriptorProto::kNameFieldNumber;
|
| const int FileDescriptorProto::kPackageFieldNumber;
|
| const int FileDescriptorProto::kDependencyFieldNumber;
|
| +const int FileDescriptorProto::kPublicDependencyFieldNumber;
|
| +const int FileDescriptorProto::kWeakDependencyFieldNumber;
|
| const int FileDescriptorProto::kMessageTypeFieldNumber;
|
| const int FileDescriptorProto::kEnumTypeFieldNumber;
|
| const int FileDescriptorProto::kServiceFieldNumber;
|
| @@ -1001,16 +1021,18 @@
|
| package_->clear();
|
| }
|
| }
|
| + }
|
| + if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| if (has_options()) {
|
| if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear();
|
| }
|
| - }
|
| - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| if (has_source_code_info()) {
|
| if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear();
|
| }
|
| }
|
| dependency_.Clear();
|
| + public_dependency_.Clear();
|
| + weak_dependency_.Clear();
|
| message_type_.Clear();
|
| enum_type_.Clear();
|
| service_.Clear();
|
| @@ -1040,7 +1062,7 @@
|
| if (input->ExpectTag(18)) goto parse_package;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string package = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1057,7 +1079,7 @@
|
| if (input->ExpectTag(26)) goto parse_dependency;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated string dependency = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1076,7 +1098,7 @@
|
| if (input->ExpectTag(34)) goto parse_message_type;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| case 4: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1091,7 +1113,7 @@
|
| if (input->ExpectTag(42)) goto parse_enum_type;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| case 5: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1106,7 +1128,7 @@
|
| if (input->ExpectTag(50)) goto parse_service;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| case 6: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1121,7 +1143,7 @@
|
| if (input->ExpectTag(58)) goto parse_extension;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| case 7: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1136,7 +1158,7 @@
|
| if (input->ExpectTag(66)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions options = 8;
|
| case 8: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1150,7 +1172,7 @@
|
| if (input->ExpectTag(74)) goto parse_source_code_info;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
|
| case 9: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1161,17 +1183,62 @@
|
| } else {
|
| goto handle_uninterpreted;
|
| }
|
| + if (input->ExpectTag(80)) goto parse_public_dependency;
|
| + break;
|
| + }
|
| +
|
| + // repeated int32 public_dependency = 10;
|
| + case 10: {
|
| + 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 (::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_uninterpreted;
|
| + }
|
| + if (input->ExpectTag(80)) goto parse_public_dependency;
|
| + if (input->ExpectTag(88)) goto parse_weak_dependency;
|
| + break;
|
| + }
|
| +
|
| + // repeated int32 weak_dependency = 11;
|
| + case 11: {
|
| + if (::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 (::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_uninterpreted;
|
| + }
|
| + if (input->ExpectTag(88)) goto parse_weak_dependency;
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -1190,7 +1257,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // optional string package = 2;
|
| if (has_package()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -1199,7 +1266,7 @@
|
| ::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::VerifyUTF8String(
|
| @@ -1208,43 +1275,55 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->dependency(i), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| 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 (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 (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 (int i = 0; i < this->extension_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 7, this->extension(i), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions options = 8;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 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);
|
| }
|
| -
|
| +
|
| + // repeated int32 public_dependency = 10;
|
| + for (int i = 0; i < this->public_dependency_size(); i++) {
|
| + ::google::protobuf::internal::WireFormatLite::WriteInt32(
|
| + 10, this->public_dependency(i), output);
|
| + }
|
| +
|
| + // repeated int32 weak_dependency = 11;
|
| + for (int i = 0; i < this->weak_dependency_size(); i++) {
|
| + ::google::protobuf::internal::WireFormatLite::WriteInt32(
|
| + 11, this->weak_dependency(i), output);
|
| + }
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -1262,7 +1341,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // optional string package = 2;
|
| if (has_package()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -1272,7 +1351,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 2, this->package(), target);
|
| }
|
| -
|
| +
|
| // repeated string dependency = 3;
|
| for (int i = 0; i < this->dependency_size(); i++) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -1281,49 +1360,61 @@
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteStringToArray(3, this->dependency(i), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| 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 (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 (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 (int i = 0; i < this->extension_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 7, this->extension(i), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions options = 8;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 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);
|
| }
|
| -
|
| +
|
| + // repeated int32 public_dependency = 10;
|
| + for (int i = 0; i < this->public_dependency_size(); i++) {
|
| + target = ::google::protobuf::internal::WireFormatLite::
|
| + WriteInt32ToArray(10, this->public_dependency(i), target);
|
| + }
|
| +
|
| + // repeated int32 weak_dependency = 11;
|
| + for (int i = 0; i < this->weak_dependency_size(); i++) {
|
| + target = ::google::protobuf::internal::WireFormatLite::
|
| + WriteInt32ToArray(11, this->weak_dependency(i), target);
|
| + }
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -1333,7 +1424,7 @@
|
|
|
| int FileDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -1341,30 +1432,30 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional string package = 2;
|
| if (has_package()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->package());
|
| }
|
| -
|
| +
|
| + }
|
| + if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| // optional .google.protobuf.FileOptions options = 8;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| - }
|
| - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| +
|
| // 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());
|
| }
|
| -
|
| +
|
| }
|
| // repeated string dependency = 3;
|
| total_size += 1 * this->dependency_size();
|
| @@ -1372,7 +1463,27 @@
|
| total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->dependency(i));
|
| }
|
| -
|
| +
|
| + // repeated int32 public_dependency = 10;
|
| + {
|
| + int data_size = 0;
|
| + for (int i = 0; i < this->public_dependency_size(); i++) {
|
| + data_size += ::google::protobuf::internal::WireFormatLite::
|
| + Int32Size(this->public_dependency(i));
|
| + }
|
| + total_size += 1 * this->public_dependency_size() + data_size;
|
| + }
|
| +
|
| + // repeated int32 weak_dependency = 11;
|
| + {
|
| + int data_size = 0;
|
| + for (int i = 0; i < this->weak_dependency_size(); i++) {
|
| + data_size += ::google::protobuf::internal::WireFormatLite::
|
| + Int32Size(this->weak_dependency(i));
|
| + }
|
| + total_size += 1 * this->weak_dependency_size() + data_size;
|
| + }
|
| +
|
| // repeated .google.protobuf.DescriptorProto message_type = 4;
|
| total_size += 1 * this->message_type_size();
|
| for (int i = 0; i < this->message_type_size(); i++) {
|
| @@ -1380,7 +1491,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->message_type(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
|
| total_size += 1 * this->enum_type_size();
|
| for (int i = 0; i < this->enum_type_size(); i++) {
|
| @@ -1388,7 +1499,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->enum_type(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.ServiceDescriptorProto service = 6;
|
| total_size += 1 * this->service_size();
|
| for (int i = 0; i < this->service_size(); i++) {
|
| @@ -1396,7 +1507,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->service(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 7;
|
| total_size += 1 * this->extension_size();
|
| for (int i = 0; i < this->extension_size(); i++) {
|
| @@ -1404,7 +1515,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->extension(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -1431,6 +1542,8 @@
|
| void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) {
|
| GOOGLE_CHECK_NE(&from, this);
|
| dependency_.MergeFrom(from.dependency_);
|
| + public_dependency_.MergeFrom(from.public_dependency_);
|
| + weak_dependency_.MergeFrom(from.weak_dependency_);
|
| message_type_.MergeFrom(from.message_type_);
|
| enum_type_.MergeFrom(from.enum_type_);
|
| service_.MergeFrom(from.service_);
|
| @@ -1442,11 +1555,11 @@
|
| if (from.has_package()) {
|
| set_package(from.package());
|
| }
|
| + }
|
| + if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
|
| if (from.has_options()) {
|
| mutable_options()->::google::protobuf::FileOptions::MergeFrom(from.options());
|
| }
|
| - }
|
| - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| if (from.has_source_code_info()) {
|
| mutable_source_code_info()->::google::protobuf::SourceCodeInfo::MergeFrom(from.source_code_info());
|
| }
|
| @@ -1467,7 +1580,7 @@
|
| }
|
|
|
| bool FileDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < message_type_size(); i++) {
|
| if (!this->message_type(i).IsInitialized()) return false;
|
| }
|
| @@ -1491,6 +1604,8 @@
|
| 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_);
|
| @@ -1599,7 +1714,7 @@
|
| if (input->ExpectTag(16)) goto parse_end;
|
| break;
|
| }
|
| -
|
| +
|
| // optional int32 end = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1615,14 +1730,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -1637,12 +1753,12 @@
|
| 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 (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -1655,12 +1771,12 @@
|
| 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 (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -1670,7 +1786,7 @@
|
|
|
| int DescriptorProto_ExtensionRange::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional int32 start = 1;
|
| if (has_start()) {
|
| @@ -1678,14 +1794,14 @@
|
| ::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 (!unknown_fields().empty()) {
|
| total_size +=
|
| @@ -1736,7 +1852,7 @@
|
| }
|
|
|
| bool DescriptorProto_ExtensionRange::IsInitialized() const {
|
| -
|
| +
|
| return true;
|
| }
|
|
|
| @@ -1868,7 +1984,7 @@
|
| if (input->ExpectTag(18)) goto parse_field;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1883,7 +1999,7 @@
|
| if (input->ExpectTag(26)) goto parse_nested_type;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1898,7 +2014,7 @@
|
| if (input->ExpectTag(34)) goto parse_enum_type;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| case 4: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1913,7 +2029,7 @@
|
| if (input->ExpectTag(42)) goto parse_extension_range;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| case 5: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1928,7 +2044,7 @@
|
| if (input->ExpectTag(50)) goto parse_extension;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| case 6: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1943,7 +2059,7 @@
|
| if (input->ExpectTag(58)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| case 7: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -1957,14 +2073,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -1983,43 +2100,43 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| 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 (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 (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 (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 (int i = 0; i < this->extension_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 6, this->extension(i), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 7, this->options(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -2037,49 +2154,49 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| 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 (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 (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 (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 (int i = 0; i < this->extension_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 6, this->extension(i), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 7, this->options(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -2089,7 +2206,7 @@
|
|
|
| int DescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -2097,14 +2214,14 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MessageOptions options = 7;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.FieldDescriptorProto field = 2;
|
| total_size += 1 * this->field_size();
|
| @@ -2113,7 +2230,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->field(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.FieldDescriptorProto extension = 6;
|
| total_size += 1 * this->extension_size();
|
| for (int i = 0; i < this->extension_size(); i++) {
|
| @@ -2121,7 +2238,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->extension(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto nested_type = 3;
|
| total_size += 1 * this->nested_type_size();
|
| for (int i = 0; i < this->nested_type_size(); i++) {
|
| @@ -2129,7 +2246,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->nested_type(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
|
| total_size += 1 * this->enum_type_size();
|
| for (int i = 0; i < this->enum_type_size(); i++) {
|
| @@ -2137,7 +2254,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->enum_type(i));
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
|
| total_size += 1 * this->extension_range_size();
|
| for (int i = 0; i < this->extension_range_size(); i++) {
|
| @@ -2145,7 +2262,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->extension_range(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -2200,7 +2317,7 @@
|
| }
|
|
|
| bool DescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < field_size(); i++) {
|
| if (!this->field(i).IsInitialized()) return false;
|
| }
|
| @@ -2457,7 +2574,7 @@
|
| if (input->ExpectTag(18)) goto parse_extendee;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string extendee = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2474,7 +2591,7 @@
|
| if (input->ExpectTag(24)) goto parse_number;
|
| break;
|
| }
|
| -
|
| +
|
| // optional int32 number = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2490,7 +2607,7 @@
|
| if (input->ExpectTag(32)) goto parse_label;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| case 4: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2511,7 +2628,7 @@
|
| if (input->ExpectTag(40)) goto parse_type;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| case 5: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2532,7 +2649,7 @@
|
| if (input->ExpectTag(50)) goto parse_type_name;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string type_name = 6;
|
| case 6: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2549,7 +2666,7 @@
|
| if (input->ExpectTag(58)) goto parse_default_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string default_value = 7;
|
| case 7: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2566,7 +2683,7 @@
|
| if (input->ExpectTag(66)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FieldOptions options = 8;
|
| case 8: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -2580,14 +2697,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -2606,7 +2724,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // optional string extendee = 2;
|
| if (has_extendee()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -2615,24 +2733,24 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 2, this->extendee(), output);
|
| }
|
| -
|
| +
|
| // optional int32 number = 3;
|
| if (has_number()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->number(), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
|
| if (has_label()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 4, this->label(), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
|
| if (has_type()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 5, this->type(), output);
|
| }
|
| -
|
| +
|
| // optional string type_name = 6;
|
| if (has_type_name()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -2641,7 +2759,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 6, this->type_name(), output);
|
| }
|
| -
|
| +
|
| // optional string default_value = 7;
|
| if (has_default_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -2650,13 +2768,13 @@
|
| ::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);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -2674,7 +2792,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // optional string extendee = 2;
|
| if (has_extendee()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -2684,24 +2802,24 @@
|
| ::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::VerifyUTF8String(
|
| @@ -2711,7 +2829,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 6, this->type_name(), target);
|
| }
|
| -
|
| +
|
| // optional string default_value = 7;
|
| if (has_default_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -2721,14 +2839,14 @@
|
| ::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 (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -2738,7 +2856,7 @@
|
|
|
| int FieldDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -2746,54 +2864,54 @@
|
| ::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 (!unknown_fields().empty()) {
|
| total_size +=
|
| @@ -2862,7 +2980,7 @@
|
| }
|
|
|
| bool FieldDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| if (has_options()) {
|
| if (!this->options().IsInitialized()) return false;
|
| }
|
| @@ -2995,7 +3113,7 @@
|
| if (input->ExpectTag(18)) goto parse_value;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3010,7 +3128,7 @@
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3024,14 +3142,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -3050,19 +3169,19 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| for (int i = 0; i < this->value_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->value(i), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 3, this->options(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -3080,21 +3199,21 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| for (int i = 0; i < this->value_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 2, this->value(i), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 3, this->options(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -3104,7 +3223,7 @@
|
|
|
| int EnumDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -3112,14 +3231,14 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumOptions options = 3;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
|
| total_size += 1 * this->value_size();
|
| @@ -3128,7 +3247,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->value(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -3179,7 +3298,7 @@
|
| }
|
|
|
| bool EnumDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < value_size(); i++) {
|
| if (!this->value(i).IsInitialized()) return false;
|
| }
|
| @@ -3311,7 +3430,7 @@
|
| if (input->ExpectTag(16)) goto parse_number;
|
| break;
|
| }
|
| -
|
| +
|
| // optional int32 number = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3327,7 +3446,7 @@
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3341,14 +3460,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -3367,18 +3487,18 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // optional int32 number = 2;
|
| if (has_number()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->number(), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 3, this->options(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -3396,19 +3516,19 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // optional int32 number = 2;
|
| if (has_number()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->number(), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 3, this->options(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -3418,7 +3538,7 @@
|
|
|
| int EnumValueDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -3426,21 +3546,21 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional int32 number = 2;
|
| if (has_number()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int32Size(
|
| this->number());
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.EnumValueOptions options = 3;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| +
|
| }
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| @@ -3494,7 +3614,7 @@
|
| }
|
|
|
| bool EnumValueDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| if (has_options()) {
|
| if (!this->options().IsInitialized()) return false;
|
| }
|
| @@ -3622,7 +3742,7 @@
|
| if (input->ExpectTag(18)) goto parse_method;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3637,7 +3757,7 @@
|
| if (input->ExpectTag(26)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3651,14 +3771,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -3677,19 +3798,19 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| for (int i = 0; i < this->method_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->method(i), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| if (has_options()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 3, this->options(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -3707,21 +3828,21 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| for (int i = 0; i < this->method_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 2, this->method(i), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 3, this->options(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -3731,7 +3852,7 @@
|
|
|
| int ServiceDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -3739,14 +3860,14 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.ServiceOptions options = 3;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.MethodDescriptorProto method = 2;
|
| total_size += 1 * this->method_size();
|
| @@ -3755,7 +3876,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->method(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -3806,7 +3927,7 @@
|
| }
|
|
|
| bool ServiceDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < method_size(); i++) {
|
| if (!this->method(i).IsInitialized()) return false;
|
| }
|
| @@ -3955,7 +4076,7 @@
|
| if (input->ExpectTag(18)) goto parse_input_type;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string input_type = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3972,7 +4093,7 @@
|
| if (input->ExpectTag(26)) goto parse_output_type;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string output_type = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -3989,7 +4110,7 @@
|
| if (input->ExpectTag(34)) goto parse_options;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| case 4: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4003,14 +4124,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -4029,7 +4151,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name(), output);
|
| }
|
| -
|
| +
|
| // optional string input_type = 2;
|
| if (has_input_type()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -4038,7 +4160,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 2, this->input_type(), output);
|
| }
|
| -
|
| +
|
| // optional string output_type = 3;
|
| if (has_output_type()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -4047,13 +4169,13 @@
|
| ::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);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -4071,7 +4193,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name(), target);
|
| }
|
| -
|
| +
|
| // optional string input_type = 2;
|
| if (has_input_type()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -4081,7 +4203,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 2, this->input_type(), target);
|
| }
|
| -
|
| +
|
| // optional string output_type = 3;
|
| if (has_output_type()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -4091,14 +4213,14 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 3, this->output_type(), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| if (has_options()) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 4, this->options(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -4108,7 +4230,7 @@
|
|
|
| int MethodDescriptorProto::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string name = 1;
|
| if (has_name()) {
|
| @@ -4116,28 +4238,28 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name());
|
| }
|
| -
|
| +
|
| // optional string input_type = 2;
|
| if (has_input_type()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->input_type());
|
| }
|
| -
|
| +
|
| // optional string output_type = 3;
|
| if (has_output_type()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->output_type());
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.MethodOptions options = 4;
|
| if (has_options()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->options());
|
| }
|
| -
|
| +
|
| }
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| @@ -4194,7 +4316,7 @@
|
| }
|
|
|
| bool MethodDescriptorProto::IsInitialized() const {
|
| -
|
| +
|
| if (has_options()) {
|
| if (!this->options().IsInitialized()) return false;
|
| }
|
| @@ -4254,6 +4376,7 @@
|
| const int FileOptions::kRetainUnknownFieldsFieldNumber;
|
| const int FileOptions::kJavaGenerateEqualsAndHashFieldNumber;
|
| const int FileOptions::kOptimizeForFieldNumber;
|
| +const int FileOptions::kGoPackageFieldNumber;
|
| const int FileOptions::kCcGenericServicesFieldNumber;
|
| const int FileOptions::kJavaGenericServicesFieldNumber;
|
| const int FileOptions::kPyGenericServicesFieldNumber;
|
| @@ -4282,6 +4405,7 @@
|
| retain_unknown_fields_ = false;
|
| java_generate_equals_and_hash_ = false;
|
| optimize_for_ = 1;
|
| + go_package_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
|
| cc_generic_services_ = false;
|
| java_generic_services_ = false;
|
| py_generic_services_ = false;
|
| @@ -4299,6 +4423,9 @@
|
| if (java_outer_classname_ != &::google::protobuf::internal::kEmptyString) {
|
| delete java_outer_classname_;
|
| }
|
| + if (go_package_ != &::google::protobuf::internal::kEmptyString) {
|
| + delete go_package_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -4341,10 +4468,15 @@
|
| retain_unknown_fields_ = false;
|
| java_generate_equals_and_hash_ = false;
|
| optimize_for_ = 1;
|
| + if (has_go_package()) {
|
| + if (go_package_ != &::google::protobuf::internal::kEmptyString) {
|
| + go_package_->clear();
|
| + }
|
| + }
|
| cc_generic_services_ = false;
|
| - java_generic_services_ = false;
|
| }
|
| if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| + java_generic_services_ = false;
|
| py_generic_services_ = false;
|
| }
|
| uninterpreted_option_.Clear();
|
| @@ -4373,7 +4505,7 @@
|
| if (input->ExpectTag(66)) goto parse_java_outer_classname;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string java_outer_classname = 8;
|
| case 8: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4390,7 +4522,7 @@
|
| if (input->ExpectTag(72)) goto parse_optimize_for;
|
| break;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| case 9: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4411,7 +4543,7 @@
|
| if (input->ExpectTag(80)) goto parse_java_multiple_files;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool java_multiple_files = 10 [default = false];
|
| case 10: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4424,13 +4556,30 @@
|
| } else {
|
| goto handle_uninterpreted;
|
| }
|
| - if (input->ExpectTag(88)) goto parse_retain_unknown_fields;
|
| + if (input->ExpectTag(90)) goto parse_go_package;
|
| break;
|
| }
|
| -
|
| - // optional bool retain_unknown_fields = 11 [default = false];
|
| +
|
| + // optional string go_package = 11;
|
| case 11: {
|
| 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::VerifyUTF8String(
|
| + this->go_package().data(), this->go_package().length(),
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| + } else {
|
| + goto handle_uninterpreted;
|
| + }
|
| + if (input->ExpectTag(96)) goto parse_retain_unknown_fields;
|
| + break;
|
| + }
|
| +
|
| + // optional bool retain_unknown_fields = 12 [default = false];
|
| + case 12: {
|
| + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
|
| parse_retain_unknown_fields:
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| @@ -4443,7 +4592,7 @@
|
| if (input->ExpectTag(128)) goto parse_cc_generic_services;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool cc_generic_services = 16 [default = false];
|
| case 16: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4459,7 +4608,7 @@
|
| if (input->ExpectTag(136)) goto parse_java_generic_services;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool java_generic_services = 17 [default = false];
|
| case 17: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4475,7 +4624,7 @@
|
| if (input->ExpectTag(144)) goto parse_py_generic_services;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool py_generic_services = 18 [default = false];
|
| case 18: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4491,7 +4640,7 @@
|
| 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 (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4507,7 +4656,7 @@
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4522,7 +4671,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4534,7 +4683,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -4553,7 +4703,7 @@
|
| ::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::VerifyUTF8String(
|
| @@ -4562,53 +4712,62 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 8, this->java_outer_classname(), output);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| if (has_optimize_for()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 9, this->optimize_for(), output);
|
| }
|
| -
|
| +
|
| // optional bool java_multiple_files = 10 [default = false];
|
| if (has_java_multiple_files()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->java_multiple_files(), output);
|
| }
|
| -
|
| - // optional bool retain_unknown_fields = 11 [default = false];
|
| +
|
| + // optional string go_package = 11;
|
| + if (has_go_package()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->go_package().data(), this->go_package().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| + 11, this->go_package(), output);
|
| + }
|
| +
|
| + // optional bool retain_unknown_fields = 12 [default = false];
|
| if (has_retain_unknown_fields()) {
|
| - ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->retain_unknown_fields(), output);
|
| + ::google::protobuf::internal::WireFormatLite::WriteBool(12, this->retain_unknown_fields(), output);
|
| }
|
| -
|
| +
|
| // optional bool cc_generic_services = 16 [default = false];
|
| if (has_cc_generic_services()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(16, this->cc_generic_services(), output);
|
| }
|
| -
|
| +
|
| // optional bool java_generic_services = 17 [default = false];
|
| if (has_java_generic_services()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(17, this->java_generic_services(), output);
|
| }
|
| -
|
| +
|
| // optional bool py_generic_services = 18 [default = false];
|
| if (has_py_generic_services()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(18, this->py_generic_services(), output);
|
| }
|
| -
|
| +
|
| // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| if (has_java_generate_equals_and_hash()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->java_generate_equals_and_hash(), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -4626,7 +4785,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->java_package(), target);
|
| }
|
| -
|
| +
|
| // optional string java_outer_classname = 8;
|
| if (has_java_outer_classname()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -4636,54 +4795,64 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 8, this->java_outer_classname(), target);
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| if (has_optimize_for()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| 9, this->optimize_for(), target);
|
| }
|
| -
|
| +
|
| // optional bool java_multiple_files = 10 [default = false];
|
| if (has_java_multiple_files()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->java_multiple_files(), target);
|
| }
|
| -
|
| - // optional bool retain_unknown_fields = 11 [default = false];
|
| +
|
| + // optional string go_package = 11;
|
| + if (has_go_package()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->go_package().data(), this->go_package().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + target =
|
| + ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| + 11, this->go_package(), target);
|
| + }
|
| +
|
| + // optional bool retain_unknown_fields = 12 [default = false];
|
| if (has_retain_unknown_fields()) {
|
| - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->retain_unknown_fields(), target);
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(12, this->retain_unknown_fields(), target);
|
| }
|
| -
|
| +
|
| // optional bool cc_generic_services = 16 [default = false];
|
| if (has_cc_generic_services()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(16, this->cc_generic_services(), target);
|
| }
|
| -
|
| +
|
| // optional bool java_generic_services = 17 [default = false];
|
| if (has_java_generic_services()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(17, this->java_generic_services(), target);
|
| }
|
| -
|
| +
|
| // optional bool py_generic_services = 18 [default = false];
|
| if (has_py_generic_services()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(18, this->py_generic_services(), target);
|
| }
|
| -
|
| +
|
| // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| if (has_java_generate_equals_and_hash()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->java_generate_equals_and_hash(), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -4693,7 +4862,7 @@
|
|
|
| int FileOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional string java_package = 1;
|
| if (has_java_package()) {
|
| @@ -4701,52 +4870,59 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->java_package());
|
| }
|
| -
|
| +
|
| // optional string java_outer_classname = 8;
|
| if (has_java_outer_classname()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->java_outer_classname());
|
| }
|
| -
|
| +
|
| // optional bool java_multiple_files = 10 [default = false];
|
| if (has_java_multiple_files()) {
|
| total_size += 1 + 1;
|
| }
|
| -
|
| - // optional bool retain_unknown_fields = 11 [default = false];
|
| +
|
| + // optional bool retain_unknown_fields = 12 [default = false];
|
| if (has_retain_unknown_fields()) {
|
| total_size += 1 + 1;
|
| }
|
| -
|
| +
|
| // optional bool java_generate_equals_and_hash = 20 [default = false];
|
| if (has_java_generate_equals_and_hash()) {
|
| total_size += 2 + 1;
|
| }
|
| -
|
| +
|
| // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
|
| if (has_optimize_for()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for());
|
| }
|
| -
|
| +
|
| + // optional string go_package = 11;
|
| + if (has_go_package()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->go_package());
|
| + }
|
| +
|
| // optional bool cc_generic_services = 16 [default = false];
|
| if (has_cc_generic_services()) {
|
| total_size += 2 + 1;
|
| }
|
| -
|
| +
|
| + }
|
| + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| // optional bool java_generic_services = 17 [default = false];
|
| if (has_java_generic_services()) {
|
| total_size += 2 + 1;
|
| }
|
| -
|
| - }
|
| - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| +
|
| // optional bool py_generic_services = 18 [default = false];
|
| if (has_py_generic_services()) {
|
| total_size += 2 + 1;
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| @@ -4755,9 +4931,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -4803,14 +4979,17 @@
|
| if (from.has_optimize_for()) {
|
| set_optimize_for(from.optimize_for());
|
| }
|
| + if (from.has_go_package()) {
|
| + set_go_package(from.go_package());
|
| + }
|
| if (from.has_cc_generic_services()) {
|
| set_cc_generic_services(from.cc_generic_services());
|
| }
|
| + }
|
| + if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| if (from.has_java_generic_services()) {
|
| set_java_generic_services(from.java_generic_services());
|
| }
|
| - }
|
| - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
|
| if (from.has_py_generic_services()) {
|
| set_py_generic_services(from.py_generic_services());
|
| }
|
| @@ -4832,11 +5011,11 @@
|
| }
|
|
|
| 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;
|
| }
|
|
|
| @@ -4848,6 +5027,7 @@
|
| 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_);
|
| @@ -4958,7 +5138,7 @@
|
| if (input->ExpectTag(16)) goto parse_no_standard_descriptor_accessor;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4974,7 +5154,7 @@
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -4989,7 +5169,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5001,7 +5181,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -5016,22 +5197,22 @@
|
| if (has_message_set_wire_format()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->message_set_wire_format(), output);
|
| }
|
| -
|
| +
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| if (has_no_standard_descriptor_accessor()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->no_standard_descriptor_accessor(), output);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -5044,23 +5225,23 @@
|
| if (has_message_set_wire_format()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->message_set_wire_format(), target);
|
| }
|
| -
|
| +
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| if (has_no_standard_descriptor_accessor()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->no_standard_descriptor_accessor(), target);
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -5070,18 +5251,18 @@
|
|
|
| int MessageOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| 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;
|
| }
|
| -
|
| +
|
| // optional bool no_standard_descriptor_accessor = 2 [default = false];
|
| if (has_no_standard_descriptor_accessor()) {
|
| total_size += 1 + 1;
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| @@ -5090,9 +5271,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -5144,11 +5325,11 @@
|
| }
|
|
|
| bool MessageOptions::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;
|
| }
|
|
|
| @@ -5201,8 +5382,10 @@
|
| #ifndef _MSC_VER
|
| const int FieldOptions::kCtypeFieldNumber;
|
| const int FieldOptions::kPackedFieldNumber;
|
| +const int FieldOptions::kLazyFieldNumber;
|
| const int FieldOptions::kDeprecatedFieldNumber;
|
| const int FieldOptions::kExperimentalMapKeyFieldNumber;
|
| +const int FieldOptions::kWeakFieldNumber;
|
| const int FieldOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| @@ -5224,8 +5407,10 @@
|
| _cached_size_ = 0;
|
| ctype_ = 0;
|
| packed_ = false;
|
| + lazy_ = false;
|
| deprecated_ = false;
|
| experimental_map_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
|
| + weak_ = false;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| @@ -5267,12 +5452,14 @@
|
| 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::kEmptyString) {
|
| experimental_map_key_->clear();
|
| }
|
| }
|
| + weak_ = false;
|
| }
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| @@ -5304,7 +5491,7 @@
|
| if (input->ExpectTag(16)) goto parse_packed;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool packed = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5320,7 +5507,7 @@
|
| if (input->ExpectTag(24)) goto parse_deprecated;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bool deprecated = 3 [default = false];
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5333,10 +5520,26 @@
|
| } else {
|
| goto handle_uninterpreted;
|
| }
|
| + if (input->ExpectTag(40)) goto parse_lazy;
|
| + break;
|
| + }
|
| +
|
| + // optional bool lazy = 5 [default = false];
|
| + case 5: {
|
| + 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_uninterpreted;
|
| + }
|
| if (input->ExpectTag(74)) goto parse_experimental_map_key;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string experimental_map_key = 9;
|
| case 9: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5350,10 +5553,26 @@
|
| } else {
|
| goto handle_uninterpreted;
|
| }
|
| + if (input->ExpectTag(80)) goto parse_weak;
|
| + break;
|
| + }
|
| +
|
| + // optional bool weak = 10 [default = false];
|
| + case 10: {
|
| + 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_uninterpreted;
|
| + }
|
| if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5368,7 +5587,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5380,7 +5599,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -5396,17 +5616,22 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteEnum(
|
| 1, this->ctype(), output);
|
| }
|
| -
|
| +
|
| // optional bool packed = 2;
|
| if (has_packed()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->packed(), output);
|
| }
|
| -
|
| +
|
| // optional bool deprecated = 3 [default = false];
|
| if (has_deprecated()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output);
|
| }
|
| -
|
| +
|
| + // optional bool lazy = 5 [default = false];
|
| + if (has_lazy()) {
|
| + ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->lazy(), output);
|
| + }
|
| +
|
| // optional string experimental_map_key = 9;
|
| if (has_experimental_map_key()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -5415,17 +5640,22 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 9, this->experimental_map_key(), output);
|
| }
|
| -
|
| +
|
| + // optional bool weak = 10 [default = false];
|
| + if (has_weak()) {
|
| + ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->weak(), output);
|
| + }
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -5439,17 +5669,22 @@
|
| target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
|
| 1, this->ctype(), target);
|
| }
|
| -
|
| +
|
| // optional bool packed = 2;
|
| if (has_packed()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->packed(), target);
|
| }
|
| -
|
| +
|
| // optional bool deprecated = 3 [default = false];
|
| if (has_deprecated()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target);
|
| }
|
| -
|
| +
|
| + // optional bool lazy = 5 [default = false];
|
| + if (has_lazy()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->lazy(), target);
|
| + }
|
| +
|
| // optional string experimental_map_key = 9;
|
| if (has_experimental_map_key()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -5459,18 +5694,23 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 9, this->experimental_map_key(), target);
|
| }
|
| -
|
| +
|
| + // optional bool weak = 10 [default = false];
|
| + if (has_weak()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->weak(), target);
|
| + }
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -5480,31 +5720,41 @@
|
|
|
| int FieldOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
|
| if (has_ctype()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::EnumSize(this->ctype());
|
| }
|
| -
|
| +
|
| // optional bool packed = 2;
|
| if (has_packed()) {
|
| total_size += 1 + 1;
|
| }
|
| -
|
| +
|
| + // optional bool lazy = 5 [default = false];
|
| + if (has_lazy()) {
|
| + total_size += 1 + 1;
|
| + }
|
| +
|
| // optional bool deprecated = 3 [default = false];
|
| if (has_deprecated()) {
|
| 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;
|
| + }
|
| +
|
| }
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| @@ -5513,9 +5763,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -5549,12 +5799,18 @@
|
| if (from.has_packed()) {
|
| set_packed(from.packed());
|
| }
|
| + 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_);
|
| mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| @@ -5573,11 +5829,11 @@
|
| }
|
|
|
| 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;
|
| }
|
|
|
| @@ -5585,8 +5841,10 @@
|
| 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_);
|
| @@ -5607,6 +5865,7 @@
|
| // ===================================================================
|
|
|
| #ifndef _MSC_VER
|
| +const int EnumOptions::kAllowAliasFieldNumber;
|
| const int EnumOptions::kUninterpretedOptionFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| @@ -5626,6 +5885,7 @@
|
|
|
| void EnumOptions::SharedCtor() {
|
| _cached_size_ = 0;
|
| + allow_alias_ = true;
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| @@ -5661,6 +5921,9 @@
|
|
|
| void EnumOptions::Clear() {
|
| _extensions_.Clear();
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + allow_alias_ = true;
|
| + }
|
| uninterpreted_option_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| mutable_unknown_fields()->Clear();
|
| @@ -5672,6 +5935,21 @@
|
| ::google::protobuf::uint32 tag;
|
| while ((tag = input->ReadTag()) != 0) {
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| + // optional bool allow_alias = 2 [default = true];
|
| + case 2: {
|
| + 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_uninterpreted;
|
| + }
|
| + if (input->ExpectTag(7994)) goto parse_uninterpreted_option;
|
| + break;
|
| + }
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| case 999: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5686,7 +5964,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5698,7 +5976,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -5709,16 +5988,21 @@
|
|
|
| void EnumOptions::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| + // optional bool allow_alias = 2 [default = true];
|
| + if (has_allow_alias()) {
|
| + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output);
|
| + }
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -5727,17 +6011,22 @@
|
|
|
| ::google::protobuf::uint8* EnumOptions::SerializeWithCachedSizesToArray(
|
| ::google::protobuf::uint8* target) const {
|
| + // optional bool allow_alias = 2 [default = true];
|
| + if (has_allow_alias()) {
|
| + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target);
|
| + }
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -5747,7 +6036,14 @@
|
|
|
| int EnumOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| + // optional bool allow_alias = 2 [default = true];
|
| + if (has_allow_alias()) {
|
| + 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++) {
|
| @@ -5755,9 +6051,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -5784,6 +6080,11 @@
|
| void EnumOptions::MergeFrom(const EnumOptions& from) {
|
| 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());
|
| + }
|
| + }
|
| _extensions_.MergeFrom(from._extensions_);
|
| mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
| @@ -5801,16 +6102,17 @@
|
| }
|
|
|
| bool EnumOptions::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;
|
| }
|
|
|
| void EnumOptions::Swap(EnumOptions* other) {
|
| 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_);
|
| @@ -5910,7 +6212,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -5922,7 +6224,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -5938,11 +6241,11 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -5957,11 +6260,11 @@
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -5971,7 +6274,7 @@
|
|
|
| int EnumValueOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| @@ -5979,9 +6282,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -6025,11 +6328,11 @@
|
| }
|
|
|
| bool EnumValueOptions::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;
|
| }
|
|
|
| @@ -6134,7 +6437,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6146,7 +6449,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -6162,11 +6466,11 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -6181,11 +6485,11 @@
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -6195,7 +6499,7 @@
|
|
|
| int ServiceOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| @@ -6203,9 +6507,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -6249,11 +6553,11 @@
|
| }
|
|
|
| bool ServiceOptions::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;
|
| }
|
|
|
| @@ -6358,7 +6662,7 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6370,7 +6674,8 @@
|
| mutable_unknown_fields()));
|
| continue;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -6386,11 +6691,11 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 999, this->uninterpreted_option(i), output);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| _extensions_.SerializeWithCachedSizes(
|
| 1000, 536870912, output);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -6405,11 +6710,11 @@
|
| WriteMessageNoVirtualToArray(
|
| 999, this->uninterpreted_option(i), target);
|
| }
|
| -
|
| +
|
| // Extension range [1000, 536870912)
|
| target = _extensions_.SerializeWithCachedSizesToArray(
|
| 1000, 536870912, target);
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -6419,7 +6724,7 @@
|
|
|
| int MethodOptions::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
|
| total_size += 2 * this->uninterpreted_option_size();
|
| for (int i = 0; i < this->uninterpreted_option_size(); i++) {
|
| @@ -6427,9 +6732,9 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->uninterpreted_option(i));
|
| }
|
| -
|
| +
|
| total_size += _extensions_.ByteSize();
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -6473,11 +6778,11 @@
|
| }
|
|
|
| bool MethodOptions::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;
|
| }
|
|
|
| @@ -6595,7 +6900,7 @@
|
| if (input->ExpectTag(16)) goto parse_is_extension;
|
| break;
|
| }
|
| -
|
| +
|
| // required bool is_extension = 2;
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6611,14 +6916,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -6637,12 +6943,12 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 1, this->name_part(), output);
|
| }
|
| -
|
| +
|
| // required bool is_extension = 2;
|
| if (has_is_extension()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -6660,12 +6966,12 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 1, this->name_part(), target);
|
| }
|
| -
|
| +
|
| // required bool is_extension = 2;
|
| if (has_is_extension()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -6675,7 +6981,7 @@
|
|
|
| int UninterpretedOption_NamePart::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
|
| // required string name_part = 1;
|
| if (has_name_part()) {
|
| @@ -6683,12 +6989,12 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->name_part());
|
| }
|
| -
|
| +
|
| // required bool is_extension = 2;
|
| if (has_is_extension()) {
|
| total_size += 1 + 1;
|
| }
|
| -
|
| +
|
| }
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| @@ -6740,7 +7046,7 @@
|
|
|
| bool UninterpretedOption_NamePart::IsInitialized() const {
|
| if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
|
| -
|
| +
|
| return true;
|
| }
|
|
|
| @@ -6885,7 +7191,7 @@
|
| if (input->ExpectTag(26)) goto parse_identifier_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string identifier_value = 3;
|
| case 3: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6902,7 +7208,7 @@
|
| if (input->ExpectTag(32)) goto parse_positive_int_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional uint64 positive_int_value = 4;
|
| case 4: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6918,7 +7224,7 @@
|
| if (input->ExpectTag(40)) goto parse_negative_int_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional int64 negative_int_value = 5;
|
| case 5: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6934,7 +7240,7 @@
|
| if (input->ExpectTag(49)) goto parse_double_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional double double_value = 6;
|
| case 6: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6950,7 +7256,7 @@
|
| if (input->ExpectTag(58)) goto parse_string_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional bytes string_value = 7;
|
| case 7: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6964,7 +7270,7 @@
|
| if (input->ExpectTag(66)) goto parse_aggregate_value;
|
| break;
|
| }
|
| -
|
| +
|
| // optional string aggregate_value = 8;
|
| case 8: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -6981,14 +7287,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -7004,7 +7311,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 2, this->name(i), output);
|
| }
|
| -
|
| +
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -7013,28 +7320,28 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 3, this->identifier_value(), output);
|
| }
|
| -
|
| +
|
| // optional uint64 positive_int_value = 4;
|
| if (has_positive_int_value()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->positive_int_value(), output);
|
| }
|
| -
|
| +
|
| // optional int64 negative_int_value = 5;
|
| if (has_negative_int_value()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->negative_int_value(), output);
|
| }
|
| -
|
| +
|
| // optional double double_value = 6;
|
| if (has_double_value()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->double_value(), output);
|
| }
|
| -
|
| +
|
| // optional bytes string_value = 7;
|
| if (has_string_value()) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBytes(
|
| 7, this->string_value(), output);
|
| }
|
| -
|
| +
|
| // optional string aggregate_value = 8;
|
| if (has_aggregate_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -7043,7 +7350,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteString(
|
| 8, this->aggregate_value(), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -7058,7 +7365,7 @@
|
| WriteMessageNoVirtualToArray(
|
| 2, this->name(i), target);
|
| }
|
| -
|
| +
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -7068,29 +7375,29 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 3, this->identifier_value(), target);
|
| }
|
| -
|
| +
|
| // optional uint64 positive_int_value = 4;
|
| if (has_positive_int_value()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->positive_int_value(), target);
|
| }
|
| -
|
| +
|
| // optional int64 negative_int_value = 5;
|
| if (has_negative_int_value()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->negative_int_value(), target);
|
| }
|
| -
|
| +
|
| // optional double double_value = 6;
|
| if (has_double_value()) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->double_value(), target);
|
| }
|
| -
|
| +
|
| // optional bytes string_value = 7;
|
| if (has_string_value()) {
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
|
| 7, this->string_value(), target);
|
| }
|
| -
|
| +
|
| // optional string aggregate_value = 8;
|
| if (has_aggregate_value()) {
|
| ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| @@ -7100,7 +7407,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| 8, this->aggregate_value(), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -7110,7 +7417,7 @@
|
|
|
| int UninterpretedOption::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
|
| // optional string identifier_value = 3;
|
| if (has_identifier_value()) {
|
| @@ -7118,40 +7425,40 @@
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->identifier_value());
|
| }
|
| -
|
| +
|
| // optional uint64 positive_int_value = 4;
|
| if (has_positive_int_value()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::UInt64Size(
|
| this->positive_int_value());
|
| }
|
| -
|
| +
|
| // optional int64 negative_int_value = 5;
|
| if (has_negative_int_value()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int64Size(
|
| this->negative_int_value());
|
| }
|
| -
|
| +
|
| // optional double double_value = 6;
|
| if (has_double_value()) {
|
| total_size += 1 + 8;
|
| }
|
| -
|
| +
|
| // optional bytes string_value = 7;
|
| if (has_string_value()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::BytesSize(
|
| this->string_value());
|
| }
|
| -
|
| +
|
| // optional string aggregate_value = 8;
|
| if (has_aggregate_value()) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->aggregate_value());
|
| }
|
| -
|
| +
|
| }
|
| // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
|
| total_size += 1 * this->name_size();
|
| @@ -7160,7 +7467,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->name(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -7223,7 +7530,7 @@
|
| }
|
|
|
| bool UninterpretedOption::IsInitialized() const {
|
| -
|
| +
|
| for (int i = 0; i < name_size(); i++) {
|
| if (!this->name(i).IsInitialized()) return false;
|
| }
|
| @@ -7259,6 +7566,8 @@
|
| #ifndef _MSC_VER
|
| const int SourceCodeInfo_Location::kPathFieldNumber;
|
| const int SourceCodeInfo_Location::kSpanFieldNumber;
|
| +const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber;
|
| +const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber;
|
| #endif // !_MSC_VER
|
|
|
| SourceCodeInfo_Location::SourceCodeInfo_Location()
|
| @@ -7277,6 +7586,8 @@
|
|
|
| void SourceCodeInfo_Location::SharedCtor() {
|
| _cached_size_ = 0;
|
| + leading_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
|
| + trailing_comments_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| }
|
|
|
| @@ -7285,6 +7596,12 @@
|
| }
|
|
|
| void SourceCodeInfo_Location::SharedDtor() {
|
| + if (leading_comments_ != &::google::protobuf::internal::kEmptyString) {
|
| + delete leading_comments_;
|
| + }
|
| + if (trailing_comments_ != &::google::protobuf::internal::kEmptyString) {
|
| + delete trailing_comments_;
|
| + }
|
| if (this != default_instance_) {
|
| }
|
| }
|
| @@ -7311,6 +7628,18 @@
|
| }
|
|
|
| void SourceCodeInfo_Location::Clear() {
|
| + if (_has_bits_[2 / 32] & (0xffu << (2 % 32))) {
|
| + if (has_leading_comments()) {
|
| + if (leading_comments_ != &::google::protobuf::internal::kEmptyString) {
|
| + leading_comments_->clear();
|
| + }
|
| + }
|
| + if (has_trailing_comments()) {
|
| + if (trailing_comments_ != &::google::protobuf::internal::kEmptyString) {
|
| + trailing_comments_->clear();
|
| + }
|
| + }
|
| + }
|
| path_.Clear();
|
| span_.Clear();
|
| ::memset(_has_bits_, 0, sizeof(_has_bits_));
|
| @@ -7342,7 +7671,7 @@
|
| if (input->ExpectTag(18)) goto parse_span;
|
| break;
|
| }
|
| -
|
| +
|
| // repeated int32 span = 2 [packed = true];
|
| case 2: {
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| @@ -7360,17 +7689,52 @@
|
| } else {
|
| goto handle_uninterpreted;
|
| }
|
| + if (input->ExpectTag(26)) goto parse_leading_comments;
|
| + break;
|
| + }
|
| +
|
| + // optional string leading_comments = 3;
|
| + case 3: {
|
| + 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::VerifyUTF8String(
|
| + this->leading_comments().data(), this->leading_comments().length(),
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| + } else {
|
| + goto handle_uninterpreted;
|
| + }
|
| + if (input->ExpectTag(34)) goto parse_trailing_comments;
|
| + break;
|
| + }
|
| +
|
| + // optional string trailing_comments = 4;
|
| + case 4: {
|
| + 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::VerifyUTF8String(
|
| + this->trailing_comments().data(), this->trailing_comments().length(),
|
| + ::google::protobuf::internal::WireFormat::PARSE);
|
| + } else {
|
| + goto handle_uninterpreted;
|
| + }
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -7390,7 +7754,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag(
|
| this->path(i), output);
|
| }
|
| -
|
| +
|
| // repeated int32 span = 2 [packed = true];
|
| if (this->span_size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
|
| @@ -7400,7 +7764,25 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag(
|
| this->span(i), output);
|
| }
|
| -
|
| +
|
| + // optional string leading_comments = 3;
|
| + if (has_leading_comments()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->leading_comments().data(), this->leading_comments().length(),
|
| + ::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::VerifyUTF8String(
|
| + this->trailing_comments().data(), this->trailing_comments().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + ::google::protobuf::internal::WireFormatLite::WriteString(
|
| + 4, this->trailing_comments(), output);
|
| + }
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -7422,7 +7804,7 @@
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteInt32NoTagToArray(this->path(i), target);
|
| }
|
| -
|
| +
|
| // repeated int32 span = 2 [packed = true];
|
| if (this->span_size() > 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
|
| @@ -7436,7 +7818,27 @@
|
| target = ::google::protobuf::internal::WireFormatLite::
|
| WriteInt32NoTagToArray(this->span(i), target);
|
| }
|
| -
|
| +
|
| + // optional string leading_comments = 3;
|
| + if (has_leading_comments()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->leading_comments().data(), this->leading_comments().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + target =
|
| + ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| + 3, this->leading_comments(), target);
|
| + }
|
| +
|
| + // optional string trailing_comments = 4;
|
| + if (has_trailing_comments()) {
|
| + ::google::protobuf::internal::WireFormat::VerifyUTF8String(
|
| + this->trailing_comments().data(), this->trailing_comments().length(),
|
| + ::google::protobuf::internal::WireFormat::SERIALIZE);
|
| + target =
|
| + ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
|
| + 4, this->trailing_comments(), target);
|
| + }
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -7446,7 +7848,23 @@
|
|
|
| int SourceCodeInfo_Location::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| + if (_has_bits_[2 / 32] & (0xffu << (2 % 32))) {
|
| + // optional string leading_comments = 3;
|
| + if (has_leading_comments()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->leading_comments());
|
| + }
|
| +
|
| + // optional string trailing_comments = 4;
|
| + if (has_trailing_comments()) {
|
| + total_size += 1 +
|
| + ::google::protobuf::internal::WireFormatLite::StringSize(
|
| + this->trailing_comments());
|
| + }
|
| +
|
| + }
|
| // repeated int32 path = 1 [packed = true];
|
| {
|
| int data_size = 0;
|
| @@ -7458,10 +7876,12 @@
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);
|
| }
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| _path_cached_byte_size_ = data_size;
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| total_size += data_size;
|
| }
|
| -
|
| +
|
| // repeated int32 span = 2 [packed = true];
|
| {
|
| int data_size = 0;
|
| @@ -7473,10 +7893,12 @@
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);
|
| }
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| _span_cached_byte_size_ = data_size;
|
| + GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| total_size += data_size;
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -7504,6 +7926,14 @@
|
| GOOGLE_CHECK_NE(&from, this);
|
| path_.MergeFrom(from.path_);
|
| span_.MergeFrom(from.span_);
|
| + if (from._has_bits_[2 / 32] & (0xffu << (2 % 32))) {
|
| + if (from.has_leading_comments()) {
|
| + set_leading_comments(from.leading_comments());
|
| + }
|
| + if (from.has_trailing_comments()) {
|
| + set_trailing_comments(from.trailing_comments());
|
| + }
|
| + }
|
| mutable_unknown_fields()->MergeFrom(from.unknown_fields());
|
| }
|
|
|
| @@ -7520,7 +7950,7 @@
|
| }
|
|
|
| bool SourceCodeInfo_Location::IsInitialized() const {
|
| -
|
| +
|
| return true;
|
| }
|
|
|
| @@ -7528,6 +7958,8 @@
|
| 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_);
|
| @@ -7624,14 +8056,15 @@
|
| if (input->ExpectAtEnd()) return true;
|
| break;
|
| }
|
| -
|
| +
|
| default: {
|
| handle_uninterpreted:
|
| if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
|
| ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
|
| return true;
|
| }
|
| - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag, mutable_unknown_fields()));
|
| + DO_(::google::protobuf::internal::WireFormatLite::SkipField(
|
| + input, tag, mutable_unknown_fields()));
|
| break;
|
| }
|
| }
|
| @@ -7647,7 +8080,7 @@
|
| ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
|
| 1, this->location(i), output);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| ::google::protobuf::internal::WireFormatLite::SerializeUnknownFields(
|
| unknown_fields(), output);
|
| @@ -7662,7 +8095,7 @@
|
| WriteMessageNoVirtualToArray(
|
| 1, this->location(i), target);
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| target = ::google::protobuf::internal::WireFormatLite::SerializeUnknownFieldsToArray(
|
| unknown_fields(), target);
|
| @@ -7672,7 +8105,7 @@
|
|
|
| int SourceCodeInfo::ByteSize() const {
|
| int total_size = 0;
|
| -
|
| +
|
| // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
|
| total_size += 1 * this->location_size();
|
| for (int i = 0; i < this->location_size(); i++) {
|
| @@ -7680,7 +8113,7 @@
|
| ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
|
| this->location(i));
|
| }
|
| -
|
| +
|
| if (!unknown_fields().empty()) {
|
| total_size +=
|
| ::google::protobuf::internal::WireFormatLite::ComputeUnknownFieldsSize(
|
| @@ -7723,7 +8156,7 @@
|
| }
|
|
|
| bool SourceCodeInfo::IsInitialized() const {
|
| -
|
| +
|
| return true;
|
| }
|
|
|
|
|
Chromium Code Reviews
Issue 21208003:
Update protobuf to r428, part 1. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/