Auto-generate files after cl/583379506
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index 48db0e7..ae66b38 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -322,7 +322,7 @@
}
-void Any::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Any::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Any*>(&to_msg);
auto& from = static_cast<const Any&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Any)
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index ef06857..e8a4ec0 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -201,8 +201,9 @@
void MergeFrom(const Any& from) { Any::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index 460dfd9..d783b73 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -568,7 +568,7 @@
}
-void Api::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Api::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Api*>(&to_msg);
auto& from = static_cast<const Api&>(from_msg);
::google::protobuf::Arena* arena = _this->GetArena();
@@ -946,7 +946,7 @@
}
-void Method::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Method::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Method*>(&to_msg);
auto& from = static_cast<const Method&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Method)
@@ -1191,7 +1191,7 @@
}
-void Mixin::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Mixin::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Mixin*>(&to_msg);
auto& from = static_cast<const Mixin&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Mixin)
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 45813ba..11e938b 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -161,8 +161,9 @@
void MergeFrom(const Mixin& from) { Mixin::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -349,8 +350,9 @@
void MergeFrom(const Method& from) { Method::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -611,8 +613,9 @@
void MergeFrom(const Api& from) { Api::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
index bdbcf29..5a862c5 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -284,7 +284,7 @@
}
-void Duration::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Duration::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Duration*>(&to_msg);
auto& from = static_cast<const Duration&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Duration)
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index f638a4f..3ef4b39 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -153,8 +153,9 @@
void MergeFrom(const Duration& from) { Duration::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index 6d7a385..571b59e 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -273,7 +273,7 @@
}
-void FieldMask::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void FieldMask::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<FieldMask*>(&to_msg);
auto& from = static_cast<const FieldMask&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldMask)
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 3f75308..1df7e4f 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -153,8 +153,9 @@
void MergeFrom(const FieldMask& from) { FieldMask::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index d49b059..a9b8fc4 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -276,7 +276,7 @@
}
-void SourceContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void SourceContext::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<SourceContext*>(&to_msg);
auto& from = static_cast<const SourceContext&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceContext)
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 76b1540..69caa86 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -153,8 +153,9 @@
void MergeFrom(const SourceContext& from) { SourceContext::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 4ccbcee..7722918 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -416,7 +416,7 @@
}
-void Struct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Struct::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Struct*>(&to_msg);
auto& from = static_cast<const Struct&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Struct)
@@ -778,7 +778,7 @@
}
-void Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Value*>(&to_msg);
auto& from = static_cast<const Value&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Value)
@@ -995,7 +995,7 @@
}
-void ListValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void ListValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<ListValue*>(&to_msg);
auto& from = static_cast<const ListValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ListValue)
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 3bb79b7..a056311 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -198,8 +198,9 @@
void MergeFrom(const ListValue& from) { ListValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -370,8 +371,9 @@
void MergeFrom(const Struct& from) { Struct::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -579,8 +581,9 @@
void MergeFrom(const Value& from) { Value::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index a0b7ee9..24fe5a7 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -284,7 +284,7 @@
}
-void Timestamp::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Timestamp::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Timestamp*>(&to_msg);
auto& from = static_cast<const Timestamp&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Timestamp)
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index c9c6783..24e8bf8 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -153,8 +153,9 @@
void MergeFrom(const Timestamp& from) { Timestamp::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 1493efa..336f7b6 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -748,7 +748,7 @@
}
-void Type::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Type::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Type*>(&to_msg);
auto& from = static_cast<const Type&>(from_msg);
::google::protobuf::Arena* arena = _this->GetArena();
@@ -1190,7 +1190,7 @@
}
-void Field::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Field::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Field*>(&to_msg);
auto& from = static_cast<const Field&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Field)
@@ -1562,7 +1562,7 @@
}
-void Enum::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Enum::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Enum*>(&to_msg);
auto& from = static_cast<const Enum&>(from_msg);
::google::protobuf::Arena* arena = _this->GetArena();
@@ -1834,7 +1834,7 @@
}
-void EnumValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void EnumValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<EnumValue*>(&to_msg);
auto& from = static_cast<const EnumValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValue)
@@ -2076,7 +2076,7 @@
}
-void Option::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Option::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Option*>(&to_msg);
auto& from = static_cast<const Option&>(from_msg);
::google::protobuf::Arena* arena = _this->GetArena();
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index c322c70..a7de6df 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -287,8 +287,9 @@
void MergeFrom(const Option& from) { Option::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -475,8 +476,9 @@
void MergeFrom(const Field& from) { Field::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -836,8 +838,9 @@
void MergeFrom(const EnumValue& from) { EnumValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1038,8 +1041,9 @@
void MergeFrom(const Type& from) { Type::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1326,8 +1330,9 @@
void MergeFrom(const Enum& from) { Enum::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index 260f930..8cacb3f 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -515,7 +515,7 @@
}
-void DoubleValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void DoubleValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<DoubleValue*>(&to_msg);
auto& from = static_cast<const DoubleValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DoubleValue)
@@ -703,7 +703,7 @@
}
-void FloatValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void FloatValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<FloatValue*>(&to_msg);
auto& from = static_cast<const FloatValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FloatValue)
@@ -882,7 +882,7 @@
}
-void Int64Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Int64Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Int64Value*>(&to_msg);
auto& from = static_cast<const Int64Value&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int64Value)
@@ -1056,7 +1056,7 @@
}
-void UInt64Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void UInt64Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<UInt64Value*>(&to_msg);
auto& from = static_cast<const UInt64Value&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt64Value)
@@ -1230,7 +1230,7 @@
}
-void Int32Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void Int32Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<Int32Value*>(&to_msg);
auto& from = static_cast<const Int32Value&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int32Value)
@@ -1404,7 +1404,7 @@
}
-void UInt32Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void UInt32Value::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<UInt32Value*>(&to_msg);
auto& from = static_cast<const UInt32Value&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt32Value)
@@ -1577,7 +1577,7 @@
}
-void BoolValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void BoolValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<BoolValue*>(&to_msg);
auto& from = static_cast<const BoolValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BoolValue)
@@ -1769,7 +1769,7 @@
}
-void StringValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void StringValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<StringValue*>(&to_msg);
auto& from = static_cast<const StringValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.StringValue)
@@ -1958,7 +1958,7 @@
}
-void BytesValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
+void BytesValue::MergeImpl(::google::protobuf::MessageLite& to_msg, const ::google::protobuf::MessageLite& from_msg) {
auto* const _this = static_cast<BytesValue*>(&to_msg);
auto& from = static_cast<const BytesValue&>(from_msg);
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BytesValue)
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index e7172c6..c62b675 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -177,8 +177,9 @@
void MergeFrom(const UInt64Value& from) { UInt64Value::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -341,8 +342,9 @@
void MergeFrom(const UInt32Value& from) { UInt32Value::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -505,8 +507,9 @@
void MergeFrom(const StringValue& from) { StringValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -675,8 +678,9 @@
void MergeFrom(const Int64Value& from) { Int64Value::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -839,8 +843,9 @@
void MergeFrom(const Int32Value& from) { Int32Value::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1003,8 +1008,9 @@
void MergeFrom(const FloatValue& from) { FloatValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1167,8 +1173,9 @@
void MergeFrom(const DoubleValue& from) { DoubleValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1331,8 +1338,9 @@
void MergeFrom(const BytesValue& from) { BytesValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
@@ -1501,8 +1509,9 @@
void MergeFrom(const BoolValue& from) { BoolValue::MergeImpl(*this, from); }
private:
- static void MergeImpl(::google::protobuf::Message& to_msg,
- const ::google::protobuf::Message& from_msg);
+ static void MergeImpl(
+ ::google::protobuf::MessageLite& to_msg,
+ const ::google::protobuf::MessageLite& from_msg);
public:
ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
