Index: third_party/protobuf/src/google/protobuf/duration.pb.cc |
diff --git a/third_party/protobuf/src/google/protobuf/duration.pb.cc b/third_party/protobuf/src/google/protobuf/duration.pb.cc |
index b325944e7b7a233417a3f8ea300fd71a34e99bab..e3639346dd94e61d9a15e811a4379b7f15b5e00a 100644 |
--- a/third_party/protobuf/src/google/protobuf/duration.pb.cc |
+++ b/third_party/protobuf/src/google/protobuf/duration.pb.cc |
@@ -83,9 +83,10 @@ void protobuf_AddDesc_google_2fprotobuf_2fduration_2eproto() { |
::google::protobuf::DescriptorPool::InternalAddGeneratedFile( |
"\n\036google/protobuf/duration.proto\022\017google" |
".protobuf\"*\n\010Duration\022\017\n\007seconds\030\001 \001(\003\022\r" |
- "\n\005nanos\030\002 \001(\005BP\n\023com.google.protobufB\rDu" |
- "rationProtoP\001\240\001\001\242\002\003GPB\252\002\036Google.Protobuf" |
- ".WellKnownTypesb\006proto3", 183); |
+ "\n\005nanos\030\002 \001(\005B|\n\023com.google.protobufB\rDu" |
+ "rationProtoP\001Z*github.com/golang/protobu" |
+ "f/ptypes/duration\240\001\001\242\002\003GPB\252\002\036Google.Prot" |
+ "obuf.WellKnownTypesb\006proto3", 227); |
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( |
"google/protobuf/duration.proto", &protobuf_RegisterTypes); |
Duration::default_instance_ = new Duration(); |
@@ -178,8 +179,17 @@ Duration* Duration::New(::google::protobuf::Arena* arena) const { |
} |
void Duration::Clear() { |
+// @@protoc_insertion_point(message_clear_start:google.protobuf.Duration) |
+#if defined(__clang__) |
+#define ZR_HELPER_(f) \ |
+ _Pragma("clang diagnostic push") \ |
+ _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ |
+ __builtin_offsetof(Duration, f) \ |
+ _Pragma("clang diagnostic pop") |
+#else |
#define ZR_HELPER_(f) reinterpret_cast<char*>(\ |
&reinterpret_cast<Duration*>(16)->f) |
+#endif |
#define ZR_(first, last) do {\ |
::memset(&first, 0,\ |
@@ -195,7 +205,7 @@ void Duration::Clear() { |
bool Duration::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.Duration) |
for (;;) { |
@@ -287,6 +297,7 @@ void Duration::SerializeWithCachedSizes( |
} |
int Duration::ByteSize() const { |
+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Duration) |
int total_size = 0; |
// optional int64 seconds = 1; |
@@ -310,18 +321,22 @@ int Duration::ByteSize() const { |
} |
void Duration::MergeFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.Duration) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
const Duration* source = |
::google::protobuf::internal::DynamicCastToGenerated<const Duration>( |
&from); |
if (source == NULL) { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.Duration) |
::google::protobuf::internal::ReflectionOps::Merge(from, this); |
} else { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.Duration) |
MergeFrom(*source); |
} |
} |
void Duration::MergeFrom(const Duration& from) { |
+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Duration) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
if (from.seconds() != 0) { |
set_seconds(from.seconds()); |
@@ -332,12 +347,14 @@ void Duration::MergeFrom(const Duration& from) { |
} |
void Duration::CopyFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.Duration) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
} |
void Duration::CopyFrom(const Duration& from) { |
+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Duration) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |