diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
| commit | afe96b6d4235b9d9fbfce2465f5c6d82c2611f48 (patch) | |
| tree | d509cb3cc3f2b25b58a75563758d2092103ca19a /src/google/protobuf/map_entry_lite.h | |
| parent | 0400cca3236de1ca303af38bf81eab332d042b7c (diff) | |
| parent | 89b5333ad0f10058d5af62701c5ebea0db376c5b (diff) | |
Merge branch 'master' into down-integrate
Diffstat (limited to 'src/google/protobuf/map_entry_lite.h')
| -rw-r--r-- | src/google/protobuf/map_entry_lite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index aa8ff390..85a0bed7 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -355,9 +355,9 @@ class MapEntryImpl : public Base { // We could use memcmp here, but we don't bother. The tag is one byte. GOOGLE_COMPILE_ASSERT(kTagSize == 1, tag_size_error); if (size > 0 && *reinterpret_cast<const char*>(data) == kValueTag) { - typename Map::size_type size = map_->size(); + typename Map::size_type map_size = map_->size(); value_ptr_ = &(*map_)[key_]; - if (GOOGLE_PREDICT_TRUE(size != map_->size())) { + if (GOOGLE_PREDICT_TRUE(map_size != map_->size())) { // We created a new key-value pair. Fill in the value. typedef typename MapIf<ValueTypeHandler::kIsEnum, int*, Value*>::type T; |