From a3f0973979546aba6accf5737e20c91148c10bd4 Mon Sep 17 00:00:00 2001
From: Ivan Shynkarenka <chronoxor@gmail.com>
Date: Tue, 10 Jul 2018 13:19:51 +0300
Subject: OnShutdownDelete shadowing issue
 https://github.com/google/protobuf/issues/4887

---
 src/google/protobuf/stubs/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index f505f46a..c5256d32 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -206,7 +206,7 @@ LIBPROTOBUF_EXPORT void OnShutdownRun(void (*f)(const void*), const void* arg);
 
 template <typename T>
 T* OnShutdownDelete(T* p) {
-  OnShutdownRun([](const void* p) { delete static_cast<const T*>(p); }, p);
+  OnShutdownRun([](const void* pp) { delete static_cast<const T*>(pp); }, p);
   return p;
 }
 
-- 
cgit v1.2.3