Index: third_party/protobuf/src/google/protobuf/any.pb.cc |
diff --git a/third_party/protobuf/src/google/protobuf/any.pb.cc b/third_party/protobuf/src/google/protobuf/any.pb.cc |
index fbde4a6d77730c1dfe860a057f5cc512783d8ed7..e73ebffdeb863dffff7d56c7023a9a57240ac741 100644 |
--- a/third_party/protobuf/src/google/protobuf/any.pb.cc |
+++ b/third_party/protobuf/src/google/protobuf/any.pb.cc |
@@ -19,81 +19,98 @@ |
namespace google { |
namespace protobuf { |
+class AnyDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed<Any> {}; |
+AnyDefaultTypeInternal _Any_default_instance_; |
namespace { |
-const ::google::protobuf::Descriptor* Any_descriptor_ = NULL; |
-const ::google::protobuf::internal::GeneratedMessageReflection* |
- Any_reflection_ = NULL; |
+::google::protobuf::Metadata file_level_metadata[1]; |
} // namespace |
-void protobuf_AssignDesc_google_2fprotobuf_2fany_2eproto() { |
- protobuf_AddDesc_google_2fprotobuf_2fany_2eproto(); |
- const ::google::protobuf::FileDescriptor* file = |
- ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( |
- "google/protobuf/any.proto"); |
- GOOGLE_CHECK(file != NULL); |
- Any_descriptor_ = file->message_type(0); |
- static const int Any_offsets_[2] = { |
+const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fany_2eproto() GOOGLE_ATTRIBUTE_COLD; |
+const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fany_2eproto() { |
+ static const ::google::protobuf::uint32 offsets[] = { |
+ ~0u, // no _has_bits_ |
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Any, _internal_metadata_), |
+ ~0u, // no _extensions_ |
+ ~0u, // no _oneof_case_ |
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Any, type_url_), |
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Any, value_), |
}; |
- Any_reflection_ = |
- ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( |
- Any_descriptor_, |
- Any::default_instance_, |
- Any_offsets_, |
- -1, |
- -1, |
- -1, |
- sizeof(Any), |
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Any, _internal_metadata_), |
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Any, _is_default_instance_)); |
+ return offsets; |
} |
+static const ::google::protobuf::internal::MigrationSchema schemas[] = { |
+ { 0, -1, sizeof(Any)}, |
+}; |
+ |
+static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = { |
+ {reinterpret_cast<const ::google::protobuf::Message*>(&_Any_default_instance_), NULL}, |
+}; |
+ |
namespace { |
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); |
-inline void protobuf_AssignDescriptorsOnce() { |
- ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, |
- &protobuf_AssignDesc_google_2fprotobuf_2fany_2eproto); |
+void protobuf_AssignDescriptors() { |
+ protobuf_AddDesc_google_2fprotobuf_2fany_2eproto(); |
+ ::google::protobuf::MessageFactory* factory = NULL; |
+ AssignDescriptors( |
+ "google/protobuf/any.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fany_2eproto(), factory, |
+ file_level_metadata, NULL, NULL); |
+} |
+ |
+void protobuf_AssignDescriptorsOnce() { |
+ static GOOGLE_PROTOBUF_DECLARE_ONCE(once); |
+ ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors); |
} |
+void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD; |
void protobuf_RegisterTypes(const ::std::string&) { |
protobuf_AssignDescriptorsOnce(); |
- ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( |
- Any_descriptor_, &Any::default_instance()); |
+ ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1); |
} |
} // namespace |
void protobuf_ShutdownFile_google_2fprotobuf_2fany_2eproto() { |
- delete Any::default_instance_; |
- delete Any_reflection_; |
+ _Any_default_instance_.Shutdown(); |
+ delete file_level_metadata[0].reflection; |
} |
-void protobuf_AddDesc_google_2fprotobuf_2fany_2eproto() { |
- static bool already_here = false; |
- if (already_here) return; |
- already_here = true; |
+void protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto_impl() { |
GOOGLE_PROTOBUF_VERIFY_VERSION; |
+ ::google::protobuf::internal::InitProtobufDefaults(); |
+ _Any_default_instance_.DefaultConstruct(); |
+} |
+ |
+void protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto() { |
+ static GOOGLE_PROTOBUF_DECLARE_ONCE(once); |
+ ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto_impl); |
+} |
+void protobuf_AddDesc_google_2fprotobuf_2fany_2eproto_impl() { |
+ protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto(); |
+ static const char descriptor[] = { |
+ "\n\031google/protobuf/any.proto\022\017google.prot" |
+ "obuf\"&\n\003Any\022\020\n\010type_url\030\001 \001(\t\022\r\n\005value\030\002" |
+ " \001(\014Bo\n\023com.google.protobufB\010AnyProtoP\001Z" |
+ "%github.com/golang/protobuf/ptypes/any\242\002" |
+ "\003GPB\252\002\036Google.Protobuf.WellKnownTypesb\006p" |
+ "roto3" |
+ }; |
::google::protobuf::DescriptorPool::InternalAddGeneratedFile( |
- "\n\031google/protobuf/any.proto\022\017google.prot" |
- "obuf\"&\n\003Any\022\020\n\010type_url\030\001 \001(\t\022\r\n\005value\030\002" |
- " \001(\014Br\n\023com.google.protobufB\010AnyProtoP\001Z" |
- "%github.com/golang/protobuf/ptypes/any\240\001" |
- "\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypes" |
- "b\006proto3", 208); |
+ descriptor, 205); |
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( |
"google/protobuf/any.proto", &protobuf_RegisterTypes); |
- Any::default_instance_ = new Any(); |
- Any::default_instance_->InitAsDefaultInstance(); |
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fany_2eproto); |
} |
+GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fany_2eproto_once_); |
+void protobuf_AddDesc_google_2fprotobuf_2fany_2eproto() { |
+ ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fany_2eproto_once_, |
+ &protobuf_AddDesc_google_2fprotobuf_2fany_2eproto_impl); |
+} |
// Force AddDescriptors() to be called at static initialization time. |
struct StaticDescriptorInitializer_google_2fprotobuf_2fany_2eproto { |
StaticDescriptorInitializer_google_2fprotobuf_2fany_2eproto() { |
@@ -101,16 +118,6 @@ struct StaticDescriptorInitializer_google_2fprotobuf_2fany_2eproto { |
} |
} static_descriptor_initializer_google_2fprotobuf_2fany_2eproto_; |
-namespace { |
- |
-static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD; |
-static void MergeFromFail(int line) { |
- GOOGLE_CHECK(false) << __FILE__ << ":" << line; |
-} |
- |
-} // namespace |
- |
- |
// =================================================================== |
void Any::PackFrom(const ::google::protobuf::Message& message) { |
@@ -133,29 +140,33 @@ const int Any::kValueFieldNumber; |
Any::Any() |
: ::google::protobuf::Message(), _internal_metadata_(NULL), _any_metadata_(&type_url_, &value_) { |
+ if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { |
+ protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto(); |
+ } |
SharedCtor(); |
// @@protoc_insertion_point(constructor:google.protobuf.Any) |
} |
- |
-void Any::InitAsDefaultInstance() { |
- _is_default_instance_ = true; |
-} |
- |
Any::Any(const Any& from) |
: ::google::protobuf::Message(), |
- _internal_metadata_(NULL), |
- _any_metadata_(&type_url_, &value_) { |
- SharedCtor(); |
- MergeFrom(from); |
+ _internal_metadata_(NULL), |
+ _cached_size_(0), |
+ _any_metadata_(&type_url_, &value_) { |
+ _internal_metadata_.MergeFrom(from._internal_metadata_); |
+ type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ if (from.type_url().size() > 0) { |
+ type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_url_); |
+ } |
+ value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ if (from.value().size() > 0) { |
+ value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.value_); |
+ } |
// @@protoc_insertion_point(copy_constructor:google.protobuf.Any) |
} |
void Any::SharedCtor() { |
- _is_default_instance_ = false; |
- ::google::protobuf::internal::GetEmptyString(); |
- _cached_size_ = 0; |
type_url_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ _cached_size_ = 0; |
} |
Any::~Any() { |
@@ -166,8 +177,6 @@ Any::~Any() { |
void Any::SharedDtor() { |
type_url_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
- if (this != default_instance_) { |
- } |
} |
void Any::SetCachedSize(int size) const { |
@@ -177,16 +186,14 @@ void Any::SetCachedSize(int size) const { |
} |
const ::google::protobuf::Descriptor* Any::descriptor() { |
protobuf_AssignDescriptorsOnce(); |
- return Any_descriptor_; |
+ return file_level_metadata[0].descriptor; |
} |
const Any& Any::default_instance() { |
- if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fany_2eproto(); |
- return *default_instance_; |
+ protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto(); |
+ return *internal_default_instance(); |
} |
-Any* Any::default_instance_ = NULL; |
- |
Any* Any::New(::google::protobuf::Arena* arena) const { |
Any* n = new Any; |
if (arena != NULL) { |
@@ -207,13 +214,13 @@ bool Any::MergePartialFromCodedStream( |
::google::protobuf::uint32 tag; |
// @@protoc_insertion_point(parse_start:google.protobuf.Any) |
for (;;) { |
- ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); |
+ ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); |
tag = p.first; |
if (!p.second) goto handle_unusual; |
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { |
- // optional string type_url = 1; |
+ // string type_url = 1; |
case 1: { |
- if (tag == 10) { |
+ if (tag == 10u) { |
DO_(::google::protobuf::internal::WireFormatLite::ReadString( |
input, this->mutable_type_url())); |
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( |
@@ -223,20 +230,17 @@ bool Any::MergePartialFromCodedStream( |
} else { |
goto handle_unusual; |
} |
- if (input->ExpectTag(18)) goto parse_value; |
break; |
} |
- // optional bytes value = 2; |
+ // bytes value = 2; |
case 2: { |
- if (tag == 18) { |
- parse_value: |
+ if (tag == 18u) { |
DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( |
input, this->mutable_value())); |
} else { |
goto handle_unusual; |
} |
- if (input->ExpectAtEnd()) goto success; |
break; |
} |
@@ -264,7 +268,7 @@ failure: |
void Any::SerializeWithCachedSizes( |
::google::protobuf::io::CodedOutputStream* output) const { |
// @@protoc_insertion_point(serialize_start:google.protobuf.Any) |
- // optional string type_url = 1; |
+ // string type_url = 1; |
if (this->type_url().size() > 0) { |
::google::protobuf::internal::WireFormatLite::VerifyUtf8String( |
this->type_url().data(), this->type_url().length(), |
@@ -274,7 +278,7 @@ void Any::SerializeWithCachedSizes( |
1, this->type_url(), output); |
} |
- // optional bytes value = 2; |
+ // bytes value = 2; |
if (this->value().size() > 0) { |
::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( |
2, this->value(), output); |
@@ -283,10 +287,11 @@ void Any::SerializeWithCachedSizes( |
// @@protoc_insertion_point(serialize_end:google.protobuf.Any) |
} |
-::google::protobuf::uint8* Any::SerializeWithCachedSizesToArray( |
- ::google::protobuf::uint8* target) const { |
+::google::protobuf::uint8* Any::InternalSerializeWithCachedSizesToArray( |
+ bool deterministic, ::google::protobuf::uint8* target) const { |
+ (void)deterministic; // Unused |
// @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any) |
- // optional string type_url = 1; |
+ // string type_url = 1; |
if (this->type_url().size() > 0) { |
::google::protobuf::internal::WireFormatLite::VerifyUtf8String( |
this->type_url().data(), this->type_url().length(), |
@@ -297,7 +302,7 @@ void Any::SerializeWithCachedSizes( |
1, this->type_url(), target); |
} |
- // optional bytes value = 2; |
+ // bytes value = 2; |
if (this->value().size() > 0) { |
target = |
::google::protobuf::internal::WireFormatLite::WriteBytesToArray( |
@@ -308,34 +313,35 @@ void Any::SerializeWithCachedSizes( |
return target; |
} |
-int Any::ByteSize() const { |
+size_t Any::ByteSizeLong() const { |
// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Any) |
- int total_size = 0; |
+ size_t total_size = 0; |
- // optional string type_url = 1; |
+ // string type_url = 1; |
if (this->type_url().size() > 0) { |
total_size += 1 + |
::google::protobuf::internal::WireFormatLite::StringSize( |
this->type_url()); |
} |
- // optional bytes value = 2; |
+ // bytes value = 2; |
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_ = total_size; |
+ _cached_size_ = cached_size; |
GOOGLE_SAFE_CONCURRENT_WRITES_END(); |
return total_size; |
} |
void Any::MergeFrom(const ::google::protobuf::Message& from) { |
// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Any) |
- if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
- const Any* source = |
+ GOOGLE_DCHECK_NE(&from, this); |
+ const Any* source = |
::google::protobuf::internal::DynamicCastToGenerated<const Any>( |
&from); |
if (source == NULL) { |
@@ -349,7 +355,8 @@ void Any::MergeFrom(const ::google::protobuf::Message& from) { |
void Any::MergeFrom(const Any& from) { |
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Any) |
- if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
+ GOOGLE_DCHECK_NE(&from, this); |
+ _internal_metadata_.MergeFrom(from._internal_metadata_); |
if (from.type_url().size() > 0) { |
type_url_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_url_); |
@@ -375,7 +382,6 @@ void Any::CopyFrom(const Any& from) { |
} |
bool Any::IsInitialized() const { |
- |
return true; |
} |
@@ -386,56 +392,52 @@ void Any::Swap(Any* other) { |
void Any::InternalSwap(Any* other) { |
type_url_.Swap(&other->type_url_); |
value_.Swap(&other->value_); |
- _internal_metadata_.Swap(&other->_internal_metadata_); |
std::swap(_cached_size_, other->_cached_size_); |
} |
::google::protobuf::Metadata Any::GetMetadata() const { |
protobuf_AssignDescriptorsOnce(); |
- ::google::protobuf::Metadata metadata; |
- metadata.descriptor = Any_descriptor_; |
- metadata.reflection = Any_reflection_; |
- return metadata; |
+ return file_level_metadata[0]; |
} |
#if PROTOBUF_INLINE_NOT_IN_HEADERS |
// Any |
-// optional string type_url = 1; |
+// string type_url = 1; |
void Any::clear_type_url() { |
type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- const ::std::string& Any::type_url() const { |
+const ::std::string& Any::type_url() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Any.type_url) |
- return type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return type_url_.GetNoArena(); |
} |
- void Any::set_type_url(const ::std::string& value) { |
+void Any::set_type_url(const ::std::string& value) { |
type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Any.type_url) |
} |
- void Any::set_type_url(const char* value) { |
+void Any::set_type_url(const char* value) { |
type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Any.type_url) |
} |
- void Any::set_type_url(const char* value, size_t size) { |
+void Any::set_type_url(const char* value, size_t size) { |
type_url_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Any.type_url) |
} |
- ::std::string* Any::mutable_type_url() { |
+::std::string* Any::mutable_type_url() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Any.type_url) |
return type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- ::std::string* Any::release_type_url() { |
+::std::string* Any::release_type_url() { |
// @@protoc_insertion_point(field_release:google.protobuf.Any.type_url) |
return type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- void Any::set_allocated_type_url(::std::string* type_url) { |
+void Any::set_allocated_type_url(::std::string* type_url) { |
if (type_url != NULL) { |
} else { |
@@ -445,41 +447,41 @@ void Any::clear_type_url() { |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.type_url) |
} |
-// optional bytes value = 2; |
+// bytes value = 2; |
void Any::clear_value() { |
value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- const ::std::string& Any::value() const { |
+const ::std::string& Any::value() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Any.value) |
- return value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return value_.GetNoArena(); |
} |
- void Any::set_value(const ::std::string& value) { |
+void Any::set_value(const ::std::string& value) { |
value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); |
// @@protoc_insertion_point(field_set:google.protobuf.Any.value) |
} |
- void Any::set_value(const char* value) { |
+void Any::set_value(const char* value) { |
value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); |
// @@protoc_insertion_point(field_set_char:google.protobuf.Any.value) |
} |
- void Any::set_value(const void* value, size_t size) { |
+void Any::set_value(const void* value, size_t size) { |
value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), |
::std::string(reinterpret_cast<const char*>(value), size)); |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.Any.value) |
} |
- ::std::string* Any::mutable_value() { |
+::std::string* Any::mutable_value() { |
// @@protoc_insertion_point(field_mutable:google.protobuf.Any.value) |
return value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- ::std::string* Any::release_value() { |
+::std::string* Any::release_value() { |
// @@protoc_insertion_point(field_release:google.protobuf.Any.value) |
return value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
- void Any::set_allocated_value(::std::string* value) { |
+void Any::set_allocated_value(::std::string* value) { |
if (value != NULL) { |
} else { |