--- deliantra/server/common/shstr.C 2010/08/28 23:49:03 1.45
+++ deliantra/server/common/shstr.C 2016/11/18 04:44:13 1.51
@@ -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
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -27,13 +27,13 @@
#include
#include
#include
-#include
+#include
#include "global.h"
size_t shstr_alloc;
-typedef std::tr1::unordered_set > HT;
+typedef std::unordered_set > HT;
static HT ht;
static int next_gc;
@@ -154,3 +154,4 @@
materialtype_t material_null;
+struct freed_map freed_map;