--- deliantra/server/common/arch.C	2007/04/16 13:02:28	1.50
+++ deliantra/server/common/arch.C	2007/04/16 15:41:26	1.51
@@ -347,7 +347,7 @@
     archetype *head = parts.front ().first;
 
     // check that all archetypes belong to the same object or are heads
-    for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
+    for (auto (p, parts.begin ()); p != parts.end (); ++p)
       {
         archetype *at = p->first;
 
@@ -388,7 +388,7 @@
 
     // reassemble new chain
     archetype *prev = head;
-    for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p)
+    for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
       {
         archetype *at = p->first;
         overwrite (at, p->second);
@@ -408,7 +408,7 @@
   return true;
 
 fail:
-  for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
+  for (auto (p, parts.begin ()); p != parts.end (); ++p)
     p->second->destroy (true);
 
   return false;
@@ -542,7 +542,7 @@
   if (!name)
     return 0;
 
-  AUTODECL (i, ht.find (name));
+  auto (i, ht.find (name));
 
   if (i == ht.end ())
     return 0;