Auto-generate files after cl/563434532
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index eeea527..8e6d150 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -305,11 +305,11 @@
}
const ::google::protobuf::Message::ClassData Any::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Any::MergeImpl
+ Any::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Any::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Any::GetClassData() const {
+ return &_class_data_;
+}
void Any::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Any*>(&to_msg);
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index c764978..c244f60 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -560,11 +560,11 @@
}
const ::google::protobuf::Message::ClassData Api::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Api::MergeImpl
+ Api::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Api::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Api::GetClassData() const {
+ return &_class_data_;
+}
void Api::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Api*>(&to_msg);
@@ -927,11 +927,11 @@
}
const ::google::protobuf::Message::ClassData Method::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Method::MergeImpl
+ Method::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Method::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Method::GetClassData() const {
+ return &_class_data_;
+}
void Method::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Method*>(&to_msg);
@@ -1170,11 +1170,11 @@
}
const ::google::protobuf::Message::ClassData Mixin::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Mixin::MergeImpl
+ Mixin::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Mixin::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Mixin::GetClassData() const {
+ return &_class_data_;
+}
void Mixin::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Mixin*>(&to_msg);
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
index 921c961..d1d38e4 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -267,11 +267,11 @@
}
const ::google::protobuf::Message::ClassData Duration::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Duration::MergeImpl
+ Duration::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Duration::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Duration::GetClassData() const {
+ return &_class_data_;
+}
void Duration::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Duration*>(&to_msg);
diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc
index 39c69d1..f561752 100644
--- a/src/google/protobuf/empty.pb.cc
+++ b/src/google/protobuf/empty.pb.cc
@@ -131,13 +131,6 @@
-const ::google::protobuf::Message::ClassData Empty::_class_data_ = {
- ::google::protobuf::internal::ZeroFieldsBase::CopyImpl,
- ::google::protobuf::internal::ZeroFieldsBase::MergeImpl,
-};
-const ::google::protobuf::Message::ClassData*Empty::GetClassData() const { return &_class_data_; }
-
-
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index 8240913..2cf02dc 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -177,9 +177,6 @@
explicit Empty(::google::protobuf::Arena* arena);
public:
- static const ClassData _class_data_;
- const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
::google::protobuf::Metadata GetMetadata() const final;
// nested types ----------------------------------------------------
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index d539f8d..7db49df 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -256,11 +256,11 @@
}
const ::google::protobuf::Message::ClassData FieldMask::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- FieldMask::MergeImpl
+ FieldMask::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*FieldMask::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* FieldMask::GetClassData() const {
+ return &_class_data_;
+}
void FieldMask::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<FieldMask*>(&to_msg);
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index 664d697..908f8ab 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -259,11 +259,11 @@
}
const ::google::protobuf::Message::ClassData SourceContext::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- SourceContext::MergeImpl
+ SourceContext::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*SourceContext::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* SourceContext::GetClassData() const {
+ return &_class_data_;
+}
void SourceContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<SourceContext*>(&to_msg);
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 0787274..23a500e 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -402,11 +402,11 @@
}
const ::google::protobuf::Message::ClassData Struct::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Struct::MergeImpl
+ Struct::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Struct::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Struct::GetClassData() const {
+ return &_class_data_;
+}
void Struct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Struct*>(&to_msg);
@@ -773,11 +773,11 @@
}
const ::google::protobuf::Message::ClassData Value::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Value::MergeImpl
+ Value::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Value::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Value::GetClassData() const {
+ return &_class_data_;
+}
void Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Value*>(&to_msg);
@@ -985,11 +985,11 @@
}
const ::google::protobuf::Message::ClassData ListValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- ListValue::MergeImpl
+ ListValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*ListValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* ListValue::GetClassData() const {
+ return &_class_data_;
+}
void ListValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<ListValue*>(&to_msg);
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index e8913e0..8a9736f 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -267,11 +267,11 @@
}
const ::google::protobuf::Message::ClassData Timestamp::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Timestamp::MergeImpl
+ Timestamp::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Timestamp::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Timestamp::GetClassData() const {
+ return &_class_data_;
+}
void Timestamp::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Timestamp*>(&to_msg);
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 2576aaa..d8d1ee4 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -740,11 +740,11 @@
}
const ::google::protobuf::Message::ClassData Type::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Type::MergeImpl
+ Type::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Type::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Type::GetClassData() const {
+ return &_class_data_;
+}
void Type::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Type*>(&to_msg);
@@ -1171,11 +1171,11 @@
}
const ::google::protobuf::Message::ClassData Field::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Field::MergeImpl
+ Field::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Field::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Field::GetClassData() const {
+ return &_class_data_;
+}
void Field::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Field*>(&to_msg);
@@ -1551,11 +1551,11 @@
}
const ::google::protobuf::Message::ClassData Enum::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Enum::MergeImpl
+ Enum::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Enum::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Enum::GetClassData() const {
+ return &_class_data_;
+}
void Enum::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Enum*>(&to_msg);
@@ -1812,11 +1812,11 @@
}
const ::google::protobuf::Message::ClassData EnumValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- EnumValue::MergeImpl
+ EnumValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*EnumValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* EnumValue::GetClassData() const {
+ return &_class_data_;
+}
void EnumValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<EnumValue*>(&to_msg);
@@ -2059,11 +2059,11 @@
}
const ::google::protobuf::Message::ClassData Option::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Option::MergeImpl
+ Option::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Option::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Option::GetClassData() const {
+ return &_class_data_;
+}
void Option::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Option*>(&to_msg);
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc
index 2c97c95..3dc4bb0 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -498,11 +498,11 @@
}
const ::google::protobuf::Message::ClassData DoubleValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- DoubleValue::MergeImpl
+ DoubleValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*DoubleValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* DoubleValue::GetClassData() const {
+ return &_class_data_;
+}
void DoubleValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<DoubleValue*>(&to_msg);
@@ -681,11 +681,11 @@
}
const ::google::protobuf::Message::ClassData FloatValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- FloatValue::MergeImpl
+ FloatValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*FloatValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* FloatValue::GetClassData() const {
+ return &_class_data_;
+}
void FloatValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<FloatValue*>(&to_msg);
@@ -855,11 +855,11 @@
}
const ::google::protobuf::Message::ClassData Int64Value::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Int64Value::MergeImpl
+ Int64Value::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Int64Value::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Int64Value::GetClassData() const {
+ return &_class_data_;
+}
void Int64Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Int64Value*>(&to_msg);
@@ -1024,11 +1024,11 @@
}
const ::google::protobuf::Message::ClassData UInt64Value::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- UInt64Value::MergeImpl
+ UInt64Value::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*UInt64Value::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* UInt64Value::GetClassData() const {
+ return &_class_data_;
+}
void UInt64Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<UInt64Value*>(&to_msg);
@@ -1193,11 +1193,11 @@
}
const ::google::protobuf::Message::ClassData Int32Value::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- Int32Value::MergeImpl
+ Int32Value::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*Int32Value::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* Int32Value::GetClassData() const {
+ return &_class_data_;
+}
void Int32Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<Int32Value*>(&to_msg);
@@ -1362,11 +1362,11 @@
}
const ::google::protobuf::Message::ClassData UInt32Value::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- UInt32Value::MergeImpl
+ UInt32Value::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*UInt32Value::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* UInt32Value::GetClassData() const {
+ return &_class_data_;
+}
void UInt32Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<UInt32Value*>(&to_msg);
@@ -1530,11 +1530,11 @@
}
const ::google::protobuf::Message::ClassData BoolValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- BoolValue::MergeImpl
+ BoolValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*BoolValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* BoolValue::GetClassData() const {
+ return &_class_data_;
+}
void BoolValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<BoolValue*>(&to_msg);
@@ -1717,11 +1717,11 @@
}
const ::google::protobuf::Message::ClassData StringValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- StringValue::MergeImpl
+ StringValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*StringValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* StringValue::GetClassData() const {
+ return &_class_data_;
+}
void StringValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<StringValue*>(&to_msg);
@@ -1902,11 +1902,11 @@
}
const ::google::protobuf::Message::ClassData BytesValue::_class_data_ = {
- ::google::protobuf::Message::CopyWithSourceCheck,
- BytesValue::MergeImpl
+ BytesValue::MergeImpl,
};
-const ::google::protobuf::Message::ClassData*BytesValue::GetClassData() const { return &_class_data_; }
-
+const ::google::protobuf::Message::ClassData* BytesValue::GetClassData() const {
+ return &_class_data_;
+}
void BytesValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
auto* const _this = static_cast<BytesValue*>(&to_msg);
