diff options
| author | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 23:16:07 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 23:16:07 +0000 |
| commit | 0c995c930067241b40b10b0b01504c784cade03e (patch) | |
| tree | f0c249e6b3d8f1d3a1259823776fff112dcbc323 | |
| parent | 2bee6e66e841dc4af52b5bf5681d8ad02c3f0ae3 (diff) | |
| download | protobuf-0c995c930067241b40b10b0b01504c784cade03e.tar.gz protobuf-0c995c930067241b40b10b0b01504c784cade03e.tar.bz2 protobuf-0c995c930067241b40b10b0b01504c784cade03e.zip | |
Remove undeeded no-rtti guards.
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_unittest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index 12b80a3c..1eae29b5 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -381,9 +381,6 @@ TEST(GeneratedMessageTest, StringCharStarLength) { EXPECT_EQ("wx", message.repeated_string(0)); } - -#if !defined(PROTOBUF_TEST_NO_DESCRIPTORS) || \ - !defined(GOOGLE_PROTOBUF_NO_RTTI) TEST(GeneratedMessageTest, CopyFrom) { unittest::TestAllTypes message1, message2; @@ -395,7 +392,6 @@ TEST(GeneratedMessageTest, CopyFrom) { message2.CopyFrom(message2); TestUtil::ExpectAllFieldsSet(message2); } -#endif TEST(GeneratedMessageTest, SwapWithEmpty) { unittest::TestAllTypes message1, message2; @@ -535,8 +531,6 @@ TEST(GeneratedMessageTest, DynamicMessageCopyFrom) { #endif // !PROTOBUF_TEST_NO_DESCRIPTORS -#if !defined(PROTOBUF_TEST_NO_DESCRIPTORS) || \ - !defined(GOOGLE_PROTOBUF_NO_RTTI) TEST(GeneratedMessageTest, NonEmptyMergeFrom) { // Test merging with a non-empty message. Code is a modified form // of that found in google/protobuf/reflection_ops_unittest.cc. @@ -563,6 +557,8 @@ TEST(GeneratedMessageTest, NonEmptyMergeFrom) { TestUtil::ExpectAllFieldsSet(message1); } +#if !defined(PROTOBUF_TEST_NO_DESCRIPTORS) || \ + !defined(GOOGLE_PROTOBUF_NO_RTTI) #ifdef PROTOBUF_HAS_DEATH_TEST TEST(GeneratedMessageTest, MergeFromSelf) { |