Changeset 9665 in orxonox.OLD

Timestamp:

Aug 20, 2006, 11:39:18 PM (18 years ago)

Author:

bensch

Message:

trunk: iterator definitions

Location:

trunk/src/lib/lang

Files:

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

trunk/src/lib/lang/new_class_id.h

@@ -12 +12 @@
 
 #include "new_object_list.h"
+
+
+
 
 //! A class to dynamically allocate ClassID's and support a isA operator

trunk/src/lib/lang/new_object_list.h

@@ -40 +40 @@
 
 protected:
+  class IteratorBase { };
+
   NewObjectListBase(const std::string& className);
   ~NewObjectListBase();
@@ -68 +70 @@
  * @note The Class must define the compare with const std::string& operator for this to work.
  */
-template<class T> class NewObjectList : public NewObjectListBase
+template<class T>
+class NewObjectList : public NewObjectListBase
 {
 public:
   typedef std::list<T*>               list;
   typedef typename list::iterator     iterator;
+
+  class Iterator : public NewObjectListBase::IteratorBase
+  {
+  public:
+    typename NewObjectList::iterator it;
+  };
 
 public:
@@ -82 +91 @@
 
   void registerObject(T* object);
-  void unregisterObject(T* object);
+  void unregisterObject(const IteratorBase& iterator);
 
 private:
@@ -88 +97 @@
   NewObjectList(const NewObjectList& definer) {};
 
+private:
   list                _objects;
 };
 
+
+
+
+
+/////////////////////////
+//// IMPLEMENTATION /////
+/////////////////////////
 template <class T>
 NewObjectList<T>::NewObjectList(const std::string& name)
@@ -119 +136 @@
 
 template <class T>
-void NewObjectList<T>::unregisterObject(T* object)
+void NewObjectList<T>::unregisterObject(const IteratorBase& iterator)
 {
-  _objects.erase(std::find(_objects.begin(), _objects.end(), object));
+  this->_objects.erase(static_cast<Iterator>(iterator));
+  //_objects.erase(std::find(_objects.begin(), _objects.end(), object));
 }