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 0bf523b3759c5edcca64a358e991b56bf1c1ebf0..fbde4a6d77730c1dfe860a057f5cc512783d8ed7 100644 |
--- a/third_party/protobuf/src/google/protobuf/any.pb.cc |
+++ b/third_party/protobuf/src/google/protobuf/any.pb.cc |
@@ -83,9 +83,10 @@ void protobuf_AddDesc_google_2fprotobuf_2fany_2eproto() { |
::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(\014BK\n\023com.google.protobufB\010AnyProtoP\001\240" |
- "\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownType" |
- "sb\006proto3", 169); |
+ " \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); |
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( |
"google/protobuf/any.proto", &protobuf_RegisterTypes); |
Any::default_instance_ = new Any(); |
@@ -116,6 +117,11 @@ void Any::PackFrom(const ::google::protobuf::Message& message) { |
_any_metadata_.PackFrom(message); |
} |
+void Any::PackFrom(const ::google::protobuf::Message& message, |
+ const ::std::string& type_url_prefix) { |
+ _any_metadata_.PackFrom(message, type_url_prefix); |
+} |
+ |
bool Any::UnpackTo(::google::protobuf::Message* message) const { |
return _any_metadata_.UnpackTo(message); |
} |
@@ -190,13 +196,14 @@ Any* Any::New(::google::protobuf::Arena* arena) const { |
} |
void Any::Clear() { |
+// @@protoc_insertion_point(message_clear_start:google.protobuf.Any) |
type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
bool Any::MergePartialFromCodedStream( |
::google::protobuf::io::CodedInputStream* input) { |
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure |
+#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure |
::google::protobuf::uint32 tag; |
// @@protoc_insertion_point(parse_start:google.protobuf.Any) |
for (;;) { |
@@ -302,6 +309,7 @@ void Any::SerializeWithCachedSizes( |
} |
int Any::ByteSize() const { |
+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Any) |
int total_size = 0; |
// optional string type_url = 1; |
@@ -325,18 +333,22 @@ int Any::ByteSize() const { |
} |
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::protobuf::internal::DynamicCastToGenerated<const Any>( |
&from); |
if (source == NULL) { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.Any) |
::google::protobuf::internal::ReflectionOps::Merge(from, this); |
} else { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.Any) |
MergeFrom(*source); |
} |
} |
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__); |
if (from.type_url().size() > 0) { |
@@ -349,12 +361,14 @@ void Any::MergeFrom(const Any& from) { |
} |
void Any::CopyFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.Any) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
} |
void Any::CopyFrom(const Any& from) { |
+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Any) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
@@ -417,6 +431,7 @@ void Any::clear_type_url() { |
return type_url_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* Any::release_type_url() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.Any.type_url) |
return type_url_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -460,6 +475,7 @@ void Any::clear_value() { |
return value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* Any::release_value() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.Any.value) |
return value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |