--- deliantra/server/common/shstr.C	2016/11/16 23:41:59	1.50
+++ deliantra/server/common/shstr.C	2018/12/05 19:03:26	1.56
@@ -1,6 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
  * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
@@ -27,13 +28,14 @@
 #include <cstring>
 #include <cstdlib>
 #include <glib.h>
-#include <tr1/unordered_set>
 
-#include "global.h"
+#include <flat_hash_map.hpp>
+
+#include <global.h>
 
 size_t shstr_alloc;
 
-typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
+typedef ska::flat_hash_set<const char *, str_hash, str_equal, slice_allocator<const char *>> HT;
 
 static HT ht;
 static int next_gc;
@@ -76,7 +78,7 @@
   if (!s)
     return s;
 
-  auto (i, ht.find (s));
+  auto i = ht.find (s);
 
   return i != ht.end ()? *i : 0;
 }
@@ -104,12 +106,12 @@
 void
 shstr::gc ()
 {
-  if (expect_true (next_gc > 0))
+  if (ecb_expect_true (next_gc > 0))
     return;
 
   static const char *curpos;
 
-  auto (i, curpos ? ht.find (curpos) : ht.begin ());
+  auto i = curpos ? ht.find (curpos) : ht.begin ();
 
   if (i == ht.end ())
     i = ht.begin ();
@@ -128,10 +130,9 @@
         break;
       else if (!refcnt (*i))
         {
-          auto (o, i++);
-          const char *s = *o;
+          const char *s = *i;
 
-          ht.erase (o);
+          i = ht.erase (i);
 
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
           int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;