--- deliantra/server/common/shstr.C	2010/04/15 00:36:51	1.44
+++ deliantra/server/common/shstr.C	2018/11/17 23:33:17	1.52
@@ -1,22 +1,22 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / 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
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -27,13 +27,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;
@@ -61,6 +62,15 @@
 
 shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
 
+bool
+shstr_tmp::contains (const char *substring) const
+{
+  //TODO: this is supposed to check for comma-seperation...
+  return s != null ()
+         && substring
+         && strstr (s, substring);
+}
+
 const char *
 shstr::find (const char *s)
 {
@@ -145,3 +155,4 @@
 
 materialtype_t material_null;
 
+struct freed_map freed_map;