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

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

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

Patch Set: Make chrome settings proto generated file a component Created 4 years ago

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

Jump to:

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

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

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

index 759cab2781fcc8e25cddfd2b6eeb4c0fb533e412..6e41dde8105d6e7c27d5822f7fb60365cbc7ecfb 100644

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

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

@@ -19,59 +19,42 @@

namespace google {

namespace protobuf {

+class TypeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Type> {};

+TypeDefaultTypeInternal _Type_default_instance_;

+class FieldDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Field> {};

+FieldDefaultTypeInternal _Field_default_instance_;

+class EnumDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Enum> {};

+EnumDefaultTypeInternal _Enum_default_instance_;

+class EnumValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<EnumValue> {};

+EnumValueDefaultTypeInternal _EnumValue_default_instance_;

+class OptionDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Option> {};

+OptionDefaultTypeInternal _Option_default_instance_;

namespace {

-const ::google::protobuf::Descriptor* Type_descriptor_ = NULL;

-const ::google::protobuf::internal::GeneratedMessageReflection*

- Type_reflection_ = NULL;

-const ::google::protobuf::Descriptor* Field_descriptor_ = NULL;

-const ::google::protobuf::internal::GeneratedMessageReflection*

- Field_reflection_ = NULL;

-const ::google::protobuf::EnumDescriptor* Field_Kind_descriptor_ = NULL;

-const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor_ = NULL;

-const ::google::protobuf::Descriptor* Enum_descriptor_ = NULL;

-const ::google::protobuf::internal::GeneratedMessageReflection*

- Enum_reflection_ = NULL;

-const ::google::protobuf::Descriptor* EnumValue_descriptor_ = NULL;

-const ::google::protobuf::internal::GeneratedMessageReflection*

- EnumValue_reflection_ = NULL;

-const ::google::protobuf::Descriptor* Option_descriptor_ = NULL;

-const ::google::protobuf::internal::GeneratedMessageReflection*

- Option_reflection_ = NULL;

-const ::google::protobuf::EnumDescriptor* Syntax_descriptor_ = NULL;

+::google::protobuf::Metadata file_level_metadata[5];

+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[3];

} // namespace

-void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto() {

- protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

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

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

- "google/protobuf/type.proto");

- GOOGLE_CHECK(file != NULL);

- Type_descriptor_ = file->message_type(0);

- static const int Type_offsets_[6] = {

+const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto() GOOGLE_ATTRIBUTE_COLD;

+const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ftype_2eproto() {

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

+ ~0u, // no _has_bits_

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, _internal_metadata_),

+ ~0u, // no _extensions_

+ ~0u, // no _oneof_case_

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, fields_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, oneofs_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, source_context_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, syntax_),

- };

- Type_reflection_ =

- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

- Type_descriptor_,

- Type::default_instance_,

- Type_offsets_,

- -1,

- sizeof(Type),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Type, _is_default_instance_));

- Field_descriptor_ = file->message_type(1);

- static const int Field_offsets_[10] = {

+ ~0u, // no _has_bits_

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, _internal_metadata_),

+ ~0u, // no _extensions_

+ ~0u, // no _oneof_case_

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, kind_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, cardinality_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, number_),

@@ -82,208 +65,301 @@ void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto() {

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, json_name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, default_value_),

- };

- Field_reflection_ =

- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

- Field_descriptor_,

- Field::default_instance_,

- Field_offsets_,

- -1,

- sizeof(Field),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Field, _is_default_instance_));

- Field_Kind_descriptor_ = Field_descriptor_->enum_type(0);

- Field_Cardinality_descriptor_ = Field_descriptor_->enum_type(1);

- Enum_descriptor_ = file->message_type(2);

- static const int Enum_offsets_[5] = {

+ ~0u, // no _has_bits_

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, _internal_metadata_),

+ ~0u, // no _extensions_

+ ~0u, // no _oneof_case_

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, enumvalue_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, options_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, source_context_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, syntax_),

- };

- Enum_reflection_ =

- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

- Enum_descriptor_,

- Enum::default_instance_,

- Enum_offsets_,

- -1,

- sizeof(Enum),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Enum, _is_default_instance_));

- EnumValue_descriptor_ = file->message_type(3);

- static const int EnumValue_offsets_[3] = {

+ ~0u, // no _has_bits_

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, _internal_metadata_),

+ ~0u, // no _extensions_

+ ~0u, // no _oneof_case_

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, number_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, options_),

- };

- EnumValue_reflection_ =

- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

- EnumValue_descriptor_,

- EnumValue::default_instance_,

- EnumValue_offsets_,

- -1,

- sizeof(EnumValue),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValue, _is_default_instance_));

- Option_descriptor_ = file->message_type(4);

- static const int Option_offsets_[2] = {

+ ~0u, // no _has_bits_

+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Option, _internal_metadata_),

+ ~0u, // no _extensions_

+ ~0u, // no _oneof_case_

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Option, name_),

GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Option, value_),

};

- Option_reflection_ =

- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(

- Option_descriptor_,

- Option::default_instance_,

- Option_offsets_,

- -1,

- sizeof(Option),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Option, _internal_metadata_),

- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Option, _is_default_instance_));

- Syntax_descriptor_ = file->enum_type(0);

+ return offsets;

}

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

+ { 0, -1, sizeof(Type)},

+ { 10, -1, sizeof(Field)},

+ { 24, -1, sizeof(Enum)},

+ { 33, -1, sizeof(EnumValue)},

+ { 40, -1, sizeof(Option)},

+};

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

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

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

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

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

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

+};

namespace {

-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);

-inline void protobuf_AssignDescriptorsOnce() {

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

- &protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto);

+void protobuf_AssignDescriptors() {

+ protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

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

+ AssignDescriptors(

+ "google/protobuf/type.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2ftype_2eproto(), factory,

+ file_level_metadata, file_level_enum_descriptors, NULL);

+void protobuf_AssignDescriptorsOnce() {

+ static GOOGLE_PROTOBUF_DECLARE_ONCE(once);

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

}

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

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

- Type_descriptor_, &Type::default_instance());

- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

- Field_descriptor_, &Field::default_instance());

- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

- Enum_descriptor_, &Enum::default_instance());

- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

- EnumValue_descriptor_, &EnumValue::default_instance());

- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(

- Option_descriptor_, &Option::default_instance());

+ ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 5);

}

} // namespace

void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto() {

- delete Type::default_instance_;

- delete Type_reflection_;

- delete Field::default_instance_;

- delete Field_reflection_;

- delete Enum::default_instance_;

- delete Enum_reflection_;

- delete EnumValue::default_instance_;

- delete EnumValue_reflection_;

- delete Option::default_instance_;

- delete Option_reflection_;

-void protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto() {

- static bool already_here = false;

- if (already_here) return;

- already_here = true;

+ _Type_default_instance_.Shutdown();

+ delete file_level_metadata[0].reflection;

+ _Field_default_instance_.Shutdown();

+ delete file_level_metadata[1].reflection;

+ _Enum_default_instance_.Shutdown();

+ delete file_level_metadata[2].reflection;

+ _EnumValue_default_instance_.Shutdown();

+ delete file_level_metadata[3].reflection;

+ _Option_default_instance_.Shutdown();

+ delete file_level_metadata[4].reflection;

+void protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl() {

GOOGLE_PROTOBUF_VERIFY_VERSION;

- ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fany_2eproto();

- ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();

+ ::google::protobuf::protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto();

+ ::google::protobuf::protobuf_InitDefaults_google_2fprotobuf_2fsource_5fcontext_2eproto();

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

+ _Type_default_instance_.DefaultConstruct();

+ _Field_default_instance_.DefaultConstruct();

+ _Enum_default_instance_.DefaultConstruct();

+ _EnumValue_default_instance_.DefaultConstruct();

+ _Option_default_instance_.DefaultConstruct();

+ _Type_default_instance_.get_mutable()->source_context_ = const_cast< ::google::protobuf::SourceContext*>(

+ ::google::protobuf::SourceContext::internal_default_instance());

+ _Enum_default_instance_.get_mutable()->source_context_ = const_cast< ::google::protobuf::SourceContext*>(

+ ::google::protobuf::SourceContext::internal_default_instance());

+ _Option_default_instance_.get_mutable()->value_ = const_cast< ::google::protobuf::Any*>(

+ ::google::protobuf::Any::internal_default_instance());

+void protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto() {

+ static GOOGLE_PROTOBUF_DECLARE_ONCE(once);

+ ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto_impl);

+void protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl() {

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ static const char descriptor[] = {

+ "\n\032google/protobuf/type.proto\022\017google.pro"

+ "tobuf\032\031google/protobuf/any.proto\032$google"

+ "/protobuf/source_context.proto\"\327\001\n\004Type\022"

+ "\014\n\004name\030\001 \001(\t\022&\n\006fields\030\002 \003(\0132\026.google.p"

+ "rotobuf.Field\022\016\n\006oneofs\030\003 \003(\t\022(\n\007options"

+ "\030\004 \003(\0132\027.google.protobuf.Option\0226\n\016sourc"

+ "e_context\030\005 \001(\0132\036.google.protobuf.Source"

+ "Context\022\'\n\006syntax\030\006 \001(\0162\027.google.protobu"

+ "f.Syntax\"\325\005\n\005Field\022)\n\004kind\030\001 \001(\0162\033.googl"

+ "e.protobuf.Field.Kind\0227\n\013cardinality\030\002 \001"

+ "(\0162\".google.protobuf.Field.Cardinality\022\016"

+ "\n\006number\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\020\n\010type_url"

+ "\030\006 \001(\t\022\023\n\013oneof_index\030\007 \001(\005\022\016\n\006packed\030\010 "

+ "\001(\010\022(\n\007options\030\t \003(\0132\027.google.protobuf.O"

+ "ption\022\021\n\tjson_name\030\n \001(\t\022\025\n\rdefault_valu"

+ "e\030\013 \001(\t\"\310\002\n\004Kind\022\020\n\014TYPE_UNKNOWN\020\000\022\017\n\013TY"

+ "PE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE_INT6"

+ "4\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014"

+ "TYPE_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\nTYPE_BYTES\020\014\022\017\n\013TY"

+ "PE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_SFIXE"

+ "D32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SINT32\020"

+ "\021\022\017\n\013TYPE_SINT64\020\022\"t\n\013Cardinality\022\027\n\023CAR"

+ "DINALITY_UNKNOWN\020\000\022\030\n\024CARDINALITY_OPTION"

+ "AL\020\001\022\030\n\024CARDINALITY_REQUIRED\020\002\022\030\n\024CARDIN"

+ "ALITY_REPEATED\020\003\"\316\001\n\004Enum\022\014\n\004name\030\001 \001(\t\022"

+ "-\n\tenumvalue\030\002 \003(\0132\032.google.protobuf.Enu"

+ "mValue\022(\n\007options\030\003 \003(\0132\027.google.protobu"

+ "f.Option\0226\n\016source_context\030\004 \001(\0132\036.googl"

+ "e.protobuf.SourceContext\022\'\n\006syntax\030\005 \001(\016"

+ "2\027.google.protobuf.Syntax\"S\n\tEnumValue\022\014"

+ "\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\022(\n\007options\030"

+ "\003 \003(\0132\027.google.protobuf.Option\";\n\006Option"

+ "\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p"

+ "rotobuf.Any*.\n\006Syntax\022\021\n\rSYNTAX_PROTO2\020\000"

+ "\022\021\n\rSYNTAX_PROTO3\020\001B}\n\023com.google.protob"

+ "ufB\tTypeProtoP\001Z/google.golang.org/genpr"

+ "oto/protobuf/ptype;ptype\370\001\001\242\002\003GPB\252\002\036Goog"

+ "le.Protobuf.WellKnownTypesb\006proto3"

+ };

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

- "\n\032google/protobuf/type.proto\022\017google.pro"

- "tobuf\032\031google/protobuf/any.proto\032$google"

- "/protobuf/source_context.proto\"\327\001\n\004Type\022"

- "\014\n\004name\030\001 \001(\t\022&\n\006fields\030\002 \003(\0132\026.google.p"

- "rotobuf.Field\022\016\n\006oneofs\030\003 \003(\t\022(\n\007options"

- "\030\004 \003(\0132\027.google.protobuf.Option\0226\n\016sourc"

- "e_context\030\005 \001(\0132\036.google.protobuf.Source"

- "Context\022\'\n\006syntax\030\006 \001(\0162\027.google.protobu"

- "f.Syntax\"\325\005\n\005Field\022)\n\004kind\030\001 \001(\0162\033.googl"

- "e.protobuf.Field.Kind\0227\n\013cardinality\030\002 \001"

- "(\0162\".google.protobuf.Field.Cardinality\022\016"

- "\n\006number\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\020\n\010type_url"

- "\030\006 \001(\t\022\023\n\013oneof_index\030\007 \001(\005\022\016\n\006packed\030\010 "

- "\001(\010\022(\n\007options\030\t \003(\0132\027.google.protobuf.O"

- "ption\022\021\n\tjson_name\030\n \001(\t\022\025\n\rdefault_valu"

- "e\030\013 \001(\t\"\310\002\n\004Kind\022\020\n\014TYPE_UNKNOWN\020\000\022\017\n\013TY"

- "PE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE_INT6"

- "4\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014"

- "TYPE_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\nTYPE_BYTES\020\014\022\017\n\013TY"

- "PE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_SFIXE"

- "D32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SINT32\020"

- "\021\022\017\n\013TYPE_SINT64\020\022\"t\n\013Cardinality\022\027\n\023CAR"

- "DINALITY_UNKNOWN\020\000\022\030\n\024CARDINALITY_OPTION"

- "AL\020\001\022\030\n\024CARDINALITY_REQUIRED\020\002\022\030\n\024CARDIN"

- "ALITY_REPEATED\020\003\"\316\001\n\004Enum\022\014\n\004name\030\001 \001(\t\022"

- "-\n\tenumvalue\030\002 \003(\0132\032.google.protobuf.Enu"

- "mValue\022(\n\007options\030\003 \003(\0132\027.google.protobu"

- "f.Option\0226\n\016source_context\030\004 \001(\0132\036.googl"

- "e.protobuf.SourceContext\022\'\n\006syntax\030\005 \001(\016"

- "2\027.google.protobuf.Syntax\"S\n\tEnumValue\022\014"

- "\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\022(\n\007options\030"

- "\003 \003(\0132\027.google.protobuf.Option\";\n\006Option"

- "\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p"

- "rotobuf.Any*.\n\006Syntax\022\021\n\rSYNTAX_PROTO2\020\000"

- "\022\021\n\rSYNTAX_PROTO3\020\001BL\n\023com.google.protob"

- "ufB\tTypeProtoP\001\240\001\001\242\002\003GPB\252\002\036Google.Protob"

- "uf.WellKnownTypesb\006proto3", 1545);

+ descriptor, 1594);

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

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

- Type::default_instance_ = new Type();

- Field::default_instance_ = new Field();

- Enum::default_instance_ = new Enum();

- EnumValue::default_instance_ = new EnumValue();

- Option::default_instance_ = new Option();

- Type::default_instance_->InitAsDefaultInstance();

- Field::default_instance_->InitAsDefaultInstance();

- Enum::default_instance_->InitAsDefaultInstance();

- EnumValue::default_instance_->InitAsDefaultInstance();

- Option::default_instance_->InitAsDefaultInstance();

+ ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fany_2eproto();

+ ::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fsource_5fcontext_2eproto();

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

}

+GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_once_);

+void protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto() {

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

+ &protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto_impl);

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

struct StaticDescriptorInitializer_google_2fprotobuf_2ftype_2eproto {

StaticDescriptorInitializer_google_2fprotobuf_2ftype_2eproto() {

protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

}

} static_descriptor_initializer_google_2fprotobuf_2ftype_2eproto_;

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

+const ::google::protobuf::EnumDescriptor* Field_Kind_descriptor() {

protobuf_AssignDescriptorsOnce();

- return Syntax_descriptor_;

+ return file_level_enum_descriptors[0];

}

-bool Syntax_IsValid(int value) {

- switch(value) {

+bool Field_Kind_IsValid(int value) {

+ switch (value) {

case 0:

case 1:

+ case 2:

+ case 3:

+ case 4:

+ case 5:

+ case 6:

+ case 7:

+ case 8:

+ case 9:

+ case 10:

+ case 11:

+ case 12:

+ case 13:

+ case 14:

+ case 15:

+ case 16:

+ case 17:

+ case 18:

return true;

default:

return false;

}

-namespace {

-static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;

-static void MergeFromFail(int line) {

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

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

+const Field_Kind Field::TYPE_UNKNOWN;

+const Field_Kind Field::TYPE_DOUBLE;

+const Field_Kind Field::TYPE_FLOAT;

+const Field_Kind Field::TYPE_INT64;

+const Field_Kind Field::TYPE_UINT64;

+const Field_Kind Field::TYPE_INT32;

+const Field_Kind Field::TYPE_FIXED64;

+const Field_Kind Field::TYPE_FIXED32;

+const Field_Kind Field::TYPE_BOOL;

+const Field_Kind Field::TYPE_STRING;

+const Field_Kind Field::TYPE_GROUP;

+const Field_Kind Field::TYPE_MESSAGE;

+const Field_Kind Field::TYPE_BYTES;

+const Field_Kind Field::TYPE_UINT32;

+const Field_Kind Field::TYPE_ENUM;

+const Field_Kind Field::TYPE_SFIXED32;

+const Field_Kind Field::TYPE_SFIXED64;

+const Field_Kind Field::TYPE_SINT32;

+const Field_Kind Field::TYPE_SINT64;

+const Field_Kind Field::Kind_MIN;

+const Field_Kind Field::Kind_MAX;

+const int Field::Kind_ARRAYSIZE;

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

+const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return file_level_enum_descriptors[1];

+bool Field_Cardinality_IsValid(int value) {

+ switch (value) {

+ case 0:

+ case 1:

+ case 2:

+ case 3:

+ return true;

+ default:

+ return false;

+ }

}

-} // namespace

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

+const Field_Cardinality Field::CARDINALITY_UNKNOWN;

+const Field_Cardinality Field::CARDINALITY_OPTIONAL;

+const Field_Cardinality Field::CARDINALITY_REQUIRED;

+const Field_Cardinality Field::CARDINALITY_REPEATED;

+const Field_Cardinality Field::Cardinality_MIN;

+const Field_Cardinality Field::Cardinality_MAX;

+const int Field::Cardinality_ARRAYSIZE;

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

+const ::google::protobuf::EnumDescriptor* Syntax_descriptor() {

+ protobuf_AssignDescriptorsOnce();

+ return file_level_enum_descriptors[2];

+bool Syntax_IsValid(int value) {

+ switch (value) {

+ case 0:

+ case 1:

+ return true;

+ default:

+ return false;

+ }

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

+void Type::_slow_mutable_source_context() {

+ source_context_ = ::google::protobuf::Arena::Create< ::google::protobuf::SourceContext >(

+ GetArenaNoVirtual());

+::google::protobuf::SourceContext* Type::_slow_release_source_context() {

+ if (source_context_ == NULL) {

+ return NULL;

+ } else {

+ ::google::protobuf::SourceContext* temp = new ::google::protobuf::SourceContext(*source_context_);

+ source_context_ = NULL;

+ return temp;

+ }

+::google::protobuf::SourceContext* Type::unsafe_arena_release_source_context() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Type.source_context)

+ ::google::protobuf::SourceContext* temp = source_context_;

+ source_context_ = NULL;

+ return temp;

+void Type::unsafe_arena_set_allocated_source_context(

+ ::google::protobuf::SourceContext* source_context) {

+ if (GetArenaNoVirtual() == NULL) {

+ delete source_context_;

+ }

+ source_context_ = source_context;

+ if (source_context) {

+ } else {

+ }

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.source_context)

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

const int Type::kNameFieldNumber;

const int Type::kFieldsFieldNumber;

@@ -295,30 +371,52 @@ const int Type::kSyntaxFieldNumber;

Type::Type()

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

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

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ }

SharedCtor();

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

}

-void Type::InitAsDefaultInstance() {

- _is_default_instance_ = true;

- source_context_ = const_cast< ::google::protobuf::SourceContext*>(&::google::protobuf::SourceContext::default_instance());

+Type::Type(::google::protobuf::Arena* arena)

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

+ _internal_metadata_(arena),

+ fields_(arena),

+ oneofs_(arena),

+ options_(arena) {

+#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ SharedCtor();

+ RegisterArenaDtor(arena);

+ // @@protoc_insertion_point(arena_constructor:google.protobuf.Type)

}

Type::Type(const Type& from)

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

- _internal_metadata_(NULL) {

- SharedCtor();

- MergeFrom(from);

+ _internal_metadata_(NULL),

+ fields_(from.fields_),

+ oneofs_(from.oneofs_),

+ options_(from.options_),

+ _cached_size_(0) {

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

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

+ if (from.name().size() > 0) {

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),

+ GetArenaNoVirtual());

+ }

+ if (from.has_source_context()) {

+ source_context_ = new ::google::protobuf::SourceContext(*from.source_context_);

+ } else {

+ source_context_ = NULL;

+ }

+ syntax_ = from.syntax_;

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

}

void Type::SharedCtor() {

- _is_default_instance_ = false;

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

- _cached_size_ = 0;

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

- source_context_ = NULL;

- syntax_ = 0;

+ ::memset(&source_context_, 0, reinterpret_cast<char*>(&syntax_) -

+ reinterpret_cast<char*>(&source_context_) + sizeof(syntax_));

+ _cached_size_ = 0;

}

Type::~Type() {

@@ -327,12 +425,23 @@ Type::~Type() {

}

void Type::SharedDtor() {

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

- if (this != default_instance_) {

+ ::google::protobuf::Arena* arena = GetArenaNoVirtual();

+ if (arena != NULL) {

+ return;

+ }

+ name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ if (this != internal_default_instance()) {

delete source_context_;

}

+void Type::ArenaDtor(void* object) {

+ Type* _this = reinterpret_cast< Type* >(object);

+ (void)_this;

+void Type::RegisterArenaDtor(::google::protobuf::Arena* arena) {

void Type::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

@@ -340,33 +449,29 @@ void Type::SetCachedSize(int size) const {

}

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

protobuf_AssignDescriptorsOnce();

- return Type_descriptor_;

+ return file_level_metadata[0].descriptor;

}

const Type& Type::default_instance() {

- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

- return *default_instance_;

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ return *internal_default_instance();

}

-Type* Type::default_instance_ = NULL;

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

- Type* n = new Type;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

+ return ::google::protobuf::Arena::CreateMessage<Type>(arena);

}

void Type::Clear() {

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

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

- if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;

- source_context_ = NULL;

- syntax_ = 0;

fields_.Clear();

oneofs_.Clear();

options_.Clear();

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ if (GetArenaNoVirtual() == NULL && source_context_ != NULL) {

+ delete source_context_;

+ }

+ source_context_ = NULL;

+ syntax_ = 0;

}

bool Type::MergePartialFromCodedStream(

@@ -375,13 +480,13 @@ bool Type::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

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

for (;;) {

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

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

tag = p.first;

if (!p.second) goto handle_unusual;

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

- // optional string name = 1;

+ // string name = 1;

case 1: {

- if (tag == 10) {

+ if (tag == 10u) {

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

input, this->mutable_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -391,31 +496,25 @@ bool Type::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(18)) goto parse_fields;

break;

}

// repeated .google.protobuf.Field fields = 2;

case 2: {

- if (tag == 18) {

- parse_fields:

+ if (tag == 18u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_fields:

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

input, add_fields()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(18)) goto parse_loop_fields;

input->UnsafeDecrementRecursionDepth();

- if (input->ExpectTag(26)) goto parse_oneofs;

break;

}

// repeated string oneofs = 3;

case 3: {

- if (tag == 26) {

- parse_oneofs:

+ if (tag == 26u) {

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

input, this->add_oneofs()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -426,45 +525,36 @@ bool Type::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(26)) goto parse_oneofs;

- if (input->ExpectTag(34)) goto parse_options;

break;

}

// repeated .google.protobuf.Option options = 4;

case 4: {

- if (tag == 34) {

- parse_options:

+ if (tag == 34u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_options:

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

input, add_options()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(34)) goto parse_loop_options;

input->UnsafeDecrementRecursionDepth();

- if (input->ExpectTag(42)) goto parse_source_context;

break;

}

- // optional .google.protobuf.SourceContext source_context = 5;

+ // .google.protobuf.SourceContext source_context = 5;

case 5: {

- if (tag == 42) {

- parse_source_context:

+ if (tag == 42u) {

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

input, mutable_source_context()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(48)) goto parse_syntax;

break;

}

- // optional .google.protobuf.Syntax syntax = 6;

+ // .google.protobuf.Syntax syntax = 6;

case 6: {

- if (tag == 48) {

- parse_syntax:

+ if (tag == 48u) {

int value;

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

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -473,7 +563,6 @@ bool Type::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

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

break;

}

@@ -501,7 +590,7 @@ failure:

void Type::SerializeWithCachedSizes(

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

// @@protoc_insertion_point(serialize_start:google.protobuf.Type)

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -533,13 +622,13 @@ void Type::SerializeWithCachedSizes(

4, this->options(i), output);

}

- // optional .google.protobuf.SourceContext source_context = 5;

+ // .google.protobuf.SourceContext source_context = 5;

if (this->has_source_context()) {

::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

5, *this->source_context_, output);

}

- // optional .google.protobuf.Syntax syntax = 6;

+ // .google.protobuf.Syntax syntax = 6;

if (this->syntax() != 0) {

::google::protobuf::internal::WireFormatLite::WriteEnum(

6, this->syntax(), output);

@@ -548,10 +637,11 @@ void Type::SerializeWithCachedSizes(

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

}

-::google::protobuf::uint8* Type::SerializeWithCachedSizesToArray(

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

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

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

+ (void)deterministic; // Unused

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

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -565,8 +655,8 @@ void Type::SerializeWithCachedSizes(

// repeated .google.protobuf.Field fields = 2;

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

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

- WriteMessageNoVirtualToArray(

- 2, this->fields(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 2, this->fields(i), false, target);

}

// repeated string oneofs = 3;

@@ -582,18 +672,18 @@ void Type::SerializeWithCachedSizes(

// repeated .google.protobuf.Option options = 4;

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

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

- WriteMessageNoVirtualToArray(

- 4, this->options(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 4, this->options(i), false, target);

}

- // optional .google.protobuf.SourceContext source_context = 5;

+ // .google.protobuf.SourceContext source_context = 5;

if (this->has_source_context()) {

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

- WriteMessageNoVirtualToArray(

- 5, *this->source_context_, target);

+ InternalWriteMessageNoVirtualToArray(

+ 5, *this->source_context_, false, target);

}

- // optional .google.protobuf.Syntax syntax = 6;

+ // .google.protobuf.Syntax syntax = 6;

if (this->syntax() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(

6, this->syntax(), target);

@@ -603,63 +693,71 @@ void Type::SerializeWithCachedSizes(

return target;

}

-int Type::ByteSize() const {

+size_t Type::ByteSizeLong() const {

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

- int total_size = 0;

+ size_t total_size = 0;

- // optional string name = 1;

+ // repeated .google.protobuf.Field fields = 2;

+ {

+ unsigned int count = this->fields_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->fields(i));

+ }

+ // repeated string oneofs = 3;

+ total_size += 1 *

+ ::google::protobuf::internal::FromIntSize(this->oneofs_size());

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

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

+ this->oneofs(i));

+ }

+ // repeated .google.protobuf.Option options = 4;

+ {

+ unsigned int count = this->options_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->options(i));

+ }

+ // string name = 1;

if (this->name().size() > 0) {

total_size += 1 +

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

this->name());

}

- // optional .google.protobuf.SourceContext source_context = 5;

+ // .google.protobuf.SourceContext source_context = 5;

if (this->has_source_context()) {

total_size += 1 +

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

*this->source_context_);

}

- // optional .google.protobuf.Syntax syntax = 6;

+ // .google.protobuf.Syntax syntax = 6;

if (this->syntax() != 0) {

total_size += 1 +

::google::protobuf::internal::WireFormatLite::EnumSize(this->syntax());

}

- // repeated .google.protobuf.Field fields = 2;

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

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

- total_size +=

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

- this->fields(i));

- }

- // repeated string oneofs = 3;

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

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

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

- this->oneofs(i));

- }

- // repeated .google.protobuf.Option options = 4;

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

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

- total_size +=

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

- this->options(i));

- }

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

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = total_size;

+ _cached_size_ = cached_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

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

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

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

- const Type* source =

+ GOOGLE_DCHECK_NE(&from, this);

+ const Type* source =

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

&from);

if (source == NULL) {

@@ -673,13 +771,13 @@ void Type::MergeFrom(const ::google::protobuf::Message& from) {

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

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

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

+ GOOGLE_DCHECK_NE(&from, this);

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

fields_.MergeFrom(from.fields_);

oneofs_.MergeFrom(from.oneofs_);

options_.MergeFrom(from.options_);

if (from.name().size() > 0) {

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

+ set_name(from.name());

}

if (from.has_source_context()) {

mutable_source_context()->::google::protobuf::SourceContext::MergeFrom(from.source_context());

@@ -704,79 +802,111 @@ void Type::CopyFrom(const Type& from) {

}

bool Type::IsInitialized() const {

return true;

}

void Type::Swap(Type* other) {

if (other == this) return;

+ if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {

+ InternalSwap(other);

+ } else {

+ Type* temp = New(GetArenaNoVirtual());

+ temp->MergeFrom(*other);

+ other->CopyFrom(*this);

+ InternalSwap(temp);

+ if (GetArenaNoVirtual() == NULL) {

+ delete temp;

+ }

+void Type::UnsafeArenaSwap(Type* other) {

+ if (other == this) return;

+ GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());

InternalSwap(other);

}

void Type::InternalSwap(Type* other) {

- name_.Swap(&other->name_);

fields_.UnsafeArenaSwap(&other->fields_);

oneofs_.UnsafeArenaSwap(&other->oneofs_);

options_.UnsafeArenaSwap(&other->options_);

+ name_.Swap(&other->name_);

std::swap(source_context_, other->source_context_);

std::swap(syntax_, other->syntax_);

- _internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::Metadata metadata;

- metadata.descriptor = Type_descriptor_;

- metadata.reflection = Type_reflection_;

- return metadata;

+ return file_level_metadata[0];

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

// Type

-// optional string name = 1;

+// string name = 1;

void Type::clear_name() {

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

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Type::name() const {

+const ::std::string& Type::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.Type.name)

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

+ return name_.Get();

}

- void Type::set_name(const ::std::string& value) {

+void Type::set_name(const ::std::string& value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Type.name)

}

- void Type::set_name(const char* value) {

+void Type::set_name(const char* value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Type.name)

}

- void Type::set_name(const char* value, size_t size) {

+void Type::set_name(const char* value,

+ size_t size) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Type.name)

}

- ::std::string* Type::mutable_name() {

+::std::string* Type::mutable_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Type.name)

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

+ return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Type::release_name() {

+::std::string* Type::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.Type.name)

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

+ return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Type::unsafe_arena_release_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Type.name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Type::set_allocated_name(::std::string* name) {

+void Type::set_allocated_name(::std::string* name) {

if (name != NULL) {

} else {

}

- name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);

+ name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.name)

}

+void Type::unsafe_arena_set_allocated_name(

+ ::std::string* name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (name != NULL) {

+ } else {

+ }

+ name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.name)

// repeated .google.protobuf.Field fields = 2;

int Type::fields_size() const {

@@ -815,49 +945,49 @@ int Type::oneofs_size() const {

void Type::clear_oneofs() {

oneofs_.Clear();

}

- const ::std::string& Type::oneofs(int index) const {

+const ::std::string& Type::oneofs(int index) const {

// @@protoc_insertion_point(field_get:google.protobuf.Type.oneofs)

return oneofs_.Get(index);

}

- ::std::string* Type::mutable_oneofs(int index) {

+::std::string* Type::mutable_oneofs(int index) {

// @@protoc_insertion_point(field_mutable:google.protobuf.Type.oneofs)

return oneofs_.Mutable(index);

}

- void Type::set_oneofs(int index, const ::std::string& value) {

+void Type::set_oneofs(int index, const ::std::string& value) {

// @@protoc_insertion_point(field_set:google.protobuf.Type.oneofs)

oneofs_.Mutable(index)->assign(value);

}

- void Type::set_oneofs(int index, const char* value) {

+void Type::set_oneofs(int index, const char* value) {

oneofs_.Mutable(index)->assign(value);

// @@protoc_insertion_point(field_set_char:google.protobuf.Type.oneofs)

}

- void Type::set_oneofs(int index, const char* value, size_t size) {

+void Type::set_oneofs(int index, const char* value, size_t size) {

oneofs_.Mutable(index)->assign(

reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Type.oneofs)

}

- ::std::string* Type::add_oneofs() {

+::std::string* Type::add_oneofs() {

// @@protoc_insertion_point(field_add_mutable:google.protobuf.Type.oneofs)

return oneofs_.Add();

}

- void Type::add_oneofs(const ::std::string& value) {

+void Type::add_oneofs(const ::std::string& value) {

oneofs_.Add()->assign(value);

// @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)

}

- void Type::add_oneofs(const char* value) {

+void Type::add_oneofs(const char* value) {

oneofs_.Add()->assign(value);

// @@protoc_insertion_point(field_add_char:google.protobuf.Type.oneofs)

}

- void Type::add_oneofs(const char* value, size_t size) {

+void Type::add_oneofs(const char* value, size_t size) {

oneofs_.Add()->assign(reinterpret_cast<const char*>(value), size);

// @@protoc_insertion_point(field_add_pointer:google.protobuf.Type.oneofs)

}

- const ::google::protobuf::RepeatedPtrField< ::std::string>&

+const ::google::protobuf::RepeatedPtrField< ::std::string>&

Type::oneofs() const {

// @@protoc_insertion_point(field_list:google.protobuf.Type.oneofs)

return oneofs_;

}

- ::google::protobuf::RepeatedPtrField< ::std::string>*

+::google::protobuf::RepeatedPtrField< ::std::string>*

Type::mutable_oneofs() {

// @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.oneofs)

return &oneofs_;

@@ -893,9 +1023,9 @@ Type::options() const {

return options_;

}

-// optional .google.protobuf.SourceContext source_context = 5;

+// .google.protobuf.SourceContext source_context = 5;

bool Type::has_source_context() const {

- return !_is_default_instance_ && source_context_ != NULL;

+ return this != internal_default_instance() && source_context_ != NULL;

}

void Type::clear_source_context() {

if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;

@@ -903,12 +1033,13 @@ void Type::clear_source_context() {

}

const ::google::protobuf::SourceContext& Type::source_context() const {

// @@protoc_insertion_point(field_get:google.protobuf.Type.source_context)

- return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_;

+ return source_context_ != NULL ? *source_context_

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

}

::google::protobuf::SourceContext* Type::mutable_source_context() {

if (source_context_ == NULL) {

- source_context_ = new ::google::protobuf::SourceContext;

+ _slow_mutable_source_context();

}

// @@protoc_insertion_point(field_mutable:google.protobuf.Type.source_context)

return source_context_;

@@ -916,12 +1047,24 @@ const ::google::protobuf::SourceContext& Type::source_context() const {

::google::protobuf::SourceContext* Type::release_source_context() {

// @@protoc_insertion_point(field_release:google.protobuf.Type.source_context)

- ::google::protobuf::SourceContext* temp = source_context_;

- source_context_ = NULL;

- return temp;

+ if (GetArenaNoVirtual() != NULL) {

+ return _slow_release_source_context();

+ } else {

+ ::google::protobuf::SourceContext* temp = source_context_;

+ source_context_ = NULL;

+ return temp;

+ }

}

-void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) {

- delete source_context_;

+ void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) {

+ ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();

+ if (message_arena == NULL) {

+ delete source_context_;

+ }

+ if (source_context != NULL) {

+ if (message_arena != NULL) {

+ message_arena->Own(source_context);

+ }

source_context_ = source_context;

if (source_context) {

@@ -931,15 +1074,15 @@ void Type::set_allocated_source_context(::google::protobuf::SourceContext* sourc

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.source_context)

}

-// optional .google.protobuf.Syntax syntax = 6;

+// .google.protobuf.Syntax syntax = 6;

void Type::clear_syntax() {

syntax_ = 0;

}

- ::google::protobuf::Syntax Type::syntax() const {

+::google::protobuf::Syntax Type::syntax() const {

// @@protoc_insertion_point(field_get:google.protobuf.Type.syntax)

return static_cast< ::google::protobuf::Syntax >(syntax_);

}

- void Type::set_syntax(::google::protobuf::Syntax value) {

+void Type::set_syntax(::google::protobuf::Syntax value) {

syntax_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Type.syntax)

@@ -949,86 +1092,6 @@ void Type::clear_syntax() {

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

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

- protobuf_AssignDescriptorsOnce();

- return Field_Kind_descriptor_;

-bool Field_Kind_IsValid(int value) {

- switch(value) {

- case 0:

- case 1:

- case 2:

- case 3:

- case 4:

- case 5:

- case 6:

- case 7:

- case 8:

- case 9:

- case 10:

- case 11:

- case 12:

- case 13:

- case 14:

- case 15:

- case 16:

- case 17:

- case 18:

- return true;

- default:

- return false;

- }

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

-const Field_Kind Field::TYPE_UNKNOWN;

-const Field_Kind Field::TYPE_DOUBLE;

-const Field_Kind Field::TYPE_FLOAT;

-const Field_Kind Field::TYPE_INT64;

-const Field_Kind Field::TYPE_UINT64;

-const Field_Kind Field::TYPE_INT32;

-const Field_Kind Field::TYPE_FIXED64;

-const Field_Kind Field::TYPE_FIXED32;

-const Field_Kind Field::TYPE_BOOL;

-const Field_Kind Field::TYPE_STRING;

-const Field_Kind Field::TYPE_GROUP;

-const Field_Kind Field::TYPE_MESSAGE;

-const Field_Kind Field::TYPE_BYTES;

-const Field_Kind Field::TYPE_UINT32;

-const Field_Kind Field::TYPE_ENUM;

-const Field_Kind Field::TYPE_SFIXED32;

-const Field_Kind Field::TYPE_SFIXED64;

-const Field_Kind Field::TYPE_SINT32;

-const Field_Kind Field::TYPE_SINT64;

-const Field_Kind Field::Kind_MIN;

-const Field_Kind Field::Kind_MAX;

-const int Field::Kind_ARRAYSIZE;

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

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

- protobuf_AssignDescriptorsOnce();

- return Field_Cardinality_descriptor_;

-bool Field_Cardinality_IsValid(int value) {

- switch(value) {

- case 0:

- case 1:

- case 2:

- case 3:

- return true;

- default:

- return false;

- }

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

-const Field_Cardinality Field::CARDINALITY_UNKNOWN;

-const Field_Cardinality Field::CARDINALITY_OPTIONAL;

-const Field_Cardinality Field::CARDINALITY_REQUIRED;

-const Field_Cardinality Field::CARDINALITY_REPEATED;

-const Field_Cardinality Field::Cardinality_MIN;

-const Field_Cardinality Field::Cardinality_MAX;

-const int Field::Cardinality_ARRAYSIZE;

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

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

const int Field::kKindFieldNumber;

const int Field::kCardinalityFieldNumber;

@@ -1044,35 +1107,63 @@ const int Field::kDefaultValueFieldNumber;

Field::Field()

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

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

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ }

SharedCtor();

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

}

-void Field::InitAsDefaultInstance() {

- _is_default_instance_ = true;

+Field::Field(::google::protobuf::Arena* arena)

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

+ _internal_metadata_(arena),

+ options_(arena) {

+#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ SharedCtor();

+ RegisterArenaDtor(arena);

+ // @@protoc_insertion_point(arena_constructor:google.protobuf.Field)

}

Field::Field(const Field& from)

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

- _internal_metadata_(NULL) {

- SharedCtor();

- MergeFrom(from);

+ _internal_metadata_(NULL),

+ options_(from.options_),

+ _cached_size_(0) {

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

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

+ if (from.name().size() > 0) {

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),

+ GetArenaNoVirtual());

+ }

+ type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (from.type_url().size() > 0) {

+ type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_url(),

+ GetArenaNoVirtual());

+ }

+ json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (from.json_name().size() > 0) {

+ json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name(),

+ GetArenaNoVirtual());

+ }

+ default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ if (from.default_value().size() > 0) {

+ default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value(),

+ GetArenaNoVirtual());

+ }

+ ::memcpy(&kind_, &from.kind_,

+ reinterpret_cast<char*>(&packed_) -

+ reinterpret_cast<char*>(&kind_) + sizeof(packed_));

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

}

void Field::SharedCtor() {

- _is_default_instance_ = false;

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

- _cached_size_ = 0;

- kind_ = 0;

- cardinality_ = 0;

- number_ = 0;

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

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

- oneof_index_ = 0;

- packed_ = false;

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

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

+ ::memset(&kind_, 0, reinterpret_cast<char*>(&packed_) -

+ reinterpret_cast<char*>(&kind_) + sizeof(packed_));

+ _cached_size_ = 0;

}

Field::~Field() {

@@ -1081,14 +1172,23 @@ Field::~Field() {

}

void Field::SharedDtor() {

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

- type_url_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- json_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- default_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- if (this != default_instance_) {

+ ::google::protobuf::Arena* arena = GetArenaNoVirtual();

+ if (arena != NULL) {

+ return;

}

+ name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ type_url_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ json_name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ default_value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

}

+void Field::ArenaDtor(void* object) {

+ Field* _this = reinterpret_cast< Field* >(object);

+ (void)_this;

+void Field::RegisterArenaDtor(::google::protobuf::Arena* arena) {

void Field::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

@@ -1096,54 +1196,27 @@ void Field::SetCachedSize(int size) const {

}

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

protobuf_AssignDescriptorsOnce();

- return Field_descriptor_;

+ return file_level_metadata[1].descriptor;

}

const Field& Field::default_instance() {

- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

- return *default_instance_;

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ return *internal_default_instance();

}

-Field* Field::default_instance_ = NULL;

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

- Field* n = new Field;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

+ return ::google::protobuf::Arena::CreateMessage<Field>(arena);

}

void Field::Clear() {

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

-#if defined(__clang__)

-#define ZR_HELPER_(f) \

- _Pragma("clang diagnostic push") \

- _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \

- __builtin_offsetof(Field, f) \

- _Pragma("clang diagnostic pop")

-#else

-#define ZR_HELPER_(f) reinterpret_cast<char*>(\

- &reinterpret_cast<Field*>(16)->f)

-#endif

-#define ZR_(first, last) do {\

- ::memset(&first, 0,\

- ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\

-} while (0)

- ZR_(kind_, cardinality_);

- ZR_(number_, oneof_index_);

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

- type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- packed_ = false;

- json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

- default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

-#undef ZR_HELPER_

-#undef ZR_

options_.Clear();

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ type_url_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ json_name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ default_value_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ ::memset(&kind_, 0, reinterpret_cast<char*>(&packed_) -

+ reinterpret_cast<char*>(&kind_) + sizeof(packed_));

}

bool Field::MergePartialFromCodedStream(

@@ -1152,13 +1225,13 @@ bool Field::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

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

for (;;) {

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

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

tag = p.first;

if (!p.second) goto handle_unusual;

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

- // optional .google.protobuf.Field.Kind kind = 1;

+ // .google.protobuf.Field.Kind kind = 1;

case 1: {

- if (tag == 8) {

+ if (tag == 8u) {

int value;

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

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -1167,14 +1240,12 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(16)) goto parse_cardinality;

break;

}

- // optional .google.protobuf.Field.Cardinality cardinality = 2;

+ // .google.protobuf.Field.Cardinality cardinality = 2;

case 2: {

- if (tag == 16) {

- parse_cardinality:

+ if (tag == 16u) {

int value;

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

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -1183,29 +1254,25 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(24)) goto parse_number;

break;

}

- // optional int32 number = 3;

+ // int32 number = 3;

case 3: {

- if (tag == 24) {

- parse_number:

+ if (tag == 24u) {

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

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

input, &number_)));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(34)) goto parse_name;

break;

}

- // optional string name = 4;

+ // string name = 4;

case 4: {

- if (tag == 34) {

- parse_name:

+ if (tag == 34u) {

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

input, this->mutable_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -1215,14 +1282,12 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(50)) goto parse_type_url;

break;

}

- // optional string type_url = 6;

+ // string type_url = 6;

case 6: {

- if (tag == 50) {

- parse_type_url:

+ if (tag == 50u) {

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

input, this->mutable_type_url()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -1232,61 +1297,51 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(56)) goto parse_oneof_index;

break;

}

- // optional int32 oneof_index = 7;

+ // int32 oneof_index = 7;

case 7: {

- if (tag == 56) {

- parse_oneof_index:

+ if (tag == 56u) {

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

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

input, &oneof_index_)));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(64)) goto parse_packed;

break;

}

- // optional bool packed = 8;

+ // bool packed = 8;

case 8: {

- if (tag == 64) {

- parse_packed:

+ if (tag == 64u) {

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

bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

input, &packed_)));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(74)) goto parse_options;

break;

}

// repeated .google.protobuf.Option options = 9;

case 9: {

- if (tag == 74) {

- parse_options:

+ if (tag == 74u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_options:

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

input, add_options()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(74)) goto parse_loop_options;

input->UnsafeDecrementRecursionDepth();

- if (input->ExpectTag(82)) goto parse_json_name;

break;

}

- // optional string json_name = 10;

+ // string json_name = 10;

case 10: {

- if (tag == 82) {

- parse_json_name:

+ if (tag == 82u) {

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

input, this->mutable_json_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -1296,14 +1351,12 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(90)) goto parse_default_value;

break;

}

- // optional string default_value = 11;

+ // string default_value = 11;

case 11: {

- if (tag == 90) {

- parse_default_value:

+ if (tag == 90u) {

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

input, this->mutable_default_value()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -1313,7 +1366,6 @@ bool Field::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

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

break;

}

@@ -1341,24 +1393,24 @@ failure:

void Field::SerializeWithCachedSizes(

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

// @@protoc_insertion_point(serialize_start:google.protobuf.Field)

- // optional .google.protobuf.Field.Kind kind = 1;

+ // .google.protobuf.Field.Kind kind = 1;

if (this->kind() != 0) {

::google::protobuf::internal::WireFormatLite::WriteEnum(

1, this->kind(), output);

}

- // optional .google.protobuf.Field.Cardinality cardinality = 2;

+ // .google.protobuf.Field.Cardinality cardinality = 2;

if (this->cardinality() != 0) {

::google::protobuf::internal::WireFormatLite::WriteEnum(

2, this->cardinality(), output);

}

- // optional int32 number = 3;

+ // int32 number = 3;

if (this->number() != 0) {

::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->number(), output);

}

- // optional string name = 4;

+ // string name = 4;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -1368,7 +1420,7 @@ void Field::SerializeWithCachedSizes(

4, this->name(), output);

}

- // optional string type_url = 6;

+ // string type_url = 6;

if (this->type_url().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->type_url().data(), this->type_url().length(),

@@ -1378,12 +1430,12 @@ void Field::SerializeWithCachedSizes(

6, this->type_url(), output);

}

- // optional int32 oneof_index = 7;

+ // int32 oneof_index = 7;

if (this->oneof_index() != 0) {

::google::protobuf::internal::WireFormatLite::WriteInt32(7, this->oneof_index(), output);

}

- // optional bool packed = 8;

+ // bool packed = 8;

if (this->packed() != 0) {

::google::protobuf::internal::WireFormatLite::WriteBool(8, this->packed(), output);

}

@@ -1394,7 +1446,7 @@ void Field::SerializeWithCachedSizes(

9, this->options(i), output);

}

- // optional string json_name = 10;

+ // string json_name = 10;

if (this->json_name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->json_name().data(), this->json_name().length(),

@@ -1404,7 +1456,7 @@ void Field::SerializeWithCachedSizes(

10, this->json_name(), output);

}

- // optional string default_value = 11;

+ // string default_value = 11;

if (this->default_value().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->default_value().data(), this->default_value().length(),

@@ -1417,27 +1469,28 @@ void Field::SerializeWithCachedSizes(

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

}

-::google::protobuf::uint8* Field::SerializeWithCachedSizesToArray(

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

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

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

+ (void)deterministic; // Unused

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

- // optional .google.protobuf.Field.Kind kind = 1;

+ // .google.protobuf.Field.Kind kind = 1;

if (this->kind() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(

1, this->kind(), target);

}

- // optional .google.protobuf.Field.Cardinality cardinality = 2;

+ // .google.protobuf.Field.Cardinality cardinality = 2;

if (this->cardinality() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(

2, this->cardinality(), target);

}

- // optional int32 number = 3;

+ // int32 number = 3;

if (this->number() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->number(), target);

}

- // optional string name = 4;

+ // string name = 4;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -1448,7 +1501,7 @@ void Field::SerializeWithCachedSizes(

4, this->name(), target);

}

- // optional string type_url = 6;

+ // string type_url = 6;

if (this->type_url().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->type_url().data(), this->type_url().length(),

@@ -1459,12 +1512,12 @@ void Field::SerializeWithCachedSizes(

6, this->type_url(), target);

}

- // optional int32 oneof_index = 7;

+ // int32 oneof_index = 7;

if (this->oneof_index() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(7, this->oneof_index(), target);

}

- // optional bool packed = 8;

+ // bool packed = 8;

if (this->packed() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->packed(), target);

}

@@ -1472,11 +1525,11 @@ void Field::SerializeWithCachedSizes(

// repeated .google.protobuf.Option options = 9;

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

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

- WriteMessageNoVirtualToArray(

- 9, this->options(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 9, this->options(i), false, target);

}

- // optional string json_name = 10;

+ // string json_name = 10;

if (this->json_name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->json_name().data(), this->json_name().length(),

@@ -1487,7 +1540,7 @@ void Field::SerializeWithCachedSizes(

10, this->json_name(), target);

}

- // optional string default_value = 11;

+ // string default_value = 11;

if (this->default_value().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->default_value().data(), this->default_value().length(),

@@ -1502,87 +1555,91 @@ void Field::SerializeWithCachedSizes(

return target;

}

-int Field::ByteSize() const {

+size_t Field::ByteSizeLong() const {

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

- int total_size = 0;

+ size_t total_size = 0;

- // optional .google.protobuf.Field.Kind kind = 1;

- if (this->kind() != 0) {

- total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());

+ // repeated .google.protobuf.Option options = 9;

+ {

+ unsigned int count = this->options_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->options(i));

+ }

}

- // optional .google.protobuf.Field.Cardinality cardinality = 2;

- if (this->cardinality() != 0) {

+ // string name = 4;

+ if (this->name().size() > 0) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::EnumSize(this->cardinality());

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

+ this->name());

}

- // optional int32 number = 3;

- if (this->number() != 0) {

+ // string type_url = 6;

+ if (this->type_url().size() > 0) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::Int32Size(

- this->number());

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

+ this->type_url());

}

- // optional string name = 4;

- if (this->name().size() > 0) {

+ // string json_name = 10;

+ if (this->json_name().size() > 0) {

total_size += 1 +

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

- this->name());

+ this->json_name());

}

- // optional string type_url = 6;

- if (this->type_url().size() > 0) {

+ // string default_value = 11;

+ if (this->default_value().size() > 0) {

total_size += 1 +

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

- this->type_url());

+ this->default_value());

}

- // optional int32 oneof_index = 7;

- if (this->oneof_index() != 0) {

+ // .google.protobuf.Field.Kind kind = 1;

+ if (this->kind() != 0) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::Int32Size(

- this->oneof_index());

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->kind());

}

- // optional bool packed = 8;

- if (this->packed() != 0) {

- total_size += 1 + 1;

+ // .google.protobuf.Field.Cardinality cardinality = 2;

+ if (this->cardinality() != 0) {

+ total_size += 1 +

+ ::google::protobuf::internal::WireFormatLite::EnumSize(this->cardinality());

}

- // optional string json_name = 10;

- if (this->json_name().size() > 0) {

+ // int32 number = 3;

+ if (this->number() != 0) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->json_name());

+ ::google::protobuf::internal::WireFormatLite::Int32Size(

+ this->number());

}

- // optional string default_value = 11;

- if (this->default_value().size() > 0) {

+ // int32 oneof_index = 7;

+ if (this->oneof_index() != 0) {

total_size += 1 +

- ::google::protobuf::internal::WireFormatLite::StringSize(

- this->default_value());

+ ::google::protobuf::internal::WireFormatLite::Int32Size(

+ this->oneof_index());

}

- // repeated .google.protobuf.Option options = 9;

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

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

- total_size +=

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

- this->options(i));

+ // bool packed = 8;

+ if (this->packed() != 0) {

+ total_size += 1 + 1;

}

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

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = total_size;

+ _cached_size_ = cached_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

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

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

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

- const Field* source =

+ GOOGLE_DCHECK_NE(&from, this);

+ const Field* source =

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

&from);

if (source == NULL) {

@@ -1596,8 +1653,21 @@ void Field::MergeFrom(const ::google::protobuf::Message& from) {

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

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

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

+ GOOGLE_DCHECK_NE(&from, this);

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

options_.MergeFrom(from.options_);

+ if (from.name().size() > 0) {

+ set_name(from.name());

+ }

+ if (from.type_url().size() > 0) {

+ set_type_url(from.type_url());

+ }

+ if (from.json_name().size() > 0) {

+ set_json_name(from.json_name());

+ }

+ if (from.default_value().size() > 0) {

+ set_default_value(from.default_value());

+ }

if (from.kind() != 0) {

set_kind(from.kind());

}

@@ -1607,28 +1677,12 @@ void Field::MergeFrom(const Field& from) {

if (from.number() != 0) {

set_number(from.number());

}

- if (from.name().size() > 0) {

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

- }

- if (from.type_url().size() > 0) {

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

- }

if (from.oneof_index() != 0) {

set_oneof_index(from.oneof_index());

}

if (from.packed() != 0) {

set_packed(from.packed());

}

- if (from.json_name().size() > 0) {

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

- }

- if (from.default_value().size() > 0) {

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

- }

}

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

@@ -1646,193 +1700,247 @@ void Field::CopyFrom(const Field& from) {

}

bool Field::IsInitialized() const {

return true;

}

-void Field::Swap(Field* other) {

+void Field::Swap(Field* other) {

+ if (other == this) return;

+ if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {

+ InternalSwap(other);

+ } else {

+ Field* temp = New(GetArenaNoVirtual());

+ temp->MergeFrom(*other);

+ other->CopyFrom(*this);

+ InternalSwap(temp);

+ if (GetArenaNoVirtual() == NULL) {

+ delete temp;

+ }

+void Field::UnsafeArenaSwap(Field* other) {

if (other == this) return;

+ GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());

InternalSwap(other);

}

void Field::InternalSwap(Field* other) {

+ options_.UnsafeArenaSwap(&other->options_);

+ name_.Swap(&other->name_);

+ type_url_.Swap(&other->type_url_);

+ json_name_.Swap(&other->json_name_);

+ default_value_.Swap(&other->default_value_);

std::swap(kind_, other->kind_);

std::swap(cardinality_, other->cardinality_);

std::swap(number_, other->number_);

- name_.Swap(&other->name_);

- type_url_.Swap(&other->type_url_);

std::swap(oneof_index_, other->oneof_index_);

std::swap(packed_, other->packed_);

- options_.UnsafeArenaSwap(&other->options_);

- json_name_.Swap(&other->json_name_);

- default_value_.Swap(&other->default_value_);

- _internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::Metadata metadata;

- metadata.descriptor = Field_descriptor_;

- metadata.reflection = Field_reflection_;

- return metadata;

+ return file_level_metadata[1];

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

// Field

-// optional .google.protobuf.Field.Kind kind = 1;

+// .google.protobuf.Field.Kind kind = 1;

void Field::clear_kind() {

kind_ = 0;

}

- ::google::protobuf::Field_Kind Field::kind() const {

+::google::protobuf::Field_Kind Field::kind() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.kind)

return static_cast< ::google::protobuf::Field_Kind >(kind_);

}

- void Field::set_kind(::google::protobuf::Field_Kind value) {

+void Field::set_kind(::google::protobuf::Field_Kind value) {

kind_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Field.kind)

}

-// optional .google.protobuf.Field.Cardinality cardinality = 2;

+// .google.protobuf.Field.Cardinality cardinality = 2;

void Field::clear_cardinality() {

cardinality_ = 0;

}

- ::google::protobuf::Field_Cardinality Field::cardinality() const {

+::google::protobuf::Field_Cardinality Field::cardinality() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.cardinality)

return static_cast< ::google::protobuf::Field_Cardinality >(cardinality_);

}

- void Field::set_cardinality(::google::protobuf::Field_Cardinality value) {

+void Field::set_cardinality(::google::protobuf::Field_Cardinality value) {

cardinality_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Field.cardinality)

}

-// optional int32 number = 3;

+// int32 number = 3;

void Field::clear_number() {

number_ = 0;

}

- ::google::protobuf::int32 Field::number() const {

+::google::protobuf::int32 Field::number() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.number)

return number_;

}

- void Field::set_number(::google::protobuf::int32 value) {

+void Field::set_number(::google::protobuf::int32 value) {

number_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Field.number)

}

-// optional string name = 4;

+// string name = 4;

void Field::clear_name() {

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

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Field::name() const {

+const ::std::string& Field::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.name)

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

+ return name_.Get();

}

- void Field::set_name(const ::std::string& value) {

+void Field::set_name(const ::std::string& value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Field.name)

}

- void Field::set_name(const char* value) {

+void Field::set_name(const char* value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Field.name)

}

- void Field::set_name(const char* value, size_t size) {

+void Field::set_name(const char* value,

+ size_t size) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.name)

}

- ::std::string* Field::mutable_name() {

+::std::string* Field::mutable_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Field.name)

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

+ return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Field::release_name() {

+::std::string* Field::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.Field.name)

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

+ return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Field::unsafe_arena_release_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Field::set_allocated_name(::std::string* name) {

+void Field::set_allocated_name(::std::string* name) {

if (name != NULL) {

} else {

}

- name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);

+ name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.name)

}

+void Field::unsafe_arena_set_allocated_name(

+ ::std::string* name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (name != NULL) {

+ } else {

+ }

+ name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.name)

-// optional string type_url = 6;

+// string type_url = 6;

void Field::clear_type_url() {

- type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ type_url_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Field::type_url() const {

+const ::std::string& Field::type_url() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.type_url)

- return type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return type_url_.Get();

}

- void Field::set_type_url(const ::std::string& value) {

+void Field::set_type_url(const ::std::string& value) {

- type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Field.type_url)

}

- void Field::set_type_url(const char* value) {

+void Field::set_type_url(const char* value) {

- type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Field.type_url)

}

- void Field::set_type_url(const char* value, size_t size) {

+void Field::set_type_url(const char* value,

+ size_t size) {

- type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ type_url_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.type_url)

}

- ::std::string* Field::mutable_type_url() {

+::std::string* Field::mutable_type_url() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Field.type_url)

- return type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return type_url_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Field::release_type_url() {

+::std::string* Field::release_type_url() {

// @@protoc_insertion_point(field_release:google.protobuf.Field.type_url)

- return type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return type_url_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Field::unsafe_arena_release_type_url() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.type_url)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return type_url_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Field::set_allocated_type_url(::std::string* type_url) {

+void Field::set_allocated_type_url(::std::string* type_url) {

if (type_url != NULL) {

} else {

}

- type_url_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_url);

+ type_url_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), type_url,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.type_url)

}

+void Field::unsafe_arena_set_allocated_type_url(

+ ::std::string* type_url) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (type_url != NULL) {

+ } else {

+ }

+ type_url_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ type_url, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.type_url)

-// optional int32 oneof_index = 7;

+// int32 oneof_index = 7;

void Field::clear_oneof_index() {

oneof_index_ = 0;

}

- ::google::protobuf::int32 Field::oneof_index() const {

+::google::protobuf::int32 Field::oneof_index() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.oneof_index)

return oneof_index_;

}

- void Field::set_oneof_index(::google::protobuf::int32 value) {

+void Field::set_oneof_index(::google::protobuf::int32 value) {

oneof_index_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Field.oneof_index)

}

-// optional bool packed = 8;

+// bool packed = 8;

void Field::clear_packed() {

packed_ = false;

}

- bool Field::packed() const {

+bool Field::packed() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.packed)

return packed_;

}

- void Field::set_packed(bool value) {

+void Field::set_packed(bool value) {

packed_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Field.packed)

@@ -1868,98 +1976,175 @@ Field::options() const {

return options_;

}

-// optional string json_name = 10;

+// string json_name = 10;

void Field::clear_json_name() {

- json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ json_name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Field::json_name() const {

+const ::std::string& Field::json_name() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.json_name)

- return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return json_name_.Get();

}

- void Field::set_json_name(const ::std::string& value) {

+void Field::set_json_name(const ::std::string& value) {

- json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Field.json_name)

}

- void Field::set_json_name(const char* value) {

+void Field::set_json_name(const char* value) {

- json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Field.json_name)

}

- void Field::set_json_name(const char* value, size_t size) {

+void Field::set_json_name(const char* value,

+ size_t size) {

- json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ json_name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.json_name)

}

- ::std::string* Field::mutable_json_name() {

+::std::string* Field::mutable_json_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Field.json_name)

- return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return json_name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Field::release_json_name() {

+::std::string* Field::release_json_name() {

// @@protoc_insertion_point(field_release:google.protobuf.Field.json_name)

- return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return json_name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Field::unsafe_arena_release_json_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.json_name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return json_name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Field::set_allocated_json_name(::std::string* json_name) {

+void Field::set_allocated_json_name(::std::string* json_name) {

if (json_name != NULL) {

} else {

}

- json_name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), json_name);

+ json_name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), json_name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.json_name)

}

+void Field::unsafe_arena_set_allocated_json_name(

+ ::std::string* json_name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (json_name != NULL) {

+ } else {

+ }

+ json_name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ json_name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.json_name)

-// optional string default_value = 11;

+// string default_value = 11;

void Field::clear_default_value() {

- default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ default_value_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Field::default_value() const {

+const ::std::string& Field::default_value() const {

// @@protoc_insertion_point(field_get:google.protobuf.Field.default_value)

- return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return default_value_.Get();

}

- void Field::set_default_value(const ::std::string& value) {

+void Field::set_default_value(const ::std::string& value) {

- default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Field.default_value)

}

- void Field::set_default_value(const char* value) {

+void Field::set_default_value(const char* value) {

- default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Field.default_value)

}

- void Field::set_default_value(const char* value, size_t size) {

+void Field::set_default_value(const char* value,

+ size_t size) {

- default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ default_value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Field.default_value)

}

- ::std::string* Field::mutable_default_value() {

+::std::string* Field::mutable_default_value() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Field.default_value)

- return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return default_value_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Field::release_default_value() {

+::std::string* Field::release_default_value() {

// @@protoc_insertion_point(field_release:google.protobuf.Field.default_value)

- return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());

+ return default_value_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Field::unsafe_arena_release_default_value() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Field.default_value)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return default_value_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Field::set_allocated_default_value(::std::string* default_value) {

+void Field::set_allocated_default_value(::std::string* default_value) {

if (default_value != NULL) {

} else {

}

- default_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value);

+ default_value_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), default_value,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.default_value)

}

+void Field::unsafe_arena_set_allocated_default_value(

+ ::std::string* default_value) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (default_value != NULL) {

+ } else {

+ }

+ default_value_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ default_value, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Field.default_value)

#endif // PROTOBUF_INLINE_NOT_IN_HEADERS

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

+void Enum::_slow_mutable_source_context() {

+ source_context_ = ::google::protobuf::Arena::Create< ::google::protobuf::SourceContext >(

+ GetArenaNoVirtual());

+::google::protobuf::SourceContext* Enum::_slow_release_source_context() {

+ if (source_context_ == NULL) {

+ return NULL;

+ } else {

+ ::google::protobuf::SourceContext* temp = new ::google::protobuf::SourceContext(*source_context_);

+ source_context_ = NULL;

+ return temp;

+ }

+::google::protobuf::SourceContext* Enum::unsafe_arena_release_source_context() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Enum.source_context)

+ ::google::protobuf::SourceContext* temp = source_context_;

+ source_context_ = NULL;

+ return temp;

+void Enum::unsafe_arena_set_allocated_source_context(

+ ::google::protobuf::SourceContext* source_context) {

+ if (GetArenaNoVirtual() == NULL) {

+ delete source_context_;

+ }

+ source_context_ = source_context;

+ if (source_context) {

+ } else {

+ }

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.source_context)

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

const int Enum::kNameFieldNumber;

const int Enum::kEnumvalueFieldNumber;

@@ -1970,30 +2155,50 @@ const int Enum::kSyntaxFieldNumber;

Enum::Enum()

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

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

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ }

SharedCtor();

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

}

-void Enum::InitAsDefaultInstance() {

- _is_default_instance_ = true;

- source_context_ = const_cast< ::google::protobuf::SourceContext*>(&::google::protobuf::SourceContext::default_instance());

+Enum::Enum(::google::protobuf::Arena* arena)

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

+ _internal_metadata_(arena),

+ enumvalue_(arena),

+ options_(arena) {

+#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ SharedCtor();

+ RegisterArenaDtor(arena);

+ // @@protoc_insertion_point(arena_constructor:google.protobuf.Enum)

}

Enum::Enum(const Enum& from)

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

- _internal_metadata_(NULL) {

- SharedCtor();

- MergeFrom(from);

+ _internal_metadata_(NULL),

+ enumvalue_(from.enumvalue_),

+ options_(from.options_),

+ _cached_size_(0) {

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

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

+ if (from.name().size() > 0) {

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),

+ GetArenaNoVirtual());

+ }

+ if (from.has_source_context()) {

+ source_context_ = new ::google::protobuf::SourceContext(*from.source_context_);

+ } else {

+ source_context_ = NULL;

+ }

+ syntax_ = from.syntax_;

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

}

void Enum::SharedCtor() {

- _is_default_instance_ = false;

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

- _cached_size_ = 0;

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

- source_context_ = NULL;

- syntax_ = 0;

+ ::memset(&source_context_, 0, reinterpret_cast<char*>(&syntax_) -

+ reinterpret_cast<char*>(&source_context_) + sizeof(syntax_));

+ _cached_size_ = 0;

}

Enum::~Enum() {

@@ -2002,12 +2207,23 @@ Enum::~Enum() {

}

void Enum::SharedDtor() {

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

- if (this != default_instance_) {

+ ::google::protobuf::Arena* arena = GetArenaNoVirtual();

+ if (arena != NULL) {

+ return;

+ }

+ name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ if (this != internal_default_instance()) {

delete source_context_;

}

+void Enum::ArenaDtor(void* object) {

+ Enum* _this = reinterpret_cast< Enum* >(object);

+ (void)_this;

+void Enum::RegisterArenaDtor(::google::protobuf::Arena* arena) {

void Enum::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

@@ -2015,32 +2231,28 @@ void Enum::SetCachedSize(int size) const {

}

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

protobuf_AssignDescriptorsOnce();

- return Enum_descriptor_;

+ return file_level_metadata[2].descriptor;

}

const Enum& Enum::default_instance() {

- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

- return *default_instance_;

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ return *internal_default_instance();

}

-Enum* Enum::default_instance_ = NULL;

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

- Enum* n = new Enum;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

+ return ::google::protobuf::Arena::CreateMessage<Enum>(arena);

}

void Enum::Clear() {

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

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

- if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;

- source_context_ = NULL;

- syntax_ = 0;

enumvalue_.Clear();

options_.Clear();

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ if (GetArenaNoVirtual() == NULL && source_context_ != NULL) {

+ delete source_context_;

+ }

+ source_context_ = NULL;

+ syntax_ = 0;

}

bool Enum::MergePartialFromCodedStream(

@@ -2049,13 +2261,13 @@ bool Enum::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

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

for (;;) {

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

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

tag = p.first;

if (!p.second) goto handle_unusual;

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

- // optional string name = 1;

+ // string name = 1;

case 1: {

- if (tag == 10) {

+ if (tag == 10u) {

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

input, this->mutable_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -2065,60 +2277,49 @@ bool Enum::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(18)) goto parse_enumvalue;

break;

}

// repeated .google.protobuf.EnumValue enumvalue = 2;

case 2: {

- if (tag == 18) {

- parse_enumvalue:

+ if (tag == 18u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_enumvalue:

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

input, add_enumvalue()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(18)) goto parse_loop_enumvalue;

- if (input->ExpectTag(26)) goto parse_loop_options;

input->UnsafeDecrementRecursionDepth();

break;

}

// repeated .google.protobuf.Option options = 3;

case 3: {

- if (tag == 26) {

+ if (tag == 26u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_options:

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

input, add_options()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(26)) goto parse_loop_options;

input->UnsafeDecrementRecursionDepth();

- if (input->ExpectTag(34)) goto parse_source_context;

break;

}

- // optional .google.protobuf.SourceContext source_context = 4;

+ // .google.protobuf.SourceContext source_context = 4;

case 4: {

- if (tag == 34) {

- parse_source_context:

+ if (tag == 34u) {

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

input, mutable_source_context()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(40)) goto parse_syntax;

break;

}

- // optional .google.protobuf.Syntax syntax = 5;

+ // .google.protobuf.Syntax syntax = 5;

case 5: {

- if (tag == 40) {

- parse_syntax:

+ if (tag == 40u) {

int value;

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

int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(

@@ -2127,7 +2328,6 @@ bool Enum::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

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

break;

}

@@ -2155,7 +2355,7 @@ failure:

void Enum::SerializeWithCachedSizes(

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

// @@protoc_insertion_point(serialize_start:google.protobuf.Enum)

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -2177,13 +2377,13 @@ void Enum::SerializeWithCachedSizes(

3, this->options(i), output);

}

- // optional .google.protobuf.SourceContext source_context = 4;

+ // .google.protobuf.SourceContext source_context = 4;

if (this->has_source_context()) {

::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

4, *this->source_context_, output);

}

- // optional .google.protobuf.Syntax syntax = 5;

+ // .google.protobuf.Syntax syntax = 5;

if (this->syntax() != 0) {

::google::protobuf::internal::WireFormatLite::WriteEnum(

5, this->syntax(), output);

@@ -2192,10 +2392,11 @@ void Enum::SerializeWithCachedSizes(

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

}

-::google::protobuf::uint8* Enum::SerializeWithCachedSizesToArray(

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

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

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

+ (void)deterministic; // Unused

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

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -2209,25 +2410,25 @@ void Enum::SerializeWithCachedSizes(

// repeated .google.protobuf.EnumValue enumvalue = 2;

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

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

- WriteMessageNoVirtualToArray(

- 2, this->enumvalue(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 2, this->enumvalue(i), false, target);

}

// repeated .google.protobuf.Option options = 3;

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

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

- WriteMessageNoVirtualToArray(

- 3, this->options(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 3, this->options(i), false, target);

}

- // optional .google.protobuf.SourceContext source_context = 4;

+ // .google.protobuf.SourceContext source_context = 4;

if (this->has_source_context()) {

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

- WriteMessageNoVirtualToArray(

- 4, *this->source_context_, target);

+ InternalWriteMessageNoVirtualToArray(

+ 4, *this->source_context_, false, target);

}

- // optional .google.protobuf.Syntax syntax = 5;

+ // .google.protobuf.Syntax syntax = 5;

if (this->syntax() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(

5, this->syntax(), target);

@@ -2237,56 +2438,63 @@ void Enum::SerializeWithCachedSizes(

return target;

}

-int Enum::ByteSize() const {

+size_t Enum::ByteSizeLong() const {

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

- int total_size = 0;

+ size_t total_size = 0;

+ // repeated .google.protobuf.EnumValue enumvalue = 2;

+ {

+ unsigned int count = this->enumvalue_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->enumvalue(i));

+ }

+ // repeated .google.protobuf.Option options = 3;

+ {

+ unsigned int count = this->options_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->options(i));

+ }

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

total_size += 1 +

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

this->name());

}

- // optional .google.protobuf.SourceContext source_context = 4;

+ // .google.protobuf.SourceContext source_context = 4;

if (this->has_source_context()) {

total_size += 1 +

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

*this->source_context_);

}

- // optional .google.protobuf.Syntax syntax = 5;

+ // .google.protobuf.Syntax syntax = 5;

if (this->syntax() != 0) {

total_size += 1 +

::google::protobuf::internal::WireFormatLite::EnumSize(this->syntax());

}

- // repeated .google.protobuf.EnumValue enumvalue = 2;

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

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

- total_size +=

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

- this->enumvalue(i));

- }

- // repeated .google.protobuf.Option options = 3;

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

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

- total_size +=

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

- this->options(i));

- }

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

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = total_size;

+ _cached_size_ = cached_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

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

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

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

- const Enum* source =

+ GOOGLE_DCHECK_NE(&from, this);

+ const Enum* source =

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

&from);

if (source == NULL) {

@@ -2300,12 +2508,12 @@ void Enum::MergeFrom(const ::google::protobuf::Message& from) {

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

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

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

+ GOOGLE_DCHECK_NE(&from, this);

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

enumvalue_.MergeFrom(from.enumvalue_);

options_.MergeFrom(from.options_);

if (from.name().size() > 0) {

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

+ set_name(from.name());

}

if (from.has_source_context()) {

mutable_source_context()->::google::protobuf::SourceContext::MergeFrom(from.source_context());

@@ -2330,78 +2538,110 @@ void Enum::CopyFrom(const Enum& from) {

}

bool Enum::IsInitialized() const {

return true;

}

void Enum::Swap(Enum* other) {

if (other == this) return;

+ if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {

+ InternalSwap(other);

+ } else {

+ Enum* temp = New(GetArenaNoVirtual());

+ temp->MergeFrom(*other);

+ other->CopyFrom(*this);

+ InternalSwap(temp);

+ if (GetArenaNoVirtual() == NULL) {

+ delete temp;

+ }

+void Enum::UnsafeArenaSwap(Enum* other) {

+ if (other == this) return;

+ GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());

InternalSwap(other);

}

void Enum::InternalSwap(Enum* other) {

- name_.Swap(&other->name_);

enumvalue_.UnsafeArenaSwap(&other->enumvalue_);

options_.UnsafeArenaSwap(&other->options_);

+ name_.Swap(&other->name_);

std::swap(source_context_, other->source_context_);

std::swap(syntax_, other->syntax_);

- _internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::Metadata metadata;

- metadata.descriptor = Enum_descriptor_;

- metadata.reflection = Enum_reflection_;

- return metadata;

+ return file_level_metadata[2];

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

// Enum

-// optional string name = 1;

+// string name = 1;

void Enum::clear_name() {

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

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Enum::name() const {

+const ::std::string& Enum::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.Enum.name)

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

+ return name_.Get();

}

- void Enum::set_name(const ::std::string& value) {

+void Enum::set_name(const ::std::string& value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Enum.name)

}

- void Enum::set_name(const char* value) {

+void Enum::set_name(const char* value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Enum.name)

}

- void Enum::set_name(const char* value, size_t size) {

+void Enum::set_name(const char* value,

+ size_t size) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Enum.name)

}

- ::std::string* Enum::mutable_name() {

+::std::string* Enum::mutable_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Enum.name)

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

+ return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Enum::release_name() {

+::std::string* Enum::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.Enum.name)

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

+ return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Enum::unsafe_arena_release_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Enum.name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Enum::set_allocated_name(::std::string* name) {

+void Enum::set_allocated_name(::std::string* name) {

if (name != NULL) {

} else {

}

- name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);

+ name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.name)

}

+void Enum::unsafe_arena_set_allocated_name(

+ ::std::string* name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (name != NULL) {

+ } else {

+ }

+ name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.name)

// repeated .google.protobuf.EnumValue enumvalue = 2;

int Enum::enumvalue_size() const {

@@ -2463,9 +2703,9 @@ Enum::options() const {

return options_;

}

-// optional .google.protobuf.SourceContext source_context = 4;

+// .google.protobuf.SourceContext source_context = 4;

bool Enum::has_source_context() const {

- return !_is_default_instance_ && source_context_ != NULL;

+ return this != internal_default_instance() && source_context_ != NULL;

}

void Enum::clear_source_context() {

if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_;

@@ -2473,12 +2713,13 @@ void Enum::clear_source_context() {

}

const ::google::protobuf::SourceContext& Enum::source_context() const {

// @@protoc_insertion_point(field_get:google.protobuf.Enum.source_context)

- return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_;

+ return source_context_ != NULL ? *source_context_

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

}

::google::protobuf::SourceContext* Enum::mutable_source_context() {

if (source_context_ == NULL) {

- source_context_ = new ::google::protobuf::SourceContext;

+ _slow_mutable_source_context();

}

// @@protoc_insertion_point(field_mutable:google.protobuf.Enum.source_context)

return source_context_;

@@ -2486,12 +2727,24 @@ const ::google::protobuf::SourceContext& Enum::source_context() const {

::google::protobuf::SourceContext* Enum::release_source_context() {

// @@protoc_insertion_point(field_release:google.protobuf.Enum.source_context)

- ::google::protobuf::SourceContext* temp = source_context_;

- source_context_ = NULL;

- return temp;

+ if (GetArenaNoVirtual() != NULL) {

+ return _slow_release_source_context();

+ } else {

+ ::google::protobuf::SourceContext* temp = source_context_;

+ source_context_ = NULL;

+ return temp;

+ }

}

-void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) {

- delete source_context_;

+ void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) {

+ ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();

+ if (message_arena == NULL) {

+ delete source_context_;

+ }

+ if (source_context != NULL) {

+ if (message_arena != NULL) {

+ message_arena->Own(source_context);

+ }

source_context_ = source_context;

if (source_context) {

@@ -2501,15 +2754,15 @@ void Enum::set_allocated_source_context(::google::protobuf::SourceContext* sourc

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.source_context)

}

-// optional .google.protobuf.Syntax syntax = 5;

+// .google.protobuf.Syntax syntax = 5;

void Enum::clear_syntax() {

syntax_ = 0;

}

- ::google::protobuf::Syntax Enum::syntax() const {

+::google::protobuf::Syntax Enum::syntax() const {

// @@protoc_insertion_point(field_get:google.protobuf.Enum.syntax)

return static_cast< ::google::protobuf::Syntax >(syntax_);

}

- void Enum::set_syntax(::google::protobuf::Syntax value) {

+void Enum::set_syntax(::google::protobuf::Syntax value) {

syntax_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.Enum.syntax)

@@ -2527,28 +2780,42 @@ const int EnumValue::kOptionsFieldNumber;

EnumValue::EnumValue()

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

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

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ }

SharedCtor();

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

}

-void EnumValue::InitAsDefaultInstance() {

- _is_default_instance_ = true;

+EnumValue::EnumValue(::google::protobuf::Arena* arena)

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

+ _internal_metadata_(arena),

+ options_(arena) {

+#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ SharedCtor();

+ RegisterArenaDtor(arena);

+ // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValue)

}

EnumValue::EnumValue(const EnumValue& from)

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

- _internal_metadata_(NULL) {

- SharedCtor();

- MergeFrom(from);

+ _internal_metadata_(NULL),

+ options_(from.options_),

+ _cached_size_(0) {

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

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

+ if (from.name().size() > 0) {

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),

+ GetArenaNoVirtual());

+ }

+ number_ = from.number_;

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

}

void EnumValue::SharedCtor() {

- _is_default_instance_ = false;

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

- _cached_size_ = 0;

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

number_ = 0;

+ _cached_size_ = 0;

}

EnumValue::~EnumValue() {

@@ -2557,11 +2824,20 @@ EnumValue::~EnumValue() {

}

void EnumValue::SharedDtor() {

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

- if (this != default_instance_) {

+ ::google::protobuf::Arena* arena = GetArenaNoVirtual();

+ if (arena != NULL) {

+ return;

}

+ name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

}

+void EnumValue::ArenaDtor(void* object) {

+ EnumValue* _this = reinterpret_cast< EnumValue* >(object);

+ (void)_this;

+void EnumValue::RegisterArenaDtor(::google::protobuf::Arena* arena) {

void EnumValue::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

@@ -2569,29 +2845,23 @@ void EnumValue::SetCachedSize(int size) const {

}

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

protobuf_AssignDescriptorsOnce();

- return EnumValue_descriptor_;

+ return file_level_metadata[3].descriptor;

}

const EnumValue& EnumValue::default_instance() {

- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

- return *default_instance_;

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ return *internal_default_instance();

}

-EnumValue* EnumValue::default_instance_ = NULL;

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

- EnumValue* n = new EnumValue;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

+ return ::google::protobuf::Arena::CreateMessage<EnumValue>(arena);

}

void EnumValue::Clear() {

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

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

- number_ = 0;

options_.Clear();

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ number_ = 0;

}

bool EnumValue::MergePartialFromCodedStream(

@@ -2600,13 +2870,13 @@ bool EnumValue::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

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

for (;;) {

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

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

tag = p.first;

if (!p.second) goto handle_unusual;

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

- // optional string name = 1;

+ // string name = 1;

case 1: {

- if (tag == 10) {

+ if (tag == 10u) {

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

input, this->mutable_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -2616,39 +2886,32 @@ bool EnumValue::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(16)) goto parse_number;

break;

}

- // optional int32 number = 2;

+ // int32 number = 2;

case 2: {

- if (tag == 16) {

- parse_number:

+ if (tag == 16u) {

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

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

input, &number_)));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(26)) goto parse_options;

break;

}

// repeated .google.protobuf.Option options = 3;

case 3: {

- if (tag == 26) {

- parse_options:

+ if (tag == 26u) {

DO_(input->IncrementRecursionDepth());

- parse_loop_options:

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

input, add_options()));

} else {

goto handle_unusual;

}

- if (input->ExpectTag(26)) goto parse_loop_options;

input->UnsafeDecrementRecursionDepth();

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

break;

}

@@ -2676,7 +2939,7 @@ failure:

void EnumValue::SerializeWithCachedSizes(

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

// @@protoc_insertion_point(serialize_start:google.protobuf.EnumValue)

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -2686,7 +2949,7 @@ void EnumValue::SerializeWithCachedSizes(

1, this->name(), output);

}

- // optional int32 number = 2;

+ // int32 number = 2;

if (this->number() != 0) {

::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->number(), output);

}

@@ -2700,10 +2963,11 @@ void EnumValue::SerializeWithCachedSizes(

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

}

-::google::protobuf::uint8* EnumValue::SerializeWithCachedSizesToArray(

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

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

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

+ (void)deterministic; // Unused

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

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -2714,7 +2978,7 @@ void EnumValue::SerializeWithCachedSizes(

1, this->name(), target);

}

- // optional int32 number = 2;

+ // int32 number = 2;

if (this->number() != 0) {

target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->number(), target);

}

@@ -2722,50 +2986,54 @@ void EnumValue::SerializeWithCachedSizes(

// repeated .google.protobuf.Option options = 3;

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

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

- WriteMessageNoVirtualToArray(

- 3, this->options(i), target);

+ InternalWriteMessageNoVirtualToArray(

+ 3, this->options(i), false, target);

}

// @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValue)

return target;

}

-int EnumValue::ByteSize() const {

+size_t EnumValue::ByteSizeLong() const {

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

- int total_size = 0;

+ size_t total_size = 0;

+ // repeated .google.protobuf.Option options = 3;

+ {

+ unsigned int count = this->options_size();

+ total_size += 1UL * count;

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

+ total_size +=

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

+ this->options(i));

+ }

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

total_size += 1 +

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

this->name());

}

- // optional int32 number = 2;

+ // int32 number = 2;

if (this->number() != 0) {

total_size += 1 +

::google::protobuf::internal::WireFormatLite::Int32Size(

this->number());

}

- // repeated .google.protobuf.Option options = 3;

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

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

- total_size +=

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

- this->options(i));

- }

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

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = total_size;

+ _cached_size_ = cached_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

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

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

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

- const EnumValue* source =

+ GOOGLE_DCHECK_NE(&from, this);

+ const EnumValue* source =

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

&from);

if (source == NULL) {

@@ -2779,11 +3047,11 @@ void EnumValue::MergeFrom(const ::google::protobuf::Message& from) {

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

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

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

+ GOOGLE_DCHECK_NE(&from, this);

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

options_.MergeFrom(from.options_);

if (from.name().size() > 0) {

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

+ set_name(from.name());

}

if (from.number() != 0) {

set_number(from.number());

@@ -2805,86 +3073,118 @@ void EnumValue::CopyFrom(const EnumValue& from) {

}

bool EnumValue::IsInitialized() const {

return true;

}

void EnumValue::Swap(EnumValue* other) {

if (other == this) return;

+ if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {

+ InternalSwap(other);

+ } else {

+ EnumValue* temp = New(GetArenaNoVirtual());

+ temp->MergeFrom(*other);

+ other->CopyFrom(*this);

+ InternalSwap(temp);

+ if (GetArenaNoVirtual() == NULL) {

+ delete temp;

+ }

+void EnumValue::UnsafeArenaSwap(EnumValue* other) {

+ if (other == this) return;

+ GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());

InternalSwap(other);

}

void EnumValue::InternalSwap(EnumValue* other) {

+ options_.UnsafeArenaSwap(&other->options_);

name_.Swap(&other->name_);

std::swap(number_, other->number_);

- options_.UnsafeArenaSwap(&other->options_);

- _internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::Metadata metadata;

- metadata.descriptor = EnumValue_descriptor_;

- metadata.reflection = EnumValue_reflection_;

- return metadata;

+ return file_level_metadata[3];

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

// EnumValue

-// optional string name = 1;

+// string name = 1;

void EnumValue::clear_name() {

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

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& EnumValue::name() const {

+const ::std::string& EnumValue::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.EnumValue.name)

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

+ return name_.Get();

}

- void EnumValue::set_name(const ::std::string& value) {

+void EnumValue::set_name(const ::std::string& value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.EnumValue.name)

}

- void EnumValue::set_name(const char* value) {

+void EnumValue::set_name(const char* value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.EnumValue.name)

}

- void EnumValue::set_name(const char* value, size_t size) {

+void EnumValue::set_name(const char* value,

+ size_t size) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValue.name)

}

- ::std::string* EnumValue::mutable_name() {

+::std::string* EnumValue::mutable_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.EnumValue.name)

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

+ return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* EnumValue::release_name() {

+::std::string* EnumValue::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.EnumValue.name)

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

+ return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* EnumValue::unsafe_arena_release_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.EnumValue.name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void EnumValue::set_allocated_name(::std::string* name) {

+void EnumValue::set_allocated_name(::std::string* name) {

if (name != NULL) {

} else {

}

- name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);

+ name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValue.name)

}

+void EnumValue::unsafe_arena_set_allocated_name(

+ ::std::string* name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (name != NULL) {

+ } else {

+ }

+ name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumValue.name)

-// optional int32 number = 2;

+// int32 number = 2;

void EnumValue::clear_number() {

number_ = 0;

}

- ::google::protobuf::int32 EnumValue::number() const {

+::google::protobuf::int32 EnumValue::number() const {

// @@protoc_insertion_point(field_get:google.protobuf.EnumValue.number)

return number_;

}

- void EnumValue::set_number(::google::protobuf::int32 value) {

+void EnumValue::set_number(::google::protobuf::int32 value) {

number_ = value;

// @@protoc_insertion_point(field_set:google.protobuf.EnumValue.number)

@@ -2924,6 +3224,39 @@ EnumValue::options() const {

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

+void Option::_slow_mutable_value() {

+ value_ = ::google::protobuf::Arena::Create< ::google::protobuf::Any >(

+ GetArenaNoVirtual());

+::google::protobuf::Any* Option::_slow_release_value() {

+ if (value_ == NULL) {

+ return NULL;

+ } else {

+ ::google::protobuf::Any* temp = new ::google::protobuf::Any(*value_);

+ value_ = NULL;

+ return temp;

+ }

+::google::protobuf::Any* Option::unsafe_arena_release_value() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Option.value)

+ ::google::protobuf::Any* temp = value_;

+ value_ = NULL;

+ return temp;

+void Option::unsafe_arena_set_allocated_value(

+ ::google::protobuf::Any* value) {

+ if (GetArenaNoVirtual() == NULL) {

+ delete value_;

+ }

+ value_ = value;

+ if (value) {

+ } else {

+ }

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.value)

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

const int Option::kNameFieldNumber;

const int Option::kValueFieldNumber;

@@ -2931,29 +3264,44 @@ const int Option::kValueFieldNumber;

Option::Option()

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

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

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ }

SharedCtor();

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

}

-void Option::InitAsDefaultInstance() {

- _is_default_instance_ = true;

- value_ = const_cast< ::google::protobuf::Any*>(&::google::protobuf::Any::default_instance());

+Option::Option(::google::protobuf::Arena* arena)

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

+ _internal_metadata_(arena) {

+#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER

+ SharedCtor();

+ RegisterArenaDtor(arena);

+ // @@protoc_insertion_point(arena_constructor:google.protobuf.Option)

}

Option::Option(const Option& from)

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

- _internal_metadata_(NULL) {

- SharedCtor();

- MergeFrom(from);

+ _internal_metadata_(NULL),

+ _cached_size_(0) {

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

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

+ if (from.name().size() > 0) {

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name(),

+ GetArenaNoVirtual());

+ }

+ if (from.has_value()) {

+ value_ = new ::google::protobuf::Any(*from.value_);

+ } else {

+ value_ = NULL;

+ }

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

}

void Option::SharedCtor() {

- _is_default_instance_ = false;

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

- _cached_size_ = 0;

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

value_ = NULL;

+ _cached_size_ = 0;

}

Option::~Option() {

@@ -2962,12 +3310,23 @@ Option::~Option() {

}

void Option::SharedDtor() {

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

- if (this != default_instance_) {

+ ::google::protobuf::Arena* arena = GetArenaNoVirtual();

+ if (arena != NULL) {

+ return;

+ }

+ name_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);

+ if (this != internal_default_instance()) {

delete value_;

}

+void Option::ArenaDtor(void* object) {

+ Option* _this = reinterpret_cast< Option* >(object);

+ (void)_this;

+void Option::RegisterArenaDtor(::google::protobuf::Arena* arena) {

void Option::SetCachedSize(int size) const {

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

_cached_size_ = size;

@@ -2975,28 +3334,24 @@ void Option::SetCachedSize(int size) const {

}

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

protobuf_AssignDescriptorsOnce();

- return Option_descriptor_;

+ return file_level_metadata[4].descriptor;

}

const Option& Option::default_instance() {

- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto();

- return *default_instance_;

+ protobuf_InitDefaults_google_2fprotobuf_2ftype_2eproto();

+ return *internal_default_instance();

}

-Option* Option::default_instance_ = NULL;

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

- Option* n = new Option;

- if (arena != NULL) {

- arena->Own(n);

- }

- return n;

+ return ::google::protobuf::Arena::CreateMessage<Option>(arena);

}

void Option::Clear() {

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

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

- if (GetArenaNoVirtual() == NULL && value_ != NULL) delete value_;

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+ if (GetArenaNoVirtual() == NULL && value_ != NULL) {

+ delete value_;

+ }

value_ = NULL;

}

@@ -3006,13 +3361,13 @@ bool Option::MergePartialFromCodedStream(

::google::protobuf::uint32 tag;

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

for (;;) {

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

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

tag = p.first;

if (!p.second) goto handle_unusual;

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

- // optional string name = 1;

+ // string name = 1;

case 1: {

- if (tag == 10) {

+ if (tag == 10u) {

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

input, this->mutable_name()));

DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

@@ -3022,20 +3377,17 @@ bool Option::MergePartialFromCodedStream(

} else {

goto handle_unusual;

}

- if (input->ExpectTag(18)) goto parse_value;

break;

}

- // optional .google.protobuf.Any value = 2;

+ // .google.protobuf.Any value = 2;

case 2: {

- if (tag == 18) {

- parse_value:

+ if (tag == 18u) {

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

input, mutable_value()));

} else {

goto handle_unusual;

}

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

break;

}

@@ -3063,7 +3415,7 @@ failure:

void Option::SerializeWithCachedSizes(

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

// @@protoc_insertion_point(serialize_start:google.protobuf.Option)

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -3073,7 +3425,7 @@ void Option::SerializeWithCachedSizes(

1, this->name(), output);

}

- // optional .google.protobuf.Any value = 2;

+ // .google.protobuf.Any value = 2;

if (this->has_value()) {

::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(

2, *this->value_, output);

@@ -3082,10 +3434,11 @@ void Option::SerializeWithCachedSizes(

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

}

-::google::protobuf::uint8* Option::SerializeWithCachedSizesToArray(

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

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

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

+ (void)deterministic; // Unused

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

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

::google::protobuf::internal::WireFormatLite::VerifyUtf8String(

this->name().data(), this->name().length(),

@@ -3096,45 +3449,46 @@ void Option::SerializeWithCachedSizes(

1, this->name(), target);

}

- // optional .google.protobuf.Any value = 2;

+ // .google.protobuf.Any value = 2;

if (this->has_value()) {

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

- WriteMessageNoVirtualToArray(

- 2, *this->value_, target);

+ InternalWriteMessageNoVirtualToArray(

+ 2, *this->value_, false, target);

}

// @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Option)

return target;

}

-int Option::ByteSize() const {

+size_t Option::ByteSizeLong() const {

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

- int total_size = 0;

+ size_t total_size = 0;

- // optional string name = 1;

+ // string name = 1;

if (this->name().size() > 0) {

total_size += 1 +

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

this->name());

}

- // optional .google.protobuf.Any value = 2;

+ // .google.protobuf.Any value = 2;

if (this->has_value()) {

total_size += 1 +

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

*this->value_);

}

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

GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();

- _cached_size_ = total_size;

+ _cached_size_ = cached_size;

GOOGLE_SAFE_CONCURRENT_WRITES_END();

return total_size;

}

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

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

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

- const Option* source =

+ GOOGLE_DCHECK_NE(&from, this);

+ const Option* source =

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

&from);

if (source == NULL) {

@@ -3148,10 +3502,10 @@ void Option::MergeFrom(const ::google::protobuf::Message& from) {

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

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

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

+ GOOGLE_DCHECK_NE(&from, this);

+ _internal_metadata_.MergeFrom(from._internal_metadata_);

if (from.name().size() > 0) {

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

+ set_name(from.name());

}

if (from.has_value()) {

mutable_value()->::google::protobuf::Any::MergeFrom(from.value());

@@ -3173,79 +3527,111 @@ void Option::CopyFrom(const Option& from) {

}

bool Option::IsInitialized() const {

return true;

}

void Option::Swap(Option* other) {

if (other == this) return;

+ if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {

+ InternalSwap(other);

+ } else {

+ Option* temp = New(GetArenaNoVirtual());

+ temp->MergeFrom(*other);

+ other->CopyFrom(*this);

+ InternalSwap(temp);

+ if (GetArenaNoVirtual() == NULL) {

+ delete temp;

+ }

+void Option::UnsafeArenaSwap(Option* other) {

+ if (other == this) return;

+ GOOGLE_DCHECK(GetArenaNoVirtual() == other->GetArenaNoVirtual());

InternalSwap(other);

}

void Option::InternalSwap(Option* other) {

name_.Swap(&other->name_);

std::swap(value_, other->value_);

- _internal_metadata_.Swap(&other->_internal_metadata_);

std::swap(_cached_size_, other->_cached_size_);

}

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

protobuf_AssignDescriptorsOnce();

- ::google::protobuf::Metadata metadata;

- metadata.descriptor = Option_descriptor_;

- metadata.reflection = Option_reflection_;

- return metadata;

+ return file_level_metadata[4];

}

#if PROTOBUF_INLINE_NOT_IN_HEADERS

// Option

-// optional string name = 1;

+// string name = 1;

void Option::clear_name() {

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

+ name_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- const ::std::string& Option::name() const {

+const ::std::string& Option::name() const {

// @@protoc_insertion_point(field_get:google.protobuf.Option.name)

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

+ return name_.Get();

}

- void Option::set_name(const ::std::string& value) {

+void Option::set_name(const ::std::string& value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());

// @@protoc_insertion_point(field_set:google.protobuf.Option.name)

}

- void Option::set_name(const char* value) {

+void Option::set_name(const char* value) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_char:google.protobuf.Option.name)

}

- void Option::set_name(const char* value, size_t size) {

+void Option::set_name(const char* value,

+ size_t size) {

- name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

- ::std::string(reinterpret_cast<const char*>(value), size));

+ name_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(

+ reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_pointer:google.protobuf.Option.name)

}

- ::std::string* Option::mutable_name() {

+::std::string* Option::mutable_name() {

// @@protoc_insertion_point(field_mutable:google.protobuf.Option.name)

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

+ return name_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

}

- ::std::string* Option::release_name() {

+::std::string* Option::release_name() {

// @@protoc_insertion_point(field_release:google.protobuf.Option.name)

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

+ return name_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());

+::std::string* Option::unsafe_arena_release_name() {

+ // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Option.name)

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ return name_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ GetArenaNoVirtual());

}

- void Option::set_allocated_name(::std::string* name) {

+void Option::set_allocated_name(::std::string* name) {

if (name != NULL) {

} else {

}

- name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);

+ name_.SetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name,

+ GetArenaNoVirtual());

// @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.name)

}

+void Option::unsafe_arena_set_allocated_name(

+ ::std::string* name) {

+ GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);

+ if (name != NULL) {

+ } else {

+ }

+ name_.UnsafeArenaSetAllocated(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),

+ name, GetArenaNoVirtual());

+ // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.name)

-// optional .google.protobuf.Any value = 2;

+// .google.protobuf.Any value = 2;

bool Option::has_value() const {

- return !_is_default_instance_ && value_ != NULL;

+ return this != internal_default_instance() && value_ != NULL;

}

void Option::clear_value() {

if (GetArenaNoVirtual() == NULL && value_ != NULL) delete value_;

@@ -3253,12 +3639,13 @@ void Option::clear_value() {

}

const ::google::protobuf::Any& Option::value() const {

// @@protoc_insertion_point(field_get:google.protobuf.Option.value)

- return value_ != NULL ? *value_ : *default_instance_->value_;

+ return value_ != NULL ? *value_

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

}

::google::protobuf::Any* Option::mutable_value() {

if (value_ == NULL) {

- value_ = new ::google::protobuf::Any;

+ _slow_mutable_value();

}

// @@protoc_insertion_point(field_mutable:google.protobuf.Option.value)

return value_;

@@ -3266,12 +3653,24 @@ const ::google::protobuf::Any& Option::value() const {

::google::protobuf::Any* Option::release_value() {

// @@protoc_insertion_point(field_release:google.protobuf.Option.value)

- ::google::protobuf::Any* temp = value_;

- value_ = NULL;

- return temp;

+ if (GetArenaNoVirtual() != NULL) {

+ return _slow_release_value();

+ } else {

+ ::google::protobuf::Any* temp = value_;

+ value_ = NULL;

+ return temp;

+ }

}

-void Option::set_allocated_value(::google::protobuf::Any* value) {

- delete value_;

+ void Option::set_allocated_value(::google::protobuf::Any* value) {

+ ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();

+ if (message_arena == NULL) {

+ delete value_;

+ }

+ if (value != NULL) {

+ if (message_arena != NULL) {

+ message_arena->Own(value);

+ }

value_ = value;

if (value) {

« no previous file with comments | « third_party/protobuf/src/google/protobuf/type.pb.h ('k') | third_party/protobuf/src/google/protobuf/unittest.proto » ('j') | no next file with comments »