diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-02-20 14:49:34 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-20 14:49:34 -0800 |
| commit | 177108aa8a6e6a0e947c90308f6ebb3d1203bb0c (patch) | |
| tree | 8cfb084c34346b46dd1678c607e3b09249372ed1 /src | |
| parent | 0475607fd632e2532c3e88fcb37ace2e146da6cc (diff) | |
| parent | af3813cd7337c622df067914cfa22732c08d6067 (diff) | |
Merge pull request #4323 from dtapuska/master
Rename a shadowed variable.
Diffstat (limited to 'src')
| -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 dc6ec917..bbfb9c15 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -354,9 +354,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; |