diff options
| author | Adam Cozzette <acozzette@google.com> | 2017-09-12 10:32:01 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-09-14 10:03:57 -0700 |
| commit | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (patch) | |
| tree | c219e7eb18b82523e36c6748861c403a14ea66ae /src/google/protobuf/map_test.cc | |
| parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) | |
| download | protobuf-13fd045dbb2b4dacea32be162a41d5a4b0d1802f.tar.gz protobuf-13fd045dbb2b4dacea32be162a41d5a4b0d1802f.tar.bz2 protobuf-13fd045dbb2b4dacea32be162a41d5a4b0d1802f.zip | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/map_test.cc')
| -rw-r--r-- | src/google/protobuf/map_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index 960589ce..cea193c8 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -130,7 +130,7 @@ class MapImplTest : public ::testing::Test { EXPECT_EQ(value, map_.at(key)); Map<int32, int32>::iterator it = map_.find(key); - // interator dereferenceable + // iterator dereferenceable EXPECT_EQ(key, (*it).first); EXPECT_EQ(value, (*it).second); EXPECT_EQ(key, it->first); @@ -158,7 +158,7 @@ class MapImplTest : public ::testing::Test { EXPECT_EQ(value, const_map_.at(key)); Map<int32, int32>::const_iterator const_it = const_map_.find(key); - // interator dereferenceable + // iterator dereferenceable EXPECT_EQ(key, (*const_it).first); EXPECT_EQ(value, (*const_it).second); EXPECT_EQ(key, const_it->first); @@ -558,7 +558,7 @@ TEST_F(MapImplTest, IteratorInvalidation) { #endif std::set<int> s; int n = kMaxSizeToTest; - int frog = k1 + n; + unsigned int frog = k1 + n; while (n > 1 && s.size() < 25) { s.insert(n); n = static_cast<int>(n * 100 / (101.0 + (frog & 63))); |