Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto-generate files after cl/583379506

Browse Source
pull/14792/head
Protobuf Team Bot 1 year ago
parent 33811d1227
commit d7dccd5d3f
18 changed files with 100 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/google/protobuf/any.pb.cc
  2. 5
      src/google/protobuf/any.pb.h
  3. 6
      src/google/protobuf/api.pb.cc
  4. 15
      src/google/protobuf/api.pb.h
  5. 2
      src/google/protobuf/duration.pb.cc
  6. 5
      src/google/protobuf/duration.pb.h
  7. 2
      src/google/protobuf/field_mask.pb.cc
  8. 5
      src/google/protobuf/field_mask.pb.h
  9. 2
      src/google/protobuf/source_context.pb.cc
  10. 5
      src/google/protobuf/source_context.pb.h
  11. 6
      src/google/protobuf/struct.pb.cc
  12. 15
      src/google/protobuf/struct.pb.h
  13. 2
      src/google/protobuf/timestamp.pb.cc
  14. 5
      src/google/protobuf/timestamp.pb.h
  15. 10
      src/google/protobuf/type.pb.cc
  16. 25
      src/google/protobuf/type.pb.h
  17. 18
      src/google/protobuf/wrappers.pb.cc
  18. 45
      src/google/protobuf/wrappers.pb.h

2
src/google/protobuf/any.pb.cc
Unescape View File

@ -322,7 +322,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 36, 2> Any::_table_ = {
}
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)

5
src/google/protobuf/any.pb.h
Unescape View File

@ -201,8 +201,9 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message
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;

6
src/google/protobuf/api.pb.cc
Unescape View File

@ -568,7 +568,7 @@ const ::_pbi::TcParseTable<3, 7, 4, 39, 2> Api::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<3, 7, 1, 68, 2> Method::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<1, 2, 0, 38, 2> Mixin::_table_ = {
}
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)

15
src/google/protobuf/api.pb.h
Unescape View File

@ -161,8 +161,9 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message
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;

2
src/google/protobuf/duration.pb.cc
Unescape View File

@ -284,7 +284,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Duration::_table_ = {
}
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)

5
src/google/protobuf/duration.pb.h
Unescape View File

@ -153,8 +153,9 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message
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;

2
src/google/protobuf/field_mask.pb.cc
Unescape View File

@ -273,7 +273,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 39, 2> FieldMask::_table_ = {
}
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)

5
src/google/protobuf/field_mask.pb.h
Unescape View File

@ -153,8 +153,9 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message
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;

2
src/google/protobuf/source_context.pb.cc
Unescape View File

@ -276,7 +276,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 47, 2> SourceContext::_table_ = {
}
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)

5
src/google/protobuf/source_context.pb.h
Unescape View File

@ -153,8 +153,9 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message
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;

6
src/google/protobuf/struct.pb.cc
Unescape View File

@ -416,7 +416,7 @@ const ::_pbi::TcParseTable<0, 1, 2, 37, 2> Struct::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 6, 2, 42, 2> Value::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListValue::_table_ = {
}
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)

15
src/google/protobuf/struct.pb.h
Unescape View File

@ -198,8 +198,9 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message
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;

2
src/google/protobuf/timestamp.pb.cc
Unescape View File

@ -284,7 +284,7 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Timestamp::_table_ = {
}
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)

5
src/google/protobuf/timestamp.pb.h
Unescape View File

@ -153,8 +153,9 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message
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;

10
src/google/protobuf/type.pb.cc
Unescape View File

@ -748,7 +748,7 @@ const ::_pbi::TcParseTable<3, 7, 3, 46, 2> Type::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<4, 10, 1, 72, 2> Field::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<3, 6, 3, 40, 2> Enum::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<2, 3, 1, 38, 2> EnumValue::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<1, 2, 1, 35, 2> Option::_table_ = {
}
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();

25
src/google/protobuf/type.pb.h
Unescape View File

@ -287,8 +287,9 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Field final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT EnumValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Type final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Enum final : public ::google::protobuf::Message
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;

18
src/google/protobuf/wrappers.pb.cc
Unescape View File

@ -515,7 +515,7 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> DoubleValue::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> FloatValue::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Int64Value::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UInt64Value::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Int32Value::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UInt32Value::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> BoolValue::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 41, 2> StringValue::_table_ = {
}
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 @@ const ::_pbi::TcParseTable<0, 1, 0, 0, 2> BytesValue::_table_ = {
}
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)

45
src/google/protobuf/wrappers.pb.h
Unescape View File

@ -177,8 +177,9 @@ class PROTOBUF_EXPORT UInt64Value final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT UInt32Value final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT StringValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Int64Value final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT Int32Value final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT FloatValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT DoubleValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT BytesValue final : public ::google::protobuf::Message
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 @@ class PROTOBUF_EXPORT BoolValue final : public ::google::protobuf::Message
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;

Write Preview
Loading…
Cancel
Save