Changeset 9667 in orxonox.OLD for trunk/src

Timestamp:

Aug 21, 2006, 10:55:02 AM (18 years ago)

Author:

bensch

Message:

trunk: iterator-insertion works

Location:

trunk/src/lib/lang

Files:

• new_class_id.h (modified) (1 diff)
• new_object_list.h (modified) (4 diffs)

trunk/src/lib/lang/new_class_id.h

@@ -27 +27 @@
 private:
   NewObjectListBase*            _objectList;
-
-  std::list<NewObjectListBase::IteratorBase*>  _iterators;
+  std::list<NewObjectListBase::IteratorBase*>  _iterators; //!< Iterators to the class-list's positions.
 };
 

trunk/src/lib/lang/new_object_list.h

@@ -82 +82 @@
   {
   public:
+    Iterator(iterator it) { it = it; }
     typename NewObjectList::iterator it;
   };
@@ -92 +93 @@
   inline const list&      objects() const { return _objects; };
 
-  void registerObject(T* object);
+  NewObjectListBase::IteratorBase* registerObject(T* object);
   void unregisterObject(const IteratorBase& iterator);
 
@@ -118 +119 @@
 NewObjectList<T>::~NewObjectList()
 {
-  assert(_objects.empty());
+ // assert(_objects.empty());
 }
 
@@ -132 +133 @@
 
 template <class T>
-void NewObjectList<T>::registerObject(T* object)
+NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
 {
-  this->_objects.push_back(object);
+  this->_objects.push_front(object);
+  return new Iterator(this->_objects.begin());
 }