| Index: third_party/protobuf/src/google/protobuf/wrappers.pb.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/wrappers.pb.cc b/third_party/protobuf/src/google/protobuf/wrappers.pb.cc
|
| index 82a8d9e2b1fa5a06ad5198a61e6c5048422323b4..608014232f0e4beb6e7bd0d465ed40a33a180608 100644
|
| --- a/third_party/protobuf/src/google/protobuf/wrappers.pb.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/wrappers.pb.cc
|
| @@ -19,199 +19,278 @@
|
|
|
| namespace google {
|
| namespace protobuf {
|
| -class DoubleValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<DoubleValue> {};
|
| -DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
|
| -class FloatValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<FloatValue> {};
|
| -FloatValueDefaultTypeInternal _FloatValue_default_instance_;
|
| -class Int64ValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Int64Value> {};
|
| -Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
|
| -class UInt64ValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<UInt64Value> {};
|
| -UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
|
| -class Int32ValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Int32Value> {};
|
| -Int32ValueDefaultTypeInternal _Int32Value_default_instance_;
|
| -class UInt32ValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<UInt32Value> {};
|
| -UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
|
| -class BoolValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<BoolValue> {};
|
| -BoolValueDefaultTypeInternal _BoolValue_default_instance_;
|
| -class StringValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<StringValue> {};
|
| -StringValueDefaultTypeInternal _StringValue_default_instance_;
|
| -class BytesValueDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<BytesValue> {};
|
| -BytesValueDefaultTypeInternal _BytesValue_default_instance_;
|
|
|
| namespace {
|
|
|
| -::google::protobuf::Metadata file_level_metadata[9];
|
| +const ::google::protobuf::Descriptor* DoubleValue_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + DoubleValue_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* FloatValue_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + FloatValue_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* Int64Value_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + Int64Value_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* UInt64Value_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + UInt64Value_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* Int32Value_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + Int32Value_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* UInt32Value_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + UInt32Value_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* BoolValue_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + BoolValue_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* StringValue_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + StringValue_reflection_ = NULL;
|
| +const ::google::protobuf::Descriptor* BytesValue_descriptor_ = NULL;
|
| +const ::google::protobuf::internal::GeneratedMessageReflection*
|
| + BytesValue_reflection_ = NULL;
|
|
|
| } // namespace
|
|
|
|
|
| -const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fwrappers_2eproto() GOOGLE_ATTRIBUTE_COLD;
|
| -const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fwrappers_2eproto() {
|
| - static const ::google::protobuf::uint32 offsets[] = {
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleValue, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| +void protobuf_AssignDesc_google_2fprotobuf_2fwrappers_2eproto() {
|
| + protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + const ::google::protobuf::FileDescriptor* file =
|
| + ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
|
| + "google/protobuf/wrappers.proto");
|
| + GOOGLE_CHECK(file != NULL);
|
| + DoubleValue_descriptor_ = file->message_type(0);
|
| + static const int DoubleValue_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleValue, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FloatValue, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + DoubleValue_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + DoubleValue_descriptor_,
|
| + DoubleValue::default_instance_,
|
| + DoubleValue_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(DoubleValue),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleValue, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleValue, _is_default_instance_));
|
| + FloatValue_descriptor_ = file->message_type(1);
|
| + static const int FloatValue_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FloatValue, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int64Value, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + FloatValue_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + FloatValue_descriptor_,
|
| + FloatValue::default_instance_,
|
| + FloatValue_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(FloatValue),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FloatValue, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FloatValue, _is_default_instance_));
|
| + Int64Value_descriptor_ = file->message_type(2);
|
| + static const int Int64Value_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int64Value, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt64Value, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + Int64Value_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + Int64Value_descriptor_,
|
| + Int64Value::default_instance_,
|
| + Int64Value_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(Int64Value),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int64Value, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int64Value, _is_default_instance_));
|
| + UInt64Value_descriptor_ = file->message_type(3);
|
| + static const int UInt64Value_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt64Value, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int32Value, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + UInt64Value_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + UInt64Value_descriptor_,
|
| + UInt64Value::default_instance_,
|
| + UInt64Value_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(UInt64Value),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt64Value, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt64Value, _is_default_instance_));
|
| + Int32Value_descriptor_ = file->message_type(4);
|
| + static const int Int32Value_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int32Value, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt32Value, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + Int32Value_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + Int32Value_descriptor_,
|
| + Int32Value::default_instance_,
|
| + Int32Value_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(Int32Value),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int32Value, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Int32Value, _is_default_instance_));
|
| + UInt32Value_descriptor_ = file->message_type(5);
|
| + static const int UInt32Value_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt32Value, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BoolValue, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + UInt32Value_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + UInt32Value_descriptor_,
|
| + UInt32Value::default_instance_,
|
| + UInt32Value_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(UInt32Value),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt32Value, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UInt32Value, _is_default_instance_));
|
| + BoolValue_descriptor_ = file->message_type(6);
|
| + static const int BoolValue_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BoolValue, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringValue, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + BoolValue_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + BoolValue_descriptor_,
|
| + BoolValue::default_instance_,
|
| + BoolValue_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(BoolValue),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BoolValue, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BoolValue, _is_default_instance_));
|
| + StringValue_descriptor_ = file->message_type(7);
|
| + static const int StringValue_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringValue, value_),
|
| - ~0u, // no _has_bits_
|
| - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BytesValue, _internal_metadata_),
|
| - ~0u, // no _extensions_
|
| - ~0u, // no _oneof_case_
|
| + };
|
| + StringValue_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + StringValue_descriptor_,
|
| + StringValue::default_instance_,
|
| + StringValue_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(StringValue),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringValue, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringValue, _is_default_instance_));
|
| + BytesValue_descriptor_ = file->message_type(8);
|
| + static const int BytesValue_offsets_[1] = {
|
| GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BytesValue, value_),
|
| };
|
| - return offsets;
|
| -}
|
| -
|
| -static const ::google::protobuf::internal::MigrationSchema schemas[] = {
|
| - { 0, -1, sizeof(DoubleValue)},
|
| - { 5, -1, sizeof(FloatValue)},
|
| - { 10, -1, sizeof(Int64Value)},
|
| - { 15, -1, sizeof(UInt64Value)},
|
| - { 20, -1, sizeof(Int32Value)},
|
| - { 25, -1, sizeof(UInt32Value)},
|
| - { 30, -1, sizeof(BoolValue)},
|
| - { 35, -1, sizeof(StringValue)},
|
| - { 40, -1, sizeof(BytesValue)},
|
| -};
|
| -
|
| -static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = {
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_DoubleValue_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_FloatValue_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_Int64Value_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_UInt64Value_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_Int32Value_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_UInt32Value_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_BoolValue_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_StringValue_default_instance_), NULL},
|
| - {reinterpret_cast<const ::google::protobuf::Message*>(&_BytesValue_default_instance_), NULL},
|
| -};
|
| + BytesValue_reflection_ =
|
| + ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection(
|
| + BytesValue_descriptor_,
|
| + BytesValue::default_instance_,
|
| + BytesValue_offsets_,
|
| + -1,
|
| + -1,
|
| + -1,
|
| + sizeof(BytesValue),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BytesValue, _internal_metadata_),
|
| + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BytesValue, _is_default_instance_));
|
| +}
|
|
|
| namespace {
|
|
|
| -void protobuf_AssignDescriptors() {
|
| - protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| - ::google::protobuf::MessageFactory* factory = NULL;
|
| - AssignDescriptors(
|
| - "google/protobuf/wrappers.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fwrappers_2eproto(), factory,
|
| - file_level_metadata, NULL, NULL);
|
| +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
|
| +inline void protobuf_AssignDescriptorsOnce() {
|
| + ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
|
| + &protobuf_AssignDesc_google_2fprotobuf_2fwrappers_2eproto);
|
| }
|
|
|
| -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::internal::RegisterAllTypes(file_level_metadata, 9);
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + DoubleValue_descriptor_, &DoubleValue::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + FloatValue_descriptor_, &FloatValue::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + Int64Value_descriptor_, &Int64Value::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + UInt64Value_descriptor_, &UInt64Value::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + Int32Value_descriptor_, &Int32Value::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + UInt32Value_descriptor_, &UInt32Value::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + BoolValue_descriptor_, &BoolValue::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + StringValue_descriptor_, &StringValue::default_instance());
|
| + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
|
| + BytesValue_descriptor_, &BytesValue::default_instance());
|
| }
|
|
|
| } // namespace
|
|
|
| void protobuf_ShutdownFile_google_2fprotobuf_2fwrappers_2eproto() {
|
| - _DoubleValue_default_instance_.Shutdown();
|
| - delete file_level_metadata[0].reflection;
|
| - _FloatValue_default_instance_.Shutdown();
|
| - delete file_level_metadata[1].reflection;
|
| - _Int64Value_default_instance_.Shutdown();
|
| - delete file_level_metadata[2].reflection;
|
| - _UInt64Value_default_instance_.Shutdown();
|
| - delete file_level_metadata[3].reflection;
|
| - _Int32Value_default_instance_.Shutdown();
|
| - delete file_level_metadata[4].reflection;
|
| - _UInt32Value_default_instance_.Shutdown();
|
| - delete file_level_metadata[5].reflection;
|
| - _BoolValue_default_instance_.Shutdown();
|
| - delete file_level_metadata[6].reflection;
|
| - _StringValue_default_instance_.Shutdown();
|
| - delete file_level_metadata[7].reflection;
|
| - _BytesValue_default_instance_.Shutdown();
|
| - delete file_level_metadata[8].reflection;
|
| -}
|
| -
|
| -void protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto_impl() {
|
| + delete DoubleValue::default_instance_;
|
| + delete DoubleValue_reflection_;
|
| + delete FloatValue::default_instance_;
|
| + delete FloatValue_reflection_;
|
| + delete Int64Value::default_instance_;
|
| + delete Int64Value_reflection_;
|
| + delete UInt64Value::default_instance_;
|
| + delete UInt64Value_reflection_;
|
| + delete Int32Value::default_instance_;
|
| + delete Int32Value_reflection_;
|
| + delete UInt32Value::default_instance_;
|
| + delete UInt32Value_reflection_;
|
| + delete BoolValue::default_instance_;
|
| + delete BoolValue_reflection_;
|
| + delete StringValue::default_instance_;
|
| + delete StringValue_reflection_;
|
| + delete BytesValue::default_instance_;
|
| + delete BytesValue_reflection_;
|
| +}
|
| +
|
| +void protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto() {
|
| + static bool already_here = false;
|
| + if (already_here) return;
|
| + already_here = true;
|
| GOOGLE_PROTOBUF_VERIFY_VERSION;
|
|
|
| - ::google::protobuf::internal::InitProtobufDefaults();
|
| - _DoubleValue_default_instance_.DefaultConstruct();
|
| - _FloatValue_default_instance_.DefaultConstruct();
|
| - _Int64Value_default_instance_.DefaultConstruct();
|
| - _UInt64Value_default_instance_.DefaultConstruct();
|
| - _Int32Value_default_instance_.DefaultConstruct();
|
| - _UInt32Value_default_instance_.DefaultConstruct();
|
| - _BoolValue_default_instance_.DefaultConstruct();
|
| - _StringValue_default_instance_.DefaultConstruct();
|
| - _BytesValue_default_instance_.DefaultConstruct();
|
| -}
|
| -
|
| -void protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto() {
|
| - static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
|
| - ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto_impl);
|
| -}
|
| -void protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto_impl() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - static const char descriptor[] = {
|
| - "\n\036google/protobuf/wrappers.proto\022\017google"
|
| - ".protobuf\"\034\n\013DoubleValue\022\r\n\005value\030\001 \001(\001\""
|
| - "\033\n\nFloatValue\022\r\n\005value\030\001 \001(\002\"\033\n\nInt64Val"
|
| - "ue\022\r\n\005value\030\001 \001(\003\"\034\n\013UInt64Value\022\r\n\005valu"
|
| - "e\030\001 \001(\004\"\033\n\nInt32Value\022\r\n\005value\030\001 \001(\005\"\034\n\013"
|
| - "UInt32Value\022\r\n\005value\030\001 \001(\r\"\032\n\tBoolValue\022"
|
| - "\r\n\005value\030\001 \001(\010\"\034\n\013StringValue\022\r\n\005value\030\001"
|
| - " \001(\t\"\033\n\nBytesValue\022\r\n\005value\030\001 \001(\014B|\n\023com"
|
| - ".google.protobufB\rWrappersProtoP\001Z*githu"
|
| - "b.com/golang/protobuf/ptypes/wrappers\370\001\001"
|
| - "\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypesb"
|
| - "\006proto3"
|
| - };
|
| ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
|
| - descriptor, 447);
|
| + "\n\036google/protobuf/wrappers.proto\022\017google"
|
| + ".protobuf\"\034\n\013DoubleValue\022\r\n\005value\030\001 \001(\001\""
|
| + "\033\n\nFloatValue\022\r\n\005value\030\001 \001(\002\"\033\n\nInt64Val"
|
| + "ue\022\r\n\005value\030\001 \001(\003\"\034\n\013UInt64Value\022\r\n\005valu"
|
| + "e\030\001 \001(\004\"\033\n\nInt32Value\022\r\n\005value\030\001 \001(\005\"\034\n\013"
|
| + "UInt32Value\022\r\n\005value\030\001 \001(\r\"\032\n\tBoolValue\022"
|
| + "\r\n\005value\030\001 \001(\010\"\034\n\013StringValue\022\r\n\005value\030\001"
|
| + " \001(\t\"\033\n\nBytesValue\022\r\n\005value\030\001 \001(\014B\177\n\023com"
|
| + ".google.protobufB\rWrappersProtoP\001Z*githu"
|
| + "b.com/golang/protobuf/ptypes/wrappers\240\001\001"
|
| + "\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTyp"
|
| + "esb\006proto3", 450);
|
| ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
|
| "google/protobuf/wrappers.proto", &protobuf_RegisterTypes);
|
| + DoubleValue::default_instance_ = new DoubleValue();
|
| + FloatValue::default_instance_ = new FloatValue();
|
| + Int64Value::default_instance_ = new Int64Value();
|
| + UInt64Value::default_instance_ = new UInt64Value();
|
| + Int32Value::default_instance_ = new Int32Value();
|
| + UInt32Value::default_instance_ = new UInt32Value();
|
| + BoolValue::default_instance_ = new BoolValue();
|
| + StringValue::default_instance_ = new StringValue();
|
| + BytesValue::default_instance_ = new BytesValue();
|
| + DoubleValue::default_instance_->InitAsDefaultInstance();
|
| + FloatValue::default_instance_->InitAsDefaultInstance();
|
| + Int64Value::default_instance_->InitAsDefaultInstance();
|
| + UInt64Value::default_instance_->InitAsDefaultInstance();
|
| + Int32Value::default_instance_->InitAsDefaultInstance();
|
| + UInt32Value::default_instance_->InitAsDefaultInstance();
|
| + BoolValue::default_instance_->InitAsDefaultInstance();
|
| + StringValue::default_instance_->InitAsDefaultInstance();
|
| + BytesValue::default_instance_->InitAsDefaultInstance();
|
| ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fwrappers_2eproto);
|
| }
|
|
|
| -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto_once_);
|
| -void protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto() {
|
| - ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto_once_,
|
| - &protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto_impl);
|
| -}
|
| // Force AddDescriptors() to be called at static initialization time.
|
| struct StaticDescriptorInitializer_google_2fprotobuf_2fwrappers_2eproto {
|
| StaticDescriptorInitializer_google_2fprotobuf_2fwrappers_2eproto() {
|
| @@ -219,6 +298,16 @@ struct StaticDescriptorInitializer_google_2fprotobuf_2fwrappers_2eproto {
|
| }
|
| } static_descriptor_initializer_google_2fprotobuf_2fwrappers_2eproto_;
|
|
|
| +namespace {
|
| +
|
| +static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;
|
| +static void MergeFromFail(int line) {
|
| + GOOGLE_CHECK(false) << __FILE__ << ":" << line;
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| +
|
| // ===================================================================
|
|
|
| #if !defined(_MSC_VER) || _MSC_VER >= 1900
|
| @@ -227,34 +316,34 @@ const int DoubleValue::kValueFieldNumber;
|
|
|
| DoubleValue::DoubleValue()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.DoubleValue)
|
| }
|
| +
|
| DoubleValue::DoubleValue(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.DoubleValue)
|
| }
|
| +
|
| +void DoubleValue::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| DoubleValue::DoubleValue(const DoubleValue& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.DoubleValue)
|
| }
|
|
|
| void DoubleValue::SharedCtor() {
|
| - value_ = 0;
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = 0;
|
| }
|
|
|
| DoubleValue::~DoubleValue() {
|
| @@ -263,11 +352,12 @@ DoubleValue::~DoubleValue() {
|
| }
|
|
|
| void DoubleValue::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void DoubleValue::ArenaDtor(void* object) {
|
| @@ -283,14 +373,16 @@ void DoubleValue::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* DoubleValue::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[0].descriptor;
|
| + return DoubleValue_descriptor_;
|
| }
|
|
|
| const DoubleValue& DoubleValue::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +DoubleValue* DoubleValue::default_instance_ = NULL;
|
| +
|
| DoubleValue* DoubleValue::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<DoubleValue>(arena);
|
| }
|
| @@ -306,20 +398,21 @@ bool DoubleValue::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.DoubleValue)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // double value = 1;
|
| + // optional double value = 1;
|
| case 1: {
|
| - if (tag == 9u) {
|
| -
|
| + if (tag == 9) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -347,7 +440,7 @@ failure:
|
| void DoubleValue::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.DoubleValue)
|
| - // double value = 1;
|
| + // optional double value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->value(), output);
|
| }
|
| @@ -355,11 +448,10 @@ void DoubleValue::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.DoubleValue)
|
| }
|
|
|
| -::google::protobuf::uint8* DoubleValue::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* DoubleValue::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DoubleValue)
|
| - // double value = 1;
|
| + // optional double value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->value(), target);
|
| }
|
| @@ -368,26 +460,25 @@ void DoubleValue::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t DoubleValue::ByteSizeLong() const {
|
| +int DoubleValue::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DoubleValue)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // double value = 1;
|
| + // optional double value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 + 8;
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void DoubleValue::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DoubleValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const DoubleValue* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const DoubleValue* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const DoubleValue>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -401,8 +492,7 @@ void DoubleValue::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void DoubleValue::MergeFrom(const DoubleValue& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DoubleValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -423,6 +513,7 @@ void DoubleValue::CopyFrom(const DoubleValue& from) {
|
| }
|
|
|
| bool DoubleValue::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -431,13 +522,10 @@ void DoubleValue::Swap(DoubleValue* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - DoubleValue* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + DoubleValue temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void DoubleValue::UnsafeArenaSwap(DoubleValue* other) {
|
| @@ -447,26 +535,30 @@ void DoubleValue::UnsafeArenaSwap(DoubleValue* other) {
|
| }
|
| void DoubleValue::InternalSwap(DoubleValue* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata DoubleValue::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[0];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = DoubleValue_descriptor_;
|
| + metadata.reflection = DoubleValue_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // DoubleValue
|
|
|
| -// double value = 1;
|
| +// optional double value = 1;
|
| void DoubleValue::clear_value() {
|
| value_ = 0;
|
| }
|
| -double DoubleValue::value() const {
|
| + double DoubleValue::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.DoubleValue.value)
|
| return value_;
|
| }
|
| -void DoubleValue::set_value(double value) {
|
| + void DoubleValue::set_value(double value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.DoubleValue.value)
|
| @@ -482,34 +574,34 @@ const int FloatValue::kValueFieldNumber;
|
|
|
| FloatValue::FloatValue()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.FloatValue)
|
| }
|
| +
|
| FloatValue::FloatValue(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.FloatValue)
|
| }
|
| +
|
| +void FloatValue::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| FloatValue::FloatValue(const FloatValue& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.FloatValue)
|
| }
|
|
|
| void FloatValue::SharedCtor() {
|
| - value_ = 0;
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = 0;
|
| }
|
|
|
| FloatValue::~FloatValue() {
|
| @@ -518,11 +610,12 @@ FloatValue::~FloatValue() {
|
| }
|
|
|
| void FloatValue::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void FloatValue::ArenaDtor(void* object) {
|
| @@ -538,14 +631,16 @@ void FloatValue::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* FloatValue::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[1].descriptor;
|
| + return FloatValue_descriptor_;
|
| }
|
|
|
| const FloatValue& FloatValue::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +FloatValue* FloatValue::default_instance_ = NULL;
|
| +
|
| FloatValue* FloatValue::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<FloatValue>(arena);
|
| }
|
| @@ -561,20 +656,21 @@ bool FloatValue::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.FloatValue)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // float value = 1;
|
| + // optional float value = 1;
|
| case 1: {
|
| - if (tag == 13u) {
|
| -
|
| + if (tag == 13) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -602,7 +698,7 @@ failure:
|
| void FloatValue::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.FloatValue)
|
| - // float value = 1;
|
| + // optional float value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->value(), output);
|
| }
|
| @@ -610,11 +706,10 @@ void FloatValue::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.FloatValue)
|
| }
|
|
|
| -::google::protobuf::uint8* FloatValue::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* FloatValue::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FloatValue)
|
| - // float value = 1;
|
| + // optional float value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(1, this->value(), target);
|
| }
|
| @@ -623,26 +718,25 @@ void FloatValue::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t FloatValue::ByteSizeLong() const {
|
| +int FloatValue::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FloatValue)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // float value = 1;
|
| + // optional float value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 + 4;
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void FloatValue::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FloatValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const FloatValue* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const FloatValue* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const FloatValue>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -656,8 +750,7 @@ void FloatValue::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void FloatValue::MergeFrom(const FloatValue& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FloatValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -678,6 +771,7 @@ void FloatValue::CopyFrom(const FloatValue& from) {
|
| }
|
|
|
| bool FloatValue::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -686,13 +780,10 @@ void FloatValue::Swap(FloatValue* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - FloatValue* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + FloatValue temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void FloatValue::UnsafeArenaSwap(FloatValue* other) {
|
| @@ -702,26 +793,30 @@ void FloatValue::UnsafeArenaSwap(FloatValue* other) {
|
| }
|
| void FloatValue::InternalSwap(FloatValue* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata FloatValue::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[1];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = FloatValue_descriptor_;
|
| + metadata.reflection = FloatValue_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // FloatValue
|
|
|
| -// float value = 1;
|
| +// optional float value = 1;
|
| void FloatValue::clear_value() {
|
| value_ = 0;
|
| }
|
| -float FloatValue::value() const {
|
| + float FloatValue::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.FloatValue.value)
|
| return value_;
|
| }
|
| -void FloatValue::set_value(float value) {
|
| + void FloatValue::set_value(float value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.FloatValue.value)
|
| @@ -737,34 +832,34 @@ const int Int64Value::kValueFieldNumber;
|
|
|
| Int64Value::Int64Value()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.Int64Value)
|
| }
|
| +
|
| Int64Value::Int64Value(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.Int64Value)
|
| }
|
| +
|
| +void Int64Value::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| Int64Value::Int64Value(const Int64Value& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.Int64Value)
|
| }
|
|
|
| void Int64Value::SharedCtor() {
|
| - value_ = GOOGLE_LONGLONG(0);
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = GOOGLE_LONGLONG(0);
|
| }
|
|
|
| Int64Value::~Int64Value() {
|
| @@ -773,11 +868,12 @@ Int64Value::~Int64Value() {
|
| }
|
|
|
| void Int64Value::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void Int64Value::ArenaDtor(void* object) {
|
| @@ -793,14 +889,16 @@ void Int64Value::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* Int64Value::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[2].descriptor;
|
| + return Int64Value_descriptor_;
|
| }
|
|
|
| const Int64Value& Int64Value::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +Int64Value* Int64Value::default_instance_ = NULL;
|
| +
|
| Int64Value* Int64Value::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<Int64Value>(arena);
|
| }
|
| @@ -816,20 +914,21 @@ bool Int64Value::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.Int64Value)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // int64 value = 1;
|
| + // optional int64 value = 1;
|
| case 1: {
|
| - if (tag == 8u) {
|
| -
|
| + if (tag == 8) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -857,7 +956,7 @@ failure:
|
| void Int64Value::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.Int64Value)
|
| - // int64 value = 1;
|
| + // optional int64 value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->value(), output);
|
| }
|
| @@ -865,11 +964,10 @@ void Int64Value::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.Int64Value)
|
| }
|
|
|
| -::google::protobuf::uint8* Int64Value::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* Int64Value::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Int64Value)
|
| - // int64 value = 1;
|
| + // optional int64 value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->value(), target);
|
| }
|
| @@ -878,28 +976,27 @@ void Int64Value::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t Int64Value::ByteSizeLong() const {
|
| +int Int64Value::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.Int64Value)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // int64 value = 1;
|
| + // optional int64 value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int64Size(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void Int64Value::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Int64Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const Int64Value* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const Int64Value* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const Int64Value>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -913,8 +1010,7 @@ void Int64Value::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void Int64Value::MergeFrom(const Int64Value& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int64Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -935,6 +1031,7 @@ void Int64Value::CopyFrom(const Int64Value& from) {
|
| }
|
|
|
| bool Int64Value::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -943,13 +1040,10 @@ void Int64Value::Swap(Int64Value* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - Int64Value* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + Int64Value temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void Int64Value::UnsafeArenaSwap(Int64Value* other) {
|
| @@ -959,26 +1053,30 @@ void Int64Value::UnsafeArenaSwap(Int64Value* other) {
|
| }
|
| void Int64Value::InternalSwap(Int64Value* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata Int64Value::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[2];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = Int64Value_descriptor_;
|
| + metadata.reflection = Int64Value_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Int64Value
|
|
|
| -// int64 value = 1;
|
| +// optional int64 value = 1;
|
| void Int64Value::clear_value() {
|
| value_ = GOOGLE_LONGLONG(0);
|
| }
|
| -::google::protobuf::int64 Int64Value::value() const {
|
| + ::google::protobuf::int64 Int64Value::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Int64Value.value)
|
| return value_;
|
| }
|
| -void Int64Value::set_value(::google::protobuf::int64 value) {
|
| + void Int64Value::set_value(::google::protobuf::int64 value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Int64Value.value)
|
| @@ -994,34 +1092,34 @@ const int UInt64Value::kValueFieldNumber;
|
|
|
| UInt64Value::UInt64Value()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.UInt64Value)
|
| }
|
| +
|
| UInt64Value::UInt64Value(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt64Value)
|
| }
|
| +
|
| +void UInt64Value::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| UInt64Value::UInt64Value(const UInt64Value& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt64Value)
|
| }
|
|
|
| void UInt64Value::SharedCtor() {
|
| - value_ = GOOGLE_ULONGLONG(0);
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = GOOGLE_ULONGLONG(0);
|
| }
|
|
|
| UInt64Value::~UInt64Value() {
|
| @@ -1030,11 +1128,12 @@ UInt64Value::~UInt64Value() {
|
| }
|
|
|
| void UInt64Value::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void UInt64Value::ArenaDtor(void* object) {
|
| @@ -1050,14 +1149,16 @@ void UInt64Value::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* UInt64Value::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[3].descriptor;
|
| + return UInt64Value_descriptor_;
|
| }
|
|
|
| const UInt64Value& UInt64Value::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +UInt64Value* UInt64Value::default_instance_ = NULL;
|
| +
|
| UInt64Value* UInt64Value::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<UInt64Value>(arena);
|
| }
|
| @@ -1073,20 +1174,21 @@ bool UInt64Value::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.UInt64Value)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // uint64 value = 1;
|
| + // optional uint64 value = 1;
|
| case 1: {
|
| - if (tag == 8u) {
|
| -
|
| + if (tag == 8) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1114,7 +1216,7 @@ failure:
|
| void UInt64Value::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.UInt64Value)
|
| - // uint64 value = 1;
|
| + // optional uint64 value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->value(), output);
|
| }
|
| @@ -1122,11 +1224,10 @@ void UInt64Value::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.UInt64Value)
|
| }
|
|
|
| -::google::protobuf::uint8* UInt64Value::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* UInt64Value::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UInt64Value)
|
| - // uint64 value = 1;
|
| + // optional uint64 value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->value(), target);
|
| }
|
| @@ -1135,28 +1236,27 @@ void UInt64Value::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t UInt64Value::ByteSizeLong() const {
|
| +int UInt64Value::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.UInt64Value)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // uint64 value = 1;
|
| + // optional uint64 value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::UInt64Size(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void UInt64Value::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UInt64Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const UInt64Value* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const UInt64Value* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const UInt64Value>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1170,8 +1270,7 @@ void UInt64Value::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void UInt64Value::MergeFrom(const UInt64Value& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt64Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -1192,6 +1291,7 @@ void UInt64Value::CopyFrom(const UInt64Value& from) {
|
| }
|
|
|
| bool UInt64Value::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -1200,13 +1300,10 @@ void UInt64Value::Swap(UInt64Value* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - UInt64Value* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + UInt64Value temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void UInt64Value::UnsafeArenaSwap(UInt64Value* other) {
|
| @@ -1216,26 +1313,30 @@ void UInt64Value::UnsafeArenaSwap(UInt64Value* other) {
|
| }
|
| void UInt64Value::InternalSwap(UInt64Value* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata UInt64Value::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[3];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = UInt64Value_descriptor_;
|
| + metadata.reflection = UInt64Value_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // UInt64Value
|
|
|
| -// uint64 value = 1;
|
| +// optional uint64 value = 1;
|
| void UInt64Value::clear_value() {
|
| value_ = GOOGLE_ULONGLONG(0);
|
| }
|
| -::google::protobuf::uint64 UInt64Value::value() const {
|
| + ::google::protobuf::uint64 UInt64Value::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UInt64Value.value)
|
| return value_;
|
| }
|
| -void UInt64Value::set_value(::google::protobuf::uint64 value) {
|
| + void UInt64Value::set_value(::google::protobuf::uint64 value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.UInt64Value.value)
|
| @@ -1251,34 +1352,34 @@ const int Int32Value::kValueFieldNumber;
|
|
|
| Int32Value::Int32Value()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.Int32Value)
|
| }
|
| +
|
| Int32Value::Int32Value(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.Int32Value)
|
| }
|
| +
|
| +void Int32Value::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| Int32Value::Int32Value(const Int32Value& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.Int32Value)
|
| }
|
|
|
| void Int32Value::SharedCtor() {
|
| - value_ = 0;
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = 0;
|
| }
|
|
|
| Int32Value::~Int32Value() {
|
| @@ -1287,11 +1388,12 @@ Int32Value::~Int32Value() {
|
| }
|
|
|
| void Int32Value::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void Int32Value::ArenaDtor(void* object) {
|
| @@ -1307,14 +1409,16 @@ void Int32Value::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* Int32Value::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[4].descriptor;
|
| + return Int32Value_descriptor_;
|
| }
|
|
|
| const Int32Value& Int32Value::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +Int32Value* Int32Value::default_instance_ = NULL;
|
| +
|
| Int32Value* Int32Value::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<Int32Value>(arena);
|
| }
|
| @@ -1330,20 +1434,21 @@ bool Int32Value::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.Int32Value)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // int32 value = 1;
|
| + // optional int32 value = 1;
|
| case 1: {
|
| - if (tag == 8u) {
|
| -
|
| + if (tag == 8) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1371,7 +1476,7 @@ failure:
|
| void Int32Value::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.Int32Value)
|
| - // int32 value = 1;
|
| + // optional int32 value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->value(), output);
|
| }
|
| @@ -1379,11 +1484,10 @@ void Int32Value::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.Int32Value)
|
| }
|
|
|
| -::google::protobuf::uint8* Int32Value::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* Int32Value::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Int32Value)
|
| - // int32 value = 1;
|
| + // optional int32 value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->value(), target);
|
| }
|
| @@ -1392,28 +1496,27 @@ void Int32Value::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t Int32Value::ByteSizeLong() const {
|
| +int Int32Value::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.Int32Value)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // int32 value = 1;
|
| + // optional int32 value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::Int32Size(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void Int32Value::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Int32Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const Int32Value* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const Int32Value* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const Int32Value>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1427,8 +1530,7 @@ void Int32Value::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void Int32Value::MergeFrom(const Int32Value& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int32Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -1449,6 +1551,7 @@ void Int32Value::CopyFrom(const Int32Value& from) {
|
| }
|
|
|
| bool Int32Value::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -1457,13 +1560,10 @@ void Int32Value::Swap(Int32Value* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - Int32Value* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + Int32Value temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void Int32Value::UnsafeArenaSwap(Int32Value* other) {
|
| @@ -1473,26 +1573,30 @@ void Int32Value::UnsafeArenaSwap(Int32Value* other) {
|
| }
|
| void Int32Value::InternalSwap(Int32Value* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata Int32Value::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[4];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = Int32Value_descriptor_;
|
| + metadata.reflection = Int32Value_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // Int32Value
|
|
|
| -// int32 value = 1;
|
| +// optional int32 value = 1;
|
| void Int32Value::clear_value() {
|
| value_ = 0;
|
| }
|
| -::google::protobuf::int32 Int32Value::value() const {
|
| + ::google::protobuf::int32 Int32Value::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.Int32Value.value)
|
| return value_;
|
| }
|
| -void Int32Value::set_value(::google::protobuf::int32 value) {
|
| + void Int32Value::set_value(::google::protobuf::int32 value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.Int32Value.value)
|
| @@ -1508,34 +1612,34 @@ const int UInt32Value::kValueFieldNumber;
|
|
|
| UInt32Value::UInt32Value()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.UInt32Value)
|
| }
|
| +
|
| UInt32Value::UInt32Value(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt32Value)
|
| }
|
| +
|
| +void UInt32Value::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| UInt32Value::UInt32Value(const UInt32Value& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt32Value)
|
| }
|
|
|
| void UInt32Value::SharedCtor() {
|
| - value_ = 0u;
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = 0u;
|
| }
|
|
|
| UInt32Value::~UInt32Value() {
|
| @@ -1544,11 +1648,12 @@ UInt32Value::~UInt32Value() {
|
| }
|
|
|
| void UInt32Value::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void UInt32Value::ArenaDtor(void* object) {
|
| @@ -1564,14 +1669,16 @@ void UInt32Value::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* UInt32Value::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[5].descriptor;
|
| + return UInt32Value_descriptor_;
|
| }
|
|
|
| const UInt32Value& UInt32Value::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +UInt32Value* UInt32Value::default_instance_ = NULL;
|
| +
|
| UInt32Value* UInt32Value::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<UInt32Value>(arena);
|
| }
|
| @@ -1587,20 +1694,21 @@ bool UInt32Value::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.UInt32Value)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // uint32 value = 1;
|
| + // optional uint32 value = 1;
|
| case 1: {
|
| - if (tag == 8u) {
|
| -
|
| + if (tag == 8) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1628,7 +1736,7 @@ failure:
|
| void UInt32Value::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.UInt32Value)
|
| - // uint32 value = 1;
|
| + // optional uint32 value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->value(), output);
|
| }
|
| @@ -1636,11 +1744,10 @@ void UInt32Value::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.UInt32Value)
|
| }
|
|
|
| -::google::protobuf::uint8* UInt32Value::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* UInt32Value::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UInt32Value)
|
| - // uint32 value = 1;
|
| + // optional uint32 value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->value(), target);
|
| }
|
| @@ -1649,28 +1756,27 @@ void UInt32Value::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t UInt32Value::ByteSizeLong() const {
|
| +int UInt32Value::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.UInt32Value)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // uint32 value = 1;
|
| + // optional uint32 value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::UInt32Size(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void UInt32Value::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UInt32Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const UInt32Value* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const UInt32Value* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const UInt32Value>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1684,8 +1790,7 @@ void UInt32Value::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void UInt32Value::MergeFrom(const UInt32Value& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt32Value)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -1706,6 +1811,7 @@ void UInt32Value::CopyFrom(const UInt32Value& from) {
|
| }
|
|
|
| bool UInt32Value::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -1714,13 +1820,10 @@ void UInt32Value::Swap(UInt32Value* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - UInt32Value* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + UInt32Value temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void UInt32Value::UnsafeArenaSwap(UInt32Value* other) {
|
| @@ -1730,26 +1833,30 @@ void UInt32Value::UnsafeArenaSwap(UInt32Value* other) {
|
| }
|
| void UInt32Value::InternalSwap(UInt32Value* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata UInt32Value::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[5];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = UInt32Value_descriptor_;
|
| + metadata.reflection = UInt32Value_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // UInt32Value
|
|
|
| -// uint32 value = 1;
|
| +// optional uint32 value = 1;
|
| void UInt32Value::clear_value() {
|
| value_ = 0u;
|
| }
|
| -::google::protobuf::uint32 UInt32Value::value() const {
|
| + ::google::protobuf::uint32 UInt32Value::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.UInt32Value.value)
|
| return value_;
|
| }
|
| -void UInt32Value::set_value(::google::protobuf::uint32 value) {
|
| + void UInt32Value::set_value(::google::protobuf::uint32 value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.UInt32Value.value)
|
| @@ -1765,34 +1872,34 @@ const int BoolValue::kValueFieldNumber;
|
|
|
| BoolValue::BoolValue()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.BoolValue)
|
| }
|
| +
|
| BoolValue::BoolValue(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.BoolValue)
|
| }
|
| +
|
| +void BoolValue::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| BoolValue::BoolValue(const BoolValue& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_ = from.value_;
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.BoolValue)
|
| }
|
|
|
| void BoolValue::SharedCtor() {
|
| - value_ = false;
|
| + _is_default_instance_ = false;
|
| _cached_size_ = 0;
|
| + value_ = false;
|
| }
|
|
|
| BoolValue::~BoolValue() {
|
| @@ -1801,11 +1908,12 @@ BoolValue::~BoolValue() {
|
| }
|
|
|
| void BoolValue::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void BoolValue::ArenaDtor(void* object) {
|
| @@ -1821,14 +1929,16 @@ void BoolValue::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* BoolValue::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[6].descriptor;
|
| + return BoolValue_descriptor_;
|
| }
|
|
|
| const BoolValue& BoolValue::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +BoolValue* BoolValue::default_instance_ = NULL;
|
| +
|
| BoolValue* BoolValue::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<BoolValue>(arena);
|
| }
|
| @@ -1844,20 +1954,21 @@ bool BoolValue::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.BoolValue)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // bool value = 1;
|
| + // optional bool value = 1;
|
| case 1: {
|
| - if (tag == 8u) {
|
| -
|
| + if (tag == 8) {
|
| DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
|
| bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
|
| input, &value_)));
|
| +
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -1885,7 +1996,7 @@ failure:
|
| void BoolValue::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.BoolValue)
|
| - // bool value = 1;
|
| + // optional bool value = 1;
|
| if (this->value() != 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->value(), output);
|
| }
|
| @@ -1893,11 +2004,10 @@ void BoolValue::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.BoolValue)
|
| }
|
|
|
| -::google::protobuf::uint8* BoolValue::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* BoolValue::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.BoolValue)
|
| - // bool value = 1;
|
| + // optional bool value = 1;
|
| if (this->value() != 0) {
|
| target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->value(), target);
|
| }
|
| @@ -1906,26 +2016,25 @@ void BoolValue::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t BoolValue::ByteSizeLong() const {
|
| +int BoolValue::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.BoolValue)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // bool value = 1;
|
| + // optional bool value = 1;
|
| if (this->value() != 0) {
|
| total_size += 1 + 1;
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void BoolValue::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.BoolValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const BoolValue* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const BoolValue* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const BoolValue>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -1939,8 +2048,7 @@ void BoolValue::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void BoolValue::MergeFrom(const BoolValue& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BoolValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value() != 0) {
|
| set_value(from.value());
|
| }
|
| @@ -1961,6 +2069,7 @@ void BoolValue::CopyFrom(const BoolValue& from) {
|
| }
|
|
|
| bool BoolValue::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -1969,13 +2078,10 @@ void BoolValue::Swap(BoolValue* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - BoolValue* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + BoolValue temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void BoolValue::UnsafeArenaSwap(BoolValue* other) {
|
| @@ -1985,26 +2091,30 @@ void BoolValue::UnsafeArenaSwap(BoolValue* other) {
|
| }
|
| void BoolValue::InternalSwap(BoolValue* other) {
|
| std::swap(value_, other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata BoolValue::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[6];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = BoolValue_descriptor_;
|
| + metadata.reflection = BoolValue_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // BoolValue
|
|
|
| -// bool value = 1;
|
| +// optional bool value = 1;
|
| void BoolValue::clear_value() {
|
| value_ = false;
|
| }
|
| -bool BoolValue::value() const {
|
| + bool BoolValue::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.BoolValue.value)
|
| return value_;
|
| }
|
| -void BoolValue::set_value(bool value) {
|
| + void BoolValue::set_value(bool value) {
|
|
|
| value_ = value;
|
| // @@protoc_insertion_point(field_set:google.protobuf.BoolValue.value)
|
| @@ -2020,38 +2130,35 @@ const int StringValue::kValueFieldNumber;
|
|
|
| StringValue::StringValue()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.StringValue)
|
| }
|
| +
|
| StringValue::StringValue(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.StringValue)
|
| }
|
| +
|
| +void StringValue::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| StringValue::StringValue(const StringValue& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (from.value().size() > 0) {
|
| - value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value(),
|
| - GetArenaNoVirtual());
|
| - }
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.StringValue)
|
| }
|
|
|
| void StringValue::SharedCtor() {
|
| - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + _is_default_instance_ = false;
|
| + ::google::protobuf::internal::GetEmptyString();
|
| _cached_size_ = 0;
|
| + value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
|
|
| StringValue::~StringValue() {
|
| @@ -2060,12 +2167,13 @@ StringValue::~StringValue() {
|
| }
|
|
|
| void StringValue::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| - value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
|
| + value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void StringValue::ArenaDtor(void* object) {
|
| @@ -2081,14 +2189,16 @@ void StringValue::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* StringValue::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[7].descriptor;
|
| + return StringValue_descriptor_;
|
| }
|
|
|
| const StringValue& StringValue::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +StringValue* StringValue::default_instance_ = NULL;
|
| +
|
| StringValue* StringValue::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<StringValue>(arena);
|
| }
|
| @@ -2104,13 +2214,13 @@ bool StringValue::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.StringValue)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // string value = 1;
|
| + // optional string value = 1;
|
| case 1: {
|
| - if (tag == 10u) {
|
| + if (tag == 10) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadString(
|
| input, this->mutable_value()));
|
| DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| @@ -2120,6 +2230,7 @@ bool StringValue::MergePartialFromCodedStream(
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -2147,7 +2258,7 @@ failure:
|
| void StringValue::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.StringValue)
|
| - // string value = 1;
|
| + // optional string value = 1;
|
| if (this->value().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->value().data(), this->value().length(),
|
| @@ -2160,11 +2271,10 @@ void StringValue::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.StringValue)
|
| }
|
|
|
| -::google::protobuf::uint8* StringValue::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* StringValue::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.StringValue)
|
| - // string value = 1;
|
| + // optional string value = 1;
|
| if (this->value().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
|
| this->value().data(), this->value().length(),
|
| @@ -2179,28 +2289,27 @@ void StringValue::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t StringValue::ByteSizeLong() const {
|
| +int StringValue::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.StringValue)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // string value = 1;
|
| + // optional string value = 1;
|
| if (this->value().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::StringSize(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void StringValue::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.StringValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const StringValue* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const StringValue* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const StringValue>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -2214,8 +2323,7 @@ void StringValue::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void StringValue::MergeFrom(const StringValue& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.StringValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value().size() > 0) {
|
| set_value(from.value());
|
| }
|
| @@ -2236,6 +2344,7 @@ void StringValue::CopyFrom(const StringValue& from) {
|
| }
|
|
|
| bool StringValue::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -2244,13 +2353,10 @@ void StringValue::Swap(StringValue* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - StringValue* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + StringValue temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void StringValue::UnsafeArenaSwap(StringValue* other) {
|
| @@ -2260,61 +2366,65 @@ void StringValue::UnsafeArenaSwap(StringValue* other) {
|
| }
|
| void StringValue::InternalSwap(StringValue* other) {
|
| value_.Swap(&other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata StringValue::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[7];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = StringValue_descriptor_;
|
| + metadata.reflection = StringValue_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // StringValue
|
|
|
| -// string value = 1;
|
| +// optional string value = 1;
|
| void StringValue::clear_value() {
|
| value_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -const ::std::string& StringValue::value() const {
|
| + const ::std::string& StringValue::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.StringValue.value)
|
| - return value_.Get();
|
| + return value_.Get(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| -void StringValue::set_value(const ::std::string& value) {
|
| + void StringValue::set_value(const ::std::string& value) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set:google.protobuf.StringValue.value)
|
| }
|
| -void StringValue::set_value(const char* value) {
|
| + void StringValue::set_value(const char* value) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
|
| GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.StringValue.value)
|
| }
|
| -void StringValue::set_value(const char* value,
|
| + void StringValue::set_value(const char* value,
|
| size_t size) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
|
| reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.StringValue.value)
|
| }
|
| -::std::string* StringValue::mutable_value() {
|
| + ::std::string* StringValue::mutable_value() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.StringValue.value)
|
| return value_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -::std::string* StringValue::release_value() {
|
| + ::std::string* StringValue::release_value() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.StringValue.value)
|
|
|
| return value_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -::std::string* StringValue::unsafe_arena_release_value() {
|
| + ::std::string* StringValue::unsafe_arena_release_value() {
|
| // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.StringValue.value)
|
| GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
|
|
|
| return value_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| GetArenaNoVirtual());
|
| }
|
| -void StringValue::set_allocated_value(::std::string* value) {
|
| + void StringValue::set_allocated_value(::std::string* value) {
|
| if (value != NULL) {
|
|
|
| } else {
|
| @@ -2324,7 +2434,7 @@ void StringValue::set_allocated_value(::std::string* value) {
|
| GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.StringValue.value)
|
| }
|
| -void StringValue::unsafe_arena_set_allocated_value(
|
| + void StringValue::unsafe_arena_set_allocated_value(
|
| ::std::string* value) {
|
| GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
|
| if (value != NULL) {
|
| @@ -2347,38 +2457,35 @@ const int BytesValue::kValueFieldNumber;
|
|
|
| BytesValue::BytesValue()
|
| : ::google::protobuf::Message(), _internal_metadata_(NULL) {
|
| - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - }
|
| SharedCtor();
|
| // @@protoc_insertion_point(constructor:google.protobuf.BytesValue)
|
| }
|
| +
|
| BytesValue::BytesValue(::google::protobuf::Arena* arena)
|
| : ::google::protobuf::Message(),
|
| _internal_metadata_(arena) {
|
| -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| -#endif // GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER
|
| SharedCtor();
|
| RegisterArenaDtor(arena);
|
| // @@protoc_insertion_point(arena_constructor:google.protobuf.BytesValue)
|
| }
|
| +
|
| +void BytesValue::InitAsDefaultInstance() {
|
| + _is_default_instance_ = true;
|
| +}
|
| +
|
| BytesValue::BytesValue(const BytesValue& from)
|
| : ::google::protobuf::Message(),
|
| - _internal_metadata_(NULL),
|
| - _cached_size_(0) {
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| - if (from.value().size() > 0) {
|
| - value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value(),
|
| - GetArenaNoVirtual());
|
| - }
|
| + _internal_metadata_(NULL) {
|
| + SharedCtor();
|
| + MergeFrom(from);
|
| // @@protoc_insertion_point(copy_constructor:google.protobuf.BytesValue)
|
| }
|
|
|
| void BytesValue::SharedCtor() {
|
| - value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| + _is_default_instance_ = false;
|
| + ::google::protobuf::internal::GetEmptyString();
|
| _cached_size_ = 0;
|
| + value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
|
|
| BytesValue::~BytesValue() {
|
| @@ -2387,12 +2494,13 @@ BytesValue::~BytesValue() {
|
| }
|
|
|
| void BytesValue::SharedDtor() {
|
| - ::google::protobuf::Arena* arena = GetArenaNoVirtual();
|
| - if (arena != NULL) {
|
| + if (GetArenaNoVirtual() != NULL) {
|
| return;
|
| }
|
|
|
| - value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), arena);
|
| + value_.Destroy(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| + if (this != default_instance_) {
|
| + }
|
| }
|
|
|
| void BytesValue::ArenaDtor(void* object) {
|
| @@ -2408,14 +2516,16 @@ void BytesValue::SetCachedSize(int size) const {
|
| }
|
| const ::google::protobuf::Descriptor* BytesValue::descriptor() {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[8].descriptor;
|
| + return BytesValue_descriptor_;
|
| }
|
|
|
| const BytesValue& BytesValue::default_instance() {
|
| - protobuf_InitDefaults_google_2fprotobuf_2fwrappers_2eproto();
|
| - return *internal_default_instance();
|
| + if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto();
|
| + return *default_instance_;
|
| }
|
|
|
| +BytesValue* BytesValue::default_instance_ = NULL;
|
| +
|
| BytesValue* BytesValue::New(::google::protobuf::Arena* arena) const {
|
| return ::google::protobuf::Arena::CreateMessage<BytesValue>(arena);
|
| }
|
| @@ -2431,18 +2541,19 @@ bool BytesValue::MergePartialFromCodedStream(
|
| ::google::protobuf::uint32 tag;
|
| // @@protoc_insertion_point(parse_start:google.protobuf.BytesValue)
|
| for (;;) {
|
| - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
|
| + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
|
| tag = p.first;
|
| if (!p.second) goto handle_unusual;
|
| switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
|
| - // bytes value = 1;
|
| + // optional bytes value = 1;
|
| case 1: {
|
| - if (tag == 10u) {
|
| + if (tag == 10) {
|
| DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
|
| input, this->mutable_value()));
|
| } else {
|
| goto handle_unusual;
|
| }
|
| + if (input->ExpectAtEnd()) goto success;
|
| break;
|
| }
|
|
|
| @@ -2470,7 +2581,7 @@ failure:
|
| void BytesValue::SerializeWithCachedSizes(
|
| ::google::protobuf::io::CodedOutputStream* output) const {
|
| // @@protoc_insertion_point(serialize_start:google.protobuf.BytesValue)
|
| - // bytes value = 1;
|
| + // optional bytes value = 1;
|
| if (this->value().size() > 0) {
|
| ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
|
| 1, this->value(), output);
|
| @@ -2479,11 +2590,10 @@ void BytesValue::SerializeWithCachedSizes(
|
| // @@protoc_insertion_point(serialize_end:google.protobuf.BytesValue)
|
| }
|
|
|
| -::google::protobuf::uint8* BytesValue::InternalSerializeWithCachedSizesToArray(
|
| - bool deterministic, ::google::protobuf::uint8* target) const {
|
| - (void)deterministic; // Unused
|
| +::google::protobuf::uint8* BytesValue::SerializeWithCachedSizesToArray(
|
| + ::google::protobuf::uint8* target) const {
|
| // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.BytesValue)
|
| - // bytes value = 1;
|
| + // optional bytes value = 1;
|
| if (this->value().size() > 0) {
|
| target =
|
| ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
|
| @@ -2494,28 +2604,27 @@ void BytesValue::SerializeWithCachedSizes(
|
| return target;
|
| }
|
|
|
| -size_t BytesValue::ByteSizeLong() const {
|
| +int BytesValue::ByteSize() const {
|
| // @@protoc_insertion_point(message_byte_size_start:google.protobuf.BytesValue)
|
| - size_t total_size = 0;
|
| + int total_size = 0;
|
|
|
| - // bytes value = 1;
|
| + // optional bytes value = 1;
|
| if (this->value().size() > 0) {
|
| total_size += 1 +
|
| ::google::protobuf::internal::WireFormatLite::BytesSize(
|
| this->value());
|
| }
|
|
|
| - int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
|
| GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
|
| - _cached_size_ = cached_size;
|
| + _cached_size_ = total_size;
|
| GOOGLE_SAFE_CONCURRENT_WRITES_END();
|
| return total_size;
|
| }
|
|
|
| void BytesValue::MergeFrom(const ::google::protobuf::Message& from) {
|
| // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.BytesValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - const BytesValue* source =
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| + const BytesValue* source =
|
| ::google::protobuf::internal::DynamicCastToGenerated<const BytesValue>(
|
| &from);
|
| if (source == NULL) {
|
| @@ -2529,8 +2638,7 @@ void BytesValue::MergeFrom(const ::google::protobuf::Message& from) {
|
|
|
| void BytesValue::MergeFrom(const BytesValue& from) {
|
| // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BytesValue)
|
| - GOOGLE_DCHECK_NE(&from, this);
|
| - _internal_metadata_.MergeFrom(from._internal_metadata_);
|
| + if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__);
|
| if (from.value().size() > 0) {
|
| set_value(from.value());
|
| }
|
| @@ -2551,6 +2659,7 @@ void BytesValue::CopyFrom(const BytesValue& from) {
|
| }
|
|
|
| bool BytesValue::IsInitialized() const {
|
| +
|
| return true;
|
| }
|
|
|
| @@ -2559,13 +2668,10 @@ void BytesValue::Swap(BytesValue* other) {
|
| if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {
|
| InternalSwap(other);
|
| } else {
|
| - BytesValue* temp = New(GetArenaNoVirtual());
|
| - temp->MergeFrom(*other);
|
| - other->CopyFrom(*this);
|
| - InternalSwap(temp);
|
| - if (GetArenaNoVirtual() == NULL) {
|
| - delete temp;
|
| - }
|
| + BytesValue temp;
|
| + temp.MergeFrom(*this);
|
| + CopyFrom(*other);
|
| + other->CopyFrom(temp);
|
| }
|
| }
|
| void BytesValue::UnsafeArenaSwap(BytesValue* other) {
|
| @@ -2575,61 +2681,65 @@ void BytesValue::UnsafeArenaSwap(BytesValue* other) {
|
| }
|
| void BytesValue::InternalSwap(BytesValue* other) {
|
| value_.Swap(&other->value_);
|
| + _internal_metadata_.Swap(&other->_internal_metadata_);
|
| std::swap(_cached_size_, other->_cached_size_);
|
| }
|
|
|
| ::google::protobuf::Metadata BytesValue::GetMetadata() const {
|
| protobuf_AssignDescriptorsOnce();
|
| - return file_level_metadata[8];
|
| + ::google::protobuf::Metadata metadata;
|
| + metadata.descriptor = BytesValue_descriptor_;
|
| + metadata.reflection = BytesValue_reflection_;
|
| + return metadata;
|
| }
|
|
|
| #if PROTOBUF_INLINE_NOT_IN_HEADERS
|
| // BytesValue
|
|
|
| -// bytes value = 1;
|
| +// optional bytes value = 1;
|
| void BytesValue::clear_value() {
|
| value_.ClearToEmpty(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -const ::std::string& BytesValue::value() const {
|
| + const ::std::string& BytesValue::value() const {
|
| // @@protoc_insertion_point(field_get:google.protobuf.BytesValue.value)
|
| - return value_.Get();
|
| + return value_.Get(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
|
| }
|
| -void BytesValue::set_value(const ::std::string& value) {
|
| + void BytesValue::set_value(const ::std::string& value) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value, GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set:google.protobuf.BytesValue.value)
|
| }
|
| -void BytesValue::set_value(const char* value) {
|
| + void BytesValue::set_value(const char* value) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
|
| GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_char:google.protobuf.BytesValue.value)
|
| }
|
| -void BytesValue::set_value(const void* value,
|
| + void BytesValue::set_value(const void* value,
|
| size_t size) {
|
|
|
| value_.Set(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(
|
| reinterpret_cast<const char*>(value), size), GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_pointer:google.protobuf.BytesValue.value)
|
| }
|
| -::std::string* BytesValue::mutable_value() {
|
| + ::std::string* BytesValue::mutable_value() {
|
|
|
| // @@protoc_insertion_point(field_mutable:google.protobuf.BytesValue.value)
|
| return value_.Mutable(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -::std::string* BytesValue::release_value() {
|
| + ::std::string* BytesValue::release_value() {
|
| // @@protoc_insertion_point(field_release:google.protobuf.BytesValue.value)
|
|
|
| return value_.Release(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual());
|
| }
|
| -::std::string* BytesValue::unsafe_arena_release_value() {
|
| + ::std::string* BytesValue::unsafe_arena_release_value() {
|
| // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.BytesValue.value)
|
| GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
|
|
|
| return value_.UnsafeArenaRelease(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
|
| GetArenaNoVirtual());
|
| }
|
| -void BytesValue::set_allocated_value(::std::string* value) {
|
| + void BytesValue::set_allocated_value(::std::string* value) {
|
| if (value != NULL) {
|
|
|
| } else {
|
| @@ -2639,7 +2749,7 @@ void BytesValue::set_allocated_value(::std::string* value) {
|
| GetArenaNoVirtual());
|
| // @@protoc_insertion_point(field_set_allocated:google.protobuf.BytesValue.value)
|
| }
|
| -void BytesValue::unsafe_arena_set_allocated_value(
|
| + void BytesValue::unsafe_arena_set_allocated_value(
|
| ::std::string* value) {
|
| GOOGLE_DCHECK(GetArenaNoVirtual() != NULL);
|
| if (value != NULL) {
|
|
|