From e670b670328561aa7b3754ee0c023085949378a8 Mon Sep 17 00:00:00 2001
From: Antoni Buszta <antoni@buszta.info>
Date: Thu, 9 Oct 2014 07:15:44 +0200
Subject: DestroyDefaultRepeatedFields is registered using OnShutdown.

---
 src/google/protobuf/extension_set.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/google/protobuf/extension_set.cc')

diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
index f4786392..274554b5 100644
--- 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();
-  }
-  ~StaticDefaultRepeatedFieldsInitializer() {
-    DestroyDefaultRepeatedFields();
+    OnShutdown(&DestroyDefaultRepeatedFields);
   }
 } static_repeated_fields_initializer;
 
-- 
cgit v1.2.3