Avoid exit-time destructors.

operator[]() was recently changed to use the existing code in order to correctly align the returned pointer; however this broke -Wexit-time-destructors. Change to a method that is still correctly aligned but does not generate a destructor.
northerntechie · May 19, 2022 · 4695953 · 4695953
1 parent 0390b1a
commit 4695953
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
@@ -1230,13 +1230,18 @@ class GenericValue {
         else {
             RAPIDJSON_ASSERT(false);    // see above note
 
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
             // This will generate -Wexit-time-destructors in clang
             // static GenericValue NullValue;
             // return NullValue;
 
             // Use static buffer and placement-new to prevent destruction
             alignas(GenericValue) static char buffer[sizeof(GenericValue)];
             return *new (buffer) GenericValue();
+#else
+            static GenericValue buffer;
+            return *new (reinterpret_cast<char *>(&buffer)) GenericValue();
+#endif
         }
     }
     template <typename SourceAllocator>