diff options
Diffstat (limited to 'src/google/protobuf/wrappers.pb.cc')
-rw-r--r-- | src/google/protobuf/wrappers.pb.cc | 380 |
1 files changed, 129 insertions, 251 deletions
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index 34c6fed1..ffd905f5 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -7,7 +7,6 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/port.h> -#include <google/protobuf/stubs/once.h> #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/wire_format_lite_inl.h> #include <google/protobuf/descriptor.h> @@ -19,6 +18,7 @@ #include "third_party/protobuf/version.h" #endif // @@protoc_insertion_point(includes) + namespace google { namespace protobuf { class DoubleValueDefaultTypeInternal { @@ -69,14 +69,9 @@ class BytesValueDefaultTypeInternal { } // namespace protobuf } // namespace google namespace protobuf_google_2fprotobuf_2fwrappers_2eproto { -void InitDefaultsDoubleValueImpl() { +static void InitDefaultsDoubleValue() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_DoubleValue_default_instance_; new (ptr) ::google::protobuf::DoubleValue(); @@ -85,19 +80,12 @@ void InitDefaultsDoubleValueImpl() { ::google::protobuf::DoubleValue::InitAsDefaultInstance(); } -void InitDefaultsDoubleValue() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsDoubleValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_DoubleValue = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsDoubleValue}, {}}; -void InitDefaultsFloatValueImpl() { +static void InitDefaultsFloatValue() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_FloatValue_default_instance_; new (ptr) ::google::protobuf::FloatValue(); @@ -106,19 +94,12 @@ void InitDefaultsFloatValueImpl() { ::google::protobuf::FloatValue::InitAsDefaultInstance(); } -void InitDefaultsFloatValue() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsFloatValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_FloatValue = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFloatValue}, {}}; -void InitDefaultsInt64ValueImpl() { +static void InitDefaultsInt64Value() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_Int64Value_default_instance_; new (ptr) ::google::protobuf::Int64Value(); @@ -127,19 +108,12 @@ void InitDefaultsInt64ValueImpl() { ::google::protobuf::Int64Value::InitAsDefaultInstance(); } -void InitDefaultsInt64Value() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsInt64ValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Int64Value = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsInt64Value}, {}}; -void InitDefaultsUInt64ValueImpl() { +static void InitDefaultsUInt64Value() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_UInt64Value_default_instance_; new (ptr) ::google::protobuf::UInt64Value(); @@ -148,19 +122,12 @@ void InitDefaultsUInt64ValueImpl() { ::google::protobuf::UInt64Value::InitAsDefaultInstance(); } -void InitDefaultsUInt64Value() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsUInt64ValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_UInt64Value = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsUInt64Value}, {}}; -void InitDefaultsInt32ValueImpl() { +static void InitDefaultsInt32Value() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_Int32Value_default_instance_; new (ptr) ::google::protobuf::Int32Value(); @@ -169,19 +136,12 @@ void InitDefaultsInt32ValueImpl() { ::google::protobuf::Int32Value::InitAsDefaultInstance(); } -void InitDefaultsInt32Value() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsInt32ValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_Int32Value = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsInt32Value}, {}}; -void InitDefaultsUInt32ValueImpl() { +static void InitDefaultsUInt32Value() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_UInt32Value_default_instance_; new (ptr) ::google::protobuf::UInt32Value(); @@ -190,19 +150,12 @@ void InitDefaultsUInt32ValueImpl() { ::google::protobuf::UInt32Value::InitAsDefaultInstance(); } -void InitDefaultsUInt32Value() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsUInt32ValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_UInt32Value = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsUInt32Value}, {}}; -void InitDefaultsBoolValueImpl() { +static void InitDefaultsBoolValue() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_BoolValue_default_instance_; new (ptr) ::google::protobuf::BoolValue(); @@ -211,19 +164,12 @@ void InitDefaultsBoolValueImpl() { ::google::protobuf::BoolValue::InitAsDefaultInstance(); } -void InitDefaultsBoolValue() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsBoolValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_BoolValue = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsBoolValue}, {}}; -void InitDefaultsStringValueImpl() { +static void InitDefaultsStringValue() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_StringValue_default_instance_; new (ptr) ::google::protobuf::StringValue(); @@ -232,19 +178,12 @@ void InitDefaultsStringValueImpl() { ::google::protobuf::StringValue::InitAsDefaultInstance(); } -void InitDefaultsStringValue() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsStringValueImpl); -} +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_StringValue = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsStringValue}, {}}; -void InitDefaultsBytesValueImpl() { +static void InitDefaultsBytesValue() { GOOGLE_PROTOBUF_VERIFY_VERSION; -#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS - ::google::protobuf::internal::InitProtobufDefaultsForceUnique(); -#else - ::google::protobuf::internal::InitProtobufDefaults(); -#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS { void* ptr = &::google::protobuf::_BytesValue_default_instance_; new (ptr) ::google::protobuf::BytesValue(); @@ -253,9 +192,19 @@ void InitDefaultsBytesValueImpl() { ::google::protobuf::BytesValue::InitAsDefaultInstance(); } -void InitDefaultsBytesValue() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsBytesValueImpl); +LIBPROTOBUF_EXPORT ::google::protobuf::internal::SCCInfo<0> scc_info_BytesValue = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsBytesValue}, {}}; + +void InitDefaults() { + ::google::protobuf::internal::InitSCC(&scc_info_DoubleValue.base); + ::google::protobuf::internal::InitSCC(&scc_info_FloatValue.base); + ::google::protobuf::internal::InitSCC(&scc_info_Int64Value.base); + ::google::protobuf::internal::InitSCC(&scc_info_UInt64Value.base); + ::google::protobuf::internal::InitSCC(&scc_info_Int32Value.base); + ::google::protobuf::internal::InitSCC(&scc_info_UInt32Value.base); + ::google::protobuf::internal::InitSCC(&scc_info_BoolValue.base); + ::google::protobuf::internal::InitSCC(&scc_info_StringValue.base); + ::google::protobuf::internal::InitSCC(&scc_info_BytesValue.base); } ::google::protobuf::Metadata file_level_metadata[9]; @@ -342,15 +291,14 @@ static ::google::protobuf::Message const * const file_default_instances[] = { void protobuf_AssignDescriptors() { AddDescriptors(); - ::google::protobuf::MessageFactory* factory = NULL; AssignDescriptors( - "google/protobuf/wrappers.proto", schemas, file_default_instances, TableStruct::offsets, factory, + "google/protobuf/wrappers.proto", schemas, file_default_instances, TableStruct::offsets, file_level_metadata, NULL, NULL); } void protobuf_AssignDescriptorsOnce() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors); + static ::google::protobuf::internal::once_flag once; + ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors); } void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD; @@ -382,8 +330,8 @@ void AddDescriptorsImpl() { } void AddDescriptors() { - static GOOGLE_PROTOBUF_DECLARE_ONCE(once); - ::google::protobuf::GoogleOnceInit(&once, &AddDescriptorsImpl); + static ::google::protobuf::internal::once_flag once; + ::google::protobuf::internal::call_once(once, AddDescriptorsImpl); } // Force AddDescriptors() to be called at dynamic initialization time. struct StaticDescriptorInitializer { @@ -405,24 +353,22 @@ const int DoubleValue::kValueFieldNumber; DoubleValue::DoubleValue() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsDoubleValue(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_DoubleValue.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DoubleValue) } DoubleValue::DoubleValue(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsDoubleValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_DoubleValue.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.DoubleValue) } DoubleValue::DoubleValue(const DoubleValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.DoubleValue) @@ -430,7 +376,6 @@ DoubleValue::DoubleValue(const DoubleValue& from) void DoubleValue::SharedCtor() { value_ = 0; - _cached_size_ = 0; } DoubleValue::~DoubleValue() { @@ -449,9 +394,7 @@ void DoubleValue::ArenaDtor(void* object) { void DoubleValue::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void DoubleValue::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* DoubleValue::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -459,7 +402,7 @@ const ::google::protobuf::Descriptor* DoubleValue::descriptor() { } const DoubleValue& DoubleValue::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsDoubleValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_DoubleValue.base); return *internal_default_instance(); } @@ -480,7 +423,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -571,9 +514,7 @@ size_t DoubleValue::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -645,7 +586,6 @@ void DoubleValue::InternalSwap(DoubleValue* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata DoubleValue::GetMetadata() const { @@ -664,24 +604,22 @@ const int FloatValue::kValueFieldNumber; FloatValue::FloatValue() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsFloatValue(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_FloatValue.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FloatValue) } FloatValue::FloatValue(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsFloatValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_FloatValue.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FloatValue) } FloatValue::FloatValue(const FloatValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.FloatValue) @@ -689,7 +627,6 @@ FloatValue::FloatValue(const FloatValue& from) void FloatValue::SharedCtor() { value_ = 0; - _cached_size_ = 0; } FloatValue::~FloatValue() { @@ -708,9 +645,7 @@ void FloatValue::ArenaDtor(void* object) { void FloatValue::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void FloatValue::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* FloatValue::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -718,7 +653,7 @@ const ::google::protobuf::Descriptor* FloatValue::descriptor() { } const FloatValue& FloatValue::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsFloatValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_FloatValue.base); return *internal_default_instance(); } @@ -739,7 +674,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -830,9 +765,7 @@ size_t FloatValue::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -904,7 +837,6 @@ void FloatValue::InternalSwap(FloatValue* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata FloatValue::GetMetadata() const { @@ -923,24 +855,22 @@ const int Int64Value::kValueFieldNumber; Int64Value::Int64Value() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt64Value(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int64Value.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.Int64Value) } Int64Value::Int64Value(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt64Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int64Value.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Int64Value) } Int64Value::Int64Value(const Int64Value& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.Int64Value) @@ -948,7 +878,6 @@ Int64Value::Int64Value(const Int64Value& from) void Int64Value::SharedCtor() { value_ = GOOGLE_LONGLONG(0); - _cached_size_ = 0; } Int64Value::~Int64Value() { @@ -967,9 +896,7 @@ void Int64Value::ArenaDtor(void* object) { void Int64Value::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void Int64Value::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* Int64Value::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -977,7 +904,7 @@ const ::google::protobuf::Descriptor* Int64Value::descriptor() { } const Int64Value& Int64Value::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt64Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int64Value.base); return *internal_default_instance(); } @@ -998,7 +925,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -1091,9 +1018,7 @@ size_t Int64Value::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -1165,7 +1090,6 @@ void Int64Value::InternalSwap(Int64Value* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata Int64Value::GetMetadata() const { @@ -1184,24 +1108,22 @@ const int UInt64Value::kValueFieldNumber; UInt64Value::UInt64Value() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt64Value(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt64Value.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.UInt64Value) } UInt64Value::UInt64Value(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt64Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt64Value.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt64Value) } UInt64Value::UInt64Value(const UInt64Value& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt64Value) @@ -1209,7 +1131,6 @@ UInt64Value::UInt64Value(const UInt64Value& from) void UInt64Value::SharedCtor() { value_ = GOOGLE_ULONGLONG(0); - _cached_size_ = 0; } UInt64Value::~UInt64Value() { @@ -1228,9 +1149,7 @@ void UInt64Value::ArenaDtor(void* object) { void UInt64Value::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void UInt64Value::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* UInt64Value::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -1238,7 +1157,7 @@ const ::google::protobuf::Descriptor* UInt64Value::descriptor() { } const UInt64Value& UInt64Value::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt64Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt64Value.base); return *internal_default_instance(); } @@ -1259,7 +1178,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -1352,9 +1271,7 @@ size_t UInt64Value::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -1426,7 +1343,6 @@ void UInt64Value::InternalSwap(UInt64Value* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata UInt64Value::GetMetadata() const { @@ -1445,24 +1361,22 @@ const int Int32Value::kValueFieldNumber; Int32Value::Int32Value() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt32Value(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int32Value.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.Int32Value) } Int32Value::Int32Value(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt32Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int32Value.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.Int32Value) } Int32Value::Int32Value(const Int32Value& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.Int32Value) @@ -1470,7 +1384,6 @@ Int32Value::Int32Value(const Int32Value& from) void Int32Value::SharedCtor() { value_ = 0; - _cached_size_ = 0; } Int32Value::~Int32Value() { @@ -1489,9 +1402,7 @@ void Int32Value::ArenaDtor(void* object) { void Int32Value::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void Int32Value::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* Int32Value::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -1499,7 +1410,7 @@ const ::google::protobuf::Descriptor* Int32Value::descriptor() { } const Int32Value& Int32Value::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsInt32Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_Int32Value.base); return *internal_default_instance(); } @@ -1520,7 +1431,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -1613,9 +1524,7 @@ size_t Int32Value::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -1687,7 +1596,6 @@ void Int32Value::InternalSwap(Int32Value* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata Int32Value::GetMetadata() const { @@ -1706,24 +1614,22 @@ const int UInt32Value::kValueFieldNumber; UInt32Value::UInt32Value() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt32Value(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt32Value.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.UInt32Value) } UInt32Value::UInt32Value(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt32Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt32Value.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt32Value) } UInt32Value::UInt32Value(const UInt32Value& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt32Value) @@ -1731,7 +1637,6 @@ UInt32Value::UInt32Value(const UInt32Value& from) void UInt32Value::SharedCtor() { value_ = 0u; - _cached_size_ = 0; } UInt32Value::~UInt32Value() { @@ -1750,9 +1655,7 @@ void UInt32Value::ArenaDtor(void* object) { void UInt32Value::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void UInt32Value::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* UInt32Value::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -1760,7 +1663,7 @@ const ::google::protobuf::Descriptor* UInt32Value::descriptor() { } const UInt32Value& UInt32Value::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsUInt32Value(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_UInt32Value.base); return *internal_default_instance(); } @@ -1781,7 +1684,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -1874,9 +1777,7 @@ size_t UInt32Value::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -1948,7 +1849,6 @@ void UInt32Value::InternalSwap(UInt32Value* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata UInt32Value::GetMetadata() const { @@ -1967,24 +1867,22 @@ const int BoolValue::kValueFieldNumber; BoolValue::BoolValue() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBoolValue(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BoolValue.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.BoolValue) } BoolValue::BoolValue(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBoolValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BoolValue.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.BoolValue) } BoolValue::BoolValue(const BoolValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_ = from.value_; // @@protoc_insertion_point(copy_constructor:google.protobuf.BoolValue) @@ -1992,7 +1890,6 @@ BoolValue::BoolValue(const BoolValue& from) void BoolValue::SharedCtor() { value_ = false; - _cached_size_ = 0; } BoolValue::~BoolValue() { @@ -2011,9 +1908,7 @@ void BoolValue::ArenaDtor(void* object) { void BoolValue::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void BoolValue::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* BoolValue::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -2021,7 +1916,7 @@ const ::google::protobuf::Descriptor* BoolValue::descriptor() { } const BoolValue& BoolValue::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBoolValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BoolValue.base); return *internal_default_instance(); } @@ -2042,7 +1937,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -2133,9 +2028,7 @@ size_t BoolValue::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -2207,7 +2100,6 @@ void BoolValue::InternalSwap(BoolValue* other) { using std::swap; swap(value_, other->value_); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata BoolValue::GetMetadata() const { @@ -2226,24 +2118,22 @@ const int StringValue::kValueFieldNumber; StringValue::StringValue() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsStringValue(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_StringValue.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.StringValue) } StringValue::StringValue(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsStringValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_StringValue.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.StringValue) } StringValue::StringValue(const StringValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.value().size() > 0) { @@ -2255,7 +2145,6 @@ StringValue::StringValue(const StringValue& from) void StringValue::SharedCtor() { value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - _cached_size_ = 0; } StringValue::~StringValue() { @@ -2275,9 +2164,7 @@ void StringValue::ArenaDtor(void* object) { void StringValue::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void StringValue::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* StringValue::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -2285,7 +2172,7 @@ const ::google::protobuf::Descriptor* StringValue::descriptor() { } const StringValue& StringValue::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsStringValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_StringValue.base); return *internal_default_instance(); } @@ -2306,7 +2193,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -2412,9 +2299,7 @@ size_t StringValue::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -2484,9 +2369,9 @@ void StringValue::UnsafeArenaSwap(StringValue* other) { } void StringValue::InternalSwap(StringValue* other) { using std::swap; - value_.Swap(&other->value_); + value_.Swap(&other->value_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata StringValue::GetMetadata() const { @@ -2505,24 +2390,22 @@ const int BytesValue::kValueFieldNumber; BytesValue::BytesValue() : ::google::protobuf::Message(), _internal_metadata_(NULL) { - if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBytesValue(); - } + ::google::protobuf::internal::InitSCC( + &protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BytesValue.base); SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.BytesValue) } BytesValue::BytesValue(::google::protobuf::Arena* arena) : ::google::protobuf::Message(), _internal_metadata_(arena) { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBytesValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BytesValue.base); SharedCtor(); RegisterArenaDtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.BytesValue) } BytesValue::BytesValue(const BytesValue& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL), - _cached_size_(0) { + _internal_metadata_(NULL) { _internal_metadata_.MergeFrom(from._internal_metadata_); value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.value().size() > 0) { @@ -2534,7 +2417,6 @@ BytesValue::BytesValue(const BytesValue& from) void BytesValue::SharedCtor() { value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - _cached_size_ = 0; } BytesValue::~BytesValue() { @@ -2554,9 +2436,7 @@ void BytesValue::ArenaDtor(void* object) { void BytesValue::RegisterArenaDtor(::google::protobuf::Arena* arena) { } void BytesValue::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + _cached_size_.Set(size); } const ::google::protobuf::Descriptor* BytesValue::descriptor() { ::protobuf_google_2fprotobuf_2fwrappers_2eproto::protobuf_AssignDescriptorsOnce(); @@ -2564,7 +2444,7 @@ const ::google::protobuf::Descriptor* BytesValue::descriptor() { } const BytesValue& BytesValue::default_instance() { - ::protobuf_google_2fprotobuf_2fwrappers_2eproto::InitDefaultsBytesValue(); + ::google::protobuf::internal::InitSCC(&protobuf_google_2fprotobuf_2fwrappers_2eproto::scc_info_BytesValue.base); return *internal_default_instance(); } @@ -2585,7 +2465,7 @@ 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->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { @@ -2679,9 +2559,7 @@ size_t BytesValue::ByteSizeLong() const { } int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = cached_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); + SetCachedSize(cached_size); return total_size; } @@ -2751,9 +2629,9 @@ void BytesValue::UnsafeArenaSwap(BytesValue* other) { } void BytesValue::InternalSwap(BytesValue* other) { using std::swap; - value_.Swap(&other->value_); + value_.Swap(&other->value_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), + GetArenaNoVirtual()); _internal_metadata_.Swap(&other->_internal_metadata_); - swap(_cached_size_, other->_cached_size_); } ::google::protobuf::Metadata BytesValue::GetMetadata() const { @@ -2767,31 +2645,31 @@ void BytesValue::InternalSwap(BytesValue* other) { } // namespace google namespace google { namespace protobuf { -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::DoubleValue* Arena::CreateMessage< ::google::protobuf::DoubleValue >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::DoubleValue* Arena::CreateMaybeMessage< ::google::protobuf::DoubleValue >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::DoubleValue >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::FloatValue* Arena::CreateMessage< ::google::protobuf::FloatValue >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::FloatValue* Arena::CreateMaybeMessage< ::google::protobuf::FloatValue >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::FloatValue >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::Int64Value* Arena::CreateMessage< ::google::protobuf::Int64Value >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::Int64Value* Arena::CreateMaybeMessage< ::google::protobuf::Int64Value >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::Int64Value >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::UInt64Value* Arena::CreateMessage< ::google::protobuf::UInt64Value >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::UInt64Value* Arena::CreateMaybeMessage< ::google::protobuf::UInt64Value >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::UInt64Value >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::Int32Value* Arena::CreateMessage< ::google::protobuf::Int32Value >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::Int32Value* Arena::CreateMaybeMessage< ::google::protobuf::Int32Value >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::Int32Value >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::UInt32Value* Arena::CreateMessage< ::google::protobuf::UInt32Value >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::UInt32Value* Arena::CreateMaybeMessage< ::google::protobuf::UInt32Value >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::UInt32Value >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::BoolValue* Arena::CreateMessage< ::google::protobuf::BoolValue >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::BoolValue* Arena::CreateMaybeMessage< ::google::protobuf::BoolValue >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::BoolValue >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::StringValue* Arena::CreateMessage< ::google::protobuf::StringValue >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::StringValue* Arena::CreateMaybeMessage< ::google::protobuf::StringValue >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::StringValue >(arena); } -template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::BytesValue* Arena::CreateMessage< ::google::protobuf::BytesValue >(Arena* arena) { +template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::google::protobuf::BytesValue* Arena::CreateMaybeMessage< ::google::protobuf::BytesValue >(Arena* arena) { return Arena::CreateMessageInternal< ::google::protobuf::BytesValue >(arena); } } // namespace protobuf |