Changeset 6189 in orxonox.OLD

Timestamp:

Dec 20, 2005, 2:41:21 PM (18 years ago)

Author:

bensch

Message:

christmas: clean delete again (backward deletion)

File:

• branches/christmas_branche/src/util/loading/resource_manager.cc (modified) (1 diff)

branches/christmas_branche/src/util/loading/resource_manager.cc

@@ -577 +577 @@
 {
   std::list<Resource*>::iterator resource, pre;
-  pre = this->resourceList.begin();
-  while (pre != resourceList.end())
+  pre = --this->resourceList.end();
+  unsigned int removeCount;
+  for (unsigned int round = 0; round < 3; round++)
   {
-    resource = pre;
-    pre++;
-      if ((*resource)->prio <= prio)
-        if ((*resource)->count == 0)
-          unload((*resource), prio);
-        else
-          PRINTF(2)("unable to unload %s because there are still %d references to it\n",
-                   (*resource)->name, (*resource)->count);
-    }
+    removeCount = 0;
+    while (pre != resourceList.end())
+    {
+      resource = pre;
+      pre--;
+        if ((*resource)->prio <= prio)
+        {
+          if ((*resource)->count == 0)
+            unload((*resource), prio);
+          else
+          {
+            PRINTF(2)("unable to unload %s because there are still %d references to it\n",
+                     (*resource)->name, (*resource)->count);
+            removeCount++;
+          }
+        }
+     }
+     if (removeCount == 0) break;
+  }
 }