diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-07-10 14:17:11 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-10 14:17:11 -0700 |
| commit | 237938ac6ae07d732e1147073ab3569379c313a5 (patch) | |
| tree | c4dc04a677dfaf685f2d27fd4e9dd16d9ce15f86 | |
| parent | 5b0331615366faeadb49243db7025ff0634d317c (diff) | |
| parent | a3f0973979546aba6accf5737e20c91148c10bd4 (diff) | |
Merge pull request #4888 from chronoxor/master
OnShutdownDelete shadowing issue
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |