diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /src/google/protobuf/extension_set_unittest.cc | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/extension_set_unittest.cc')
| -rw-r--r-- | src/google/protobuf/extension_set_unittest.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc index f3346c88..af398546 100644 --- a/src/google/protobuf/extension_set_unittest.cc +++ b/src/google/protobuf/extension_set_unittest.cc @@ -1051,10 +1051,14 @@ TEST(ExtensionSetTest, RepeatedFields) { enum_const_iter; RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator enum_const_end; - for (enum_const_iter = message.GetRepeatedExtension( - unittest::repeated_nested_enum_extension).begin(), - enum_const_end = message.GetRepeatedExtension( - unittest::repeated_nested_enum_extension).end(); + for (enum_const_iter = + message + .GetRepeatedExtension(unittest::repeated_nested_enum_extension) + .begin(), + enum_const_end = + message + .GetRepeatedExtension(unittest::repeated_nested_enum_extension) + .end(); enum_const_iter != enum_const_end; ++enum_const_iter) { ASSERT_EQ(*enum_const_iter, unittest::TestAllTypes::NestedEnum_MAX); } @@ -1271,7 +1275,7 @@ TEST(ExtensionSetTest, DynamicExtensions) { const Message& sub_message = message.GetReflection()->GetMessage(message, message_extension); const unittest::ForeignMessage* typed_sub_message = -#if GOOGLE_PROTOBUF_RTTI +#if PROTOBUF_RTTI dynamic_cast<const unittest::ForeignMessage*>(&sub_message); #else static_cast<const unittest::ForeignMessage*>(&sub_message); |