diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-09 16:55:29 -0700 |
| commit | 8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994 (patch) | |
| tree | b94d99ad1a1cd15a7c636b2453b293bb0b095789 /src | |
| parent | a4862e790ec34a902b322e22e92acc049b63941d (diff) | |
| parent | fe80059c8d5d78f73b9b3bd0f6276c7b05a3f574 (diff) | |
| download | protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.tar.gz protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.tar.bz2 protobuf-8e4fd1b4e8a1b29faefaff1ce794b7a2f607d994.zip | |
Merge remote-tracking branch 'google/master' into integration_baseintegration_base
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/extension_set_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc index 28fabef7..f3346c88 100644 --- a/src/google/protobuf/extension_set_unittest.cc +++ b/src/google/protobuf/extension_set_unittest.cc @@ -1055,7 +1055,7 @@ TEST(ExtensionSetTest, RepeatedFields) { unittest::repeated_nested_enum_extension).begin(), enum_const_end = message.GetRepeatedExtension( unittest::repeated_nested_enum_extension).end(); - enum_iter != enum_end; ++enum_iter) { + enum_const_iter != enum_const_end; ++enum_const_iter) { ASSERT_EQ(*enum_const_iter, unittest::TestAllTypes::NestedEnum_MAX); } |