diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-07-24 14:59:27 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-24 14:59:27 -0700 |
| commit | 72cc5a6eb3975bbe3bc8454f053835d9e46dbcb5 (patch) | |
| tree | c04e02e5fe58c1db617a6b8eb0bf6e2b69f55d96 /src/google/protobuf/stubs/common.h | |
| parent | 942a29cecd36f2a4b22fdd2179635cd548e6bd27 (diff) | |
| parent | dd091aad48423f3a047977e6662f0201194b9bfc (diff) | |
Merge pull request #3393 from pherl/3.4.x
Create 3.4.x branch
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 19d59843..f32fd228 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 |