Make string_container static init more resilient

Author: reuk

src/util/string_container.cpp

@@ -13,8 +13,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <cstring>
 
-string_containert string_container;
-
 string_ptrt::string_ptrt(const char *_s):s(_s), len(strlen(_s))
 {
 }
@@ -87,3 +85,10 @@ unsigned string_containert::get(const std::string &s)
 
   return r;
 }
+
+/// Get a reference to the global string container.
+string_containert &get_string_container()
+{
+  static string_containert ret;
+  return ret;
+}

src/util/string_container.h

@@ -89,7 +89,6 @@ class string_containert
   string_vectort string_vector;
 };
 
-// an ugly global object
-extern string_containert string_container;
+string_containert &get_string_container();
 
 #endif // CPROVER_UTIL_STRING_CONTAINER_H