From 7a69001868a32d80166cc9510379c980de4abaa4 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 19 Feb 2016 12:59:05 +0000 Subject: [PATCH] #51 Use static StringFlagDestructor to destruct string objects allocated by placement new --- src/gflags.h.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/gflags.h.in b/src/gflags.h.in index 0324d39..88ab1aa 100644 --- a/src/gflags.h.in +++ b/src/gflags.h.in @@ -538,6 +538,26 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot, } inline clstring* dont_pass0toDEFINE_string(char *stringspot, int value); + +// Auxiliary class used to explicitly call destructor of string objects +// allocated using placement new during static program deinitialization. +// The destructor MUST be an inline function such that the explicit +// destruction occurs in the same compilation unit as the placement new. +class StringFlagDestructor { + void *current_storage_; + void *defvalue_storage_; + +public: + + StringFlagDestructor(void *current, void *defvalue) + : current_storage_(current), defvalue_storage_(defvalue) {} + + ~StringFlagDestructor() { + reinterpret_cast(current_storage_ )->~clstring(); + reinterpret_cast(defvalue_storage_)->~clstring(); + } +}; + } // namespace fLS // We need to define a var named FLAGS_no##name so people don't define @@ -557,6 +577,7 @@ inline clstring* dont_pass0toDEFINE_string(char *stringspot, static GFLAGS_NAMESPACE::FlagRegisterer o_##name( \ #name, "string", MAYBE_STRIPPED_HELP(txt), __FILE__, \ s_##name[0].s, new (s_##name[1].s) clstring(*FLAGS_no##name)); \ + static StringFlagDestructor d_##name(s_##name[0].s, s_##name[1].s); \ extern GFLAGS_DLL_DEFINE_FLAG clstring& FLAGS_##name; \ using fLS::FLAGS_##name; \ clstring& FLAGS_##name = *FLAGS_no##name; \ -- 2.7.4