diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
| commit | 09354db1434859a31a3c81abebcc4018d42f2715 (patch) | |
| tree | b87c7cdc2255e6c8062ab92b4082665cd698d753 /src/google/protobuf/stubs/common.h | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
Merge from Google internal for 3.4 release
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 60874e09..79d615df 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -200,7 +200,8 @@ namespace internal { // Register a function to be called when ShutdownProtocolBuffers() is called. LIBPROTOBUF_EXPORT void OnShutdown(void (*func)()); - +// Destroy the string (call string destructor) +LIBPROTOBUF_EXPORT void OnShutdownDestroyString(const std::string* ptr); } // namespace internal #if PROTOBUF_USE_EXCEPTIONS |