No longer rely on internals of ThreadLocalStorage in LogStream.

diff --git a/source/base/logstream.cc b/source/base/logstream.cc
index 3c0ba32edbc7d5634f42e6b33fb343d4ba3620bf..495cd0be3c8dd8eea07b3421d2b36c80ab499980 100644 (file)
--- a/source/base/logstream.cc
+++ b/source/base/logstream.cc
@@ -386,11 +386,11 @@ LogStream::get_prefixes() const
 
   // If this is a new locally stored stack, copy the "blessed" prefixes
   // from the initial thread that created logstream.
-  if (!exists)
+  if (exists == false)
     {
-      auto it = prefixes.data.find(parent_thread);
-      if (it != prefixes.data.end())
-        local_prefixes = it->second;
+      const auto parent_prefixes = prefixes.get_for_thread(parent_thread);
+      if (parent_prefixes)
+        local_prefixes = parent_prefixes.value();
     }
 
   return local_prefixes;