From 272cde0ff09a05b23b95626e82120dd119b02525 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Tue, 22 May 2018 10:28:09 +0000
Subject: [PATCH] Inline get_string_container

The C standard guarantees that the static local variable remains unique.
---
 src/util/string_container.cpp | 7 -------
 src/util/string_container.h   | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/util/string_container.cpp b/src/util/string_container.cpp
index 4a8cee9b54a..262634af190 100644
--- a/src/util/string_container.cpp
+++ b/src/util/string_container.cpp
@@ -74,10 +74,3 @@ 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;
-}
diff --git a/src/util/string_container.h b/src/util/string_container.h
index eca7d89bea3..b63cb38905e 100644
--- a/src/util/string_container.h
+++ b/src/util/string_container.h
@@ -89,6 +89,11 @@ class string_containert
   string_vectort string_vector;
 };
 
-string_containert &get_string_container();
+/// Get a reference to the global string container.
+inline string_containert &get_string_container()
+{
+  static string_containert ret;
+  return ret;
+}
 
 #endif // CPROVER_UTIL_STRING_CONTAINER_H