32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From af3813cd7337c622df067914cfa22732c08d6067 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Tapuska <dtapuska@chromium.org>
|
||
|
|
Date: Tue, 20 Feb 2018 17:16:33 -0500
|
||
|
|
Subject: [PATCH 2/2] Rename a shadowed variable.
|
||
|
|
|
||
|
|
Shadowed variables can cause readability issues. Ensure a shadowed
|
||
|
|
variable isn't used in header files which may be used in a dependent
|
||
|
|
project that explicitly disables them.
|
||
|
|
---
|
||
|
|
src/google/protobuf/map_entry_lite.h | 4 ++--
|
||
|
|
1 file 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;
|
||
|
|
--
|
||
|
|
2.16.1.291.g4437f3f132-goog
|
||
|
|
|