DestroyDefaultRepeatedFields is registered using OnShutdown.

e670b670 · Antoni Buszta · e83ba13a · e670b670
Commit e670b670 authored Oct 09, 2014 by Antoni Buszta
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

extension_set.cc src/google/protobuf/extension_set.cc +1 -3

No files found.
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@@ -1621,9 +1621,7 @@ PROTOBUF_DEFINE_DEFAULT_REPEATED(bool)
 struct StaticDefaultRepeatedFieldsInitializer {
  StaticDefaultRepeatedFieldsInitializer() {
    InitializeDefaultRepeatedFields();
-  }
+    OnShutdown(&DestroyDefaultRepeatedFields);
-  ~StaticDefaultRepeatedFieldsInitializer() {
-    DestroyDefaultRepeatedFields();
  }
 } static_repeated_fields_initializer;