Fix up uses of string_container

Author: reuk

src/util/dstring.h

@@ -46,13 +46,13 @@ class dstringt final
 
   // this one is not safe for static objects
   // NOLINTNEXTLINE(runtime/explicit)
-  dstringt(const char *s):no(string_container[s])
+  dstringt(const char *s):no(get_string_container()[s])
   {
   }
 
   // this one is not safe for static objects
   // NOLINTNEXTLINE(runtime/explicit)
-  dstringt(const std::string &s):no(string_container[s])
+  dstringt(const std::string &s):no(get_string_container()[s])
   {
   }
 
@@ -152,12 +152,12 @@ class dstringt final
 
   // the reference returned is guaranteed to be stable
   const std::string &as_string() const
-  { return string_container.get_string(no); }
+  { return get_string_container().get_string(no); }
 };
 
 // the reference returned is guaranteed to be stable
 inline const std::string &as_string(const dstringt &s)
-{ return string_container.get_string(s.get_no()); }
+{ return get_string_container().get_string(s.get_no()); }
 
 // NOLINTNEXTLINE(readability/identifiers)
 struct dstring_hash

src/util/irep_ids.cpp

@@ -49,8 +49,7 @@ void initialize_string_container()
 
   for(unsigned i=0; irep_ids_table[i]!=nullptr; i++)
   {
-    unsigned x;
-    x=string_container[irep_ids_table[i]];
+    unsigned x=get_string_container()[irep_ids_table[i]];
     assert(x==i); // sanity check
   }
 }