--- deliantra/server/common/shstr.C	2006/09/14 18:13:01	1.20
+++ deliantra/server/common/shstr.C	2007/05/28 21:21:40	1.23
@@ -1,12 +1,32 @@
 /*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 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 GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
+
+/*
  * shstr.C
  */
 
 #include <cstring>
 #include <cstdlib>
-
 #include <glib.h>
-
 #include <tr1/unordered_set>
 
 #include "global.h"
@@ -46,7 +66,7 @@
   if (!s)
     return s;
 
-  AUTODECL (i, ht.find (s));
+  auto (i, ht.find (s));
 
   return i != ht.end ()? *i : 0;
 }
@@ -75,7 +95,7 @@
 {
   static const char *curpos;
 
-  AUTODECL (i, curpos ? ht.find (curpos) : ht.begin ());
+  auto (i, curpos ? ht.find (curpos) : ht.begin ());
 
   if (i == ht.end ())
     i = ht.begin ();
@@ -94,7 +114,7 @@
         break;
       else if (!refcnt (*i))
         {
-          AUTODECL (o, i++);
+          auto (o, i++);
           const char *s = *o;
 
           ht.erase (o);
@@ -119,7 +139,6 @@
 /* buf_overflow() - we don't want to exceed the buffer size of 
  * buf1 by adding on buf2! Returns true if overflow will occur.
  */
-
 int
 buf_overflow (const char *buf1, const char *buf2, int bufsize)
 {
@@ -131,5 +150,6 @@
     len2 = strlen (buf2);
   if ((len1 + len2) >= bufsize)
     return 1;
+
   return 0;
 }