--- deliantra/server/common/shstr.C	2018/11/17 23:40:00	1.53
+++ deliantra/server/common/shstr.C	2018/12/01 20:22:12	1.55
@@ -78,7 +78,7 @@
   if (!s)
     return s;
 
-  auto (i, ht.find (s));
+  auto i = ht.find (s);
 
   return i != ht.end ()? *i : 0;
 }
@@ -111,7 +111,7 @@
 
   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 ();
@@ -130,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;