Removing files that were added during rebasing
diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in
index 3e9418c..ad630af 100644
--- a/cmake/extract_includes.bat.in
+++ b/cmake/extract_includes.bat.in
@@ -51,9 +51,6 @@
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_table_driven.h" include\google\protobuf\generated_message_table_driven.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_decl.h" include\google\protobuf\generated_message_tctable_decl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.h" include\google\protobuf\generated_message_tctable_impl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.inc" include\google\protobuf\generated_message_tctable_impl.inc
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\implicit_weak_message.h" include\google\protobuf\implicit_weak_message.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 735e3b8..66f8665 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,9 +100,6 @@
google/protobuf/generated_enum_util.h \
google/protobuf/generated_message_reflection.h \
google/protobuf/generated_message_table_driven.h \
- google/protobuf/generated_message_tctable_decl.h \
- google/protobuf/generated_message_tctable_impl.h \
- google/protobuf/generated_message_tctable_impl.inc \
google/protobuf/generated_message_util.h \
google/protobuf/has_bits.h \
google/protobuf/implicit_weak_message.h \
@@ -892,9 +889,7 @@
no_warning_test.cc:
echo "// Generated from Makefile.am" > no_warning_test.cc
for FILE in $(nobase_include_HEADERS); do \
- if [[ $$FILE != *.inc ]]; then \
- echo "#include <$${FILE}>" >> no_warning_test.cc; \
- fi \
+ echo "#include <$${FILE}>" >> no_warning_test.cc; \
done
echo "int main(int, char**) { return 0; }" >> no_warning_test.cc
diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc
index cd04ce0..b4c013a 100644
--- a/src/google/protobuf/generated_message_reflection_unittest.cc
+++ b/src/google/protobuf/generated_message_reflection_unittest.cc
@@ -353,46 +353,6 @@
TestUtil::ExpectOneofSet1(message2);
}
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsOneof) {
- Arena arena;
- auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
- auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
- TestUtil::SetOneof1(message1);
-
- std::vector<const FieldDescriptor*> fields;
- const Descriptor* descriptor = message1->GetDescriptor();
- for (int i = 0; i < descriptor->field_count(); i++) {
- fields.push_back(descriptor->field(i));
- }
- GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
- message1, message2, fields);
-
- TestUtil::ExpectOneofClear(*message1);
- TestUtil::ExpectOneofSet1(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest,
- UnsafeShallowSwapFieldsOneofExpectShallow) {
- Arena arena;
- auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
- auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
- TestUtil::SetOneof1(message1);
- message1->mutable_foo_message()->set_qux_int(1000);
- auto* kept_foo_ptr = message1->mutable_foo_message();
-
- std::vector<const FieldDescriptor*> fields;
- const Descriptor* descriptor = message1->GetDescriptor();
- for (int i = 0; i < descriptor->field_count(); i++) {
- fields.push_back(descriptor->field(i));
- }
- GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
- message1, message2, fields);
-
- EXPECT_TRUE(message2->has_foo_message());
- EXPECT_EQ(message2->foo_message().qux_int(), 1000);
- EXPECT_EQ(kept_foo_ptr, message2->mutable_foo_message());
-}
-
TEST(GeneratedMessageReflectionTest, RemoveLast) {
unittest::TestAllTypes message;
TestUtil::ReflectionTester reflection_tester(
