Changeset 3196 for code/trunk/src/core/ObjectListBase.h

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/ObjectListBase.h (modified) (2 diffs)

code/trunk/src/core/ObjectListBase.h

@@ -38 +38 @@
 #define _ObjectListBase_H__
 
+#include "CorePrereqs.h"
+
 #include <vector>
-
-#include "CorePrereqs.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -139 +140 @@
 
         private:
-            Identifier* identifier_;               //!< The Iterator owning this list
-            ObjectListBaseElement* first_;         //!< The first element in the list
-            ObjectListBaseElement* last_;          //!< The last element in the list
+            Identifier* identifier_;                 //!< The Iterator owning this list
+            ObjectListBaseElement* first_;           //!< The first element in the list
+            ObjectListBaseElement* last_;            //!< The last element in the list
             std::vector<void*> iterators_;           //!< A list of Iterators pointing on an element in this list
             std::vector<void*> objectListIterators_; //!< A list of ObjectListIterators pointing on an element in this list