--- deliantra/server/common/arch.C	2011/05/01 16:58:15	1.108
+++ deliantra/server/common/arch.C	2016/11/18 04:44:13	1.113
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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
  * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
- * 
+ *
  * 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,13 @@
 #include <global.h>
 
 #include <tr1/functional>
-#include <tr1/unordered_map>
+#include <unordered_map>
 
 archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
 arch_ptr archetype::empty;
 
 // the hashtable
-typedef std::tr1::unordered_map
+typedef std::unordered_map
   <
     const char *,
     arch_ptr,
@@ -532,7 +532,7 @@
 void
 archetype::gc ()
 {
-  int cnt = max (1, min (allarch.size () / 128, dirtycnt));
+  int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
   dirtycnt = max (0, dirtycnt - cnt);
 
   do