Index: third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc b/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc |
index a2da8eee3837a1d6bae5eb9864c75342bc2afdb3..e9d50a1dcd1c5893fa66b79d3e1a08ecffaf86a1 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc |
@@ -240,6 +240,7 @@ CodeGeneratorRequest* CodeGeneratorRequest::New(::google::protobuf::Arena* arena |
} |
void CodeGeneratorRequest::Clear() { |
+// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorRequest) |
if (has_parameter()) { |
parameter_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -253,7 +254,7 @@ void CodeGeneratorRequest::Clear() { |
bool CodeGeneratorRequest::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.compiler.CodeGeneratorRequest) |
for (;;) { |
@@ -412,6 +413,7 @@ void CodeGeneratorRequest::SerializeWithCachedSizes( |
} |
int CodeGeneratorRequest::ByteSize() const { |
+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorRequest) |
int total_size = 0; |
// optional string parameter = 2; |
@@ -448,18 +450,22 @@ int CodeGeneratorRequest::ByteSize() const { |
} |
void CodeGeneratorRequest::MergeFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.compiler.CodeGeneratorRequest) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
const CodeGeneratorRequest* source = |
::google::protobuf::internal::DynamicCastToGenerated<const CodeGeneratorRequest>( |
&from); |
if (source == NULL) { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.compiler.CodeGeneratorRequest) |
::google::protobuf::internal::ReflectionOps::Merge(from, this); |
} else { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.compiler.CodeGeneratorRequest) |
MergeFrom(*source); |
} |
} |
void CodeGeneratorRequest::MergeFrom(const CodeGeneratorRequest& from) { |
+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorRequest) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
file_to_generate_.MergeFrom(from.file_to_generate_); |
proto_file_.MergeFrom(from.proto_file_); |
@@ -475,12 +481,14 @@ void CodeGeneratorRequest::MergeFrom(const CodeGeneratorRequest& from) { |
} |
void CodeGeneratorRequest::CopyFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.compiler.CodeGeneratorRequest) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
} |
void CodeGeneratorRequest::CopyFrom(const CodeGeneratorRequest& from) { |
+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorRequest) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
@@ -545,6 +553,7 @@ void CodeGeneratorRequest::clear_file_to_generate() { |
// @@protoc_insertion_point(field_set_pointer:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate) |
} |
::std::string* CodeGeneratorRequest::add_file_to_generate() { |
+ // @@protoc_insertion_point(field_add_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate) |
return file_to_generate_.Add(); |
} |
void CodeGeneratorRequest::add_file_to_generate(const ::std::string& value) { |
@@ -610,6 +619,7 @@ void CodeGeneratorRequest::clear_parameter() { |
return parameter_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* CodeGeneratorRequest::release_parameter() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.parameter) |
clear_has_parameter(); |
return parameter_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -728,6 +738,7 @@ CodeGeneratorResponse_File* CodeGeneratorResponse_File::New(::google::protobuf:: |
} |
void CodeGeneratorResponse_File::Clear() { |
+// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
if (_has_bits_[0 / 32] & 7u) { |
if (has_name()) { |
name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
@@ -747,7 +758,7 @@ void CodeGeneratorResponse_File::Clear() { |
bool CodeGeneratorResponse_File::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.compiler.CodeGeneratorResponse.File) |
for (;;) { |
@@ -912,6 +923,7 @@ void CodeGeneratorResponse_File::SerializeWithCachedSizes( |
} |
int CodeGeneratorResponse_File::ByteSize() const { |
+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
int total_size = 0; |
if (_has_bits_[0 / 32] & 7u) { |
@@ -949,18 +961,22 @@ int CodeGeneratorResponse_File::ByteSize() const { |
} |
void CodeGeneratorResponse_File::MergeFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
const CodeGeneratorResponse_File* source = |
::google::protobuf::internal::DynamicCastToGenerated<const CodeGeneratorResponse_File>( |
&from); |
if (source == NULL) { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.compiler.CodeGeneratorResponse.File) |
::google::protobuf::internal::ReflectionOps::Merge(from, this); |
} else { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.compiler.CodeGeneratorResponse.File) |
MergeFrom(*source); |
} |
} |
void CodeGeneratorResponse_File::MergeFrom(const CodeGeneratorResponse_File& from) { |
+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { |
if (from.has_name()) { |
@@ -982,12 +998,14 @@ void CodeGeneratorResponse_File::MergeFrom(const CodeGeneratorResponse_File& fro |
} |
void CodeGeneratorResponse_File::CopyFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
} |
void CodeGeneratorResponse_File::CopyFrom(const CodeGeneratorResponse_File& from) { |
+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse.File) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
@@ -1088,6 +1106,7 @@ CodeGeneratorResponse* CodeGeneratorResponse::New(::google::protobuf::Arena* are |
} |
void CodeGeneratorResponse::Clear() { |
+// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse) |
if (has_error()) { |
error_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -1100,7 +1119,7 @@ void CodeGeneratorResponse::Clear() { |
bool CodeGeneratorResponse::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.compiler.CodeGeneratorResponse) |
for (;;) { |
@@ -1219,6 +1238,7 @@ void CodeGeneratorResponse::SerializeWithCachedSizes( |
} |
int CodeGeneratorResponse::ByteSize() const { |
+// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorResponse) |
int total_size = 0; |
// optional string error = 1; |
@@ -1248,18 +1268,22 @@ int CodeGeneratorResponse::ByteSize() const { |
} |
void CodeGeneratorResponse::MergeFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
const CodeGeneratorResponse* source = |
::google::protobuf::internal::DynamicCastToGenerated<const CodeGeneratorResponse>( |
&from); |
if (source == NULL) { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.compiler.CodeGeneratorResponse) |
::google::protobuf::internal::ReflectionOps::Merge(from, this); |
} else { |
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.compiler.CodeGeneratorResponse) |
MergeFrom(*source); |
} |
} |
void CodeGeneratorResponse::MergeFrom(const CodeGeneratorResponse& from) { |
+// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse) |
if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); |
file_.MergeFrom(from.file_); |
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { |
@@ -1274,12 +1298,14 @@ void CodeGeneratorResponse::MergeFrom(const CodeGeneratorResponse& from) { |
} |
void CodeGeneratorResponse::CopyFrom(const ::google::protobuf::Message& from) { |
+// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
} |
void CodeGeneratorResponse::CopyFrom(const CodeGeneratorResponse& from) { |
+// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse) |
if (&from == this) return; |
Clear(); |
MergeFrom(from); |
@@ -1353,6 +1379,7 @@ void CodeGeneratorResponse_File::clear_name() { |
return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* CodeGeneratorResponse_File::release_name() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.name) |
clear_has_name(); |
return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -1406,6 +1433,7 @@ void CodeGeneratorResponse_File::clear_insertion_point() { |
return insertion_point_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* CodeGeneratorResponse_File::release_insertion_point() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point) |
clear_has_insertion_point(); |
return insertion_point_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -1459,6 +1487,7 @@ void CodeGeneratorResponse_File::clear_content() { |
return content_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* CodeGeneratorResponse_File::release_content() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.content) |
clear_has_content(); |
return content_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
@@ -1516,6 +1545,7 @@ void CodeGeneratorResponse::clear_error() { |
return error_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
::std::string* CodeGeneratorResponse::release_error() { |
+ // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.error) |
clear_has_error(); |
return error_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |