Changeset 1747 for code/trunk/src/core/Loader.cc

Timestamp:

Sep 9, 2008, 4:25:52 AM (17 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/Loader.cc (modified) (3 diffs)

code/trunk/src/core/Loader.cc

@@ -32 +32 @@
 #include "Identifier.h"
 #include "Iterator.h"
-#include "Debug.h"
+#include "ObjectList.h"
 #include "CoreIncludes.h"
 #include "Script.h"
 #include "Namespace.h"
+#include "util/Debug.h"
 
 #include "tinyxml/ticpp.h"
@@ -91 +92 @@
     void Loader::unload(const ClassTreeMask& mask)
     {
-        for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it; )
+        for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); )
         {
             if (mask.isIncluded(it->getIdentifier()))
@@ -165 +166 @@
     void Loader::unload(const Level* level, const ClassTreeMask& mask)
     {
-        for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it; )
+        for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; )
         {
             if ((it->getLevel() == level) && mask.isIncluded(it->getIdentifier()))