Changeset 9695 in orxonox.OLD

Timestamp:

Aug 23, 2006, 9:18:53 PM (18 years ago)

Author:

bensch

Message:

compiles more than before

Location:

branches/new_class_id/src/lib

Files:

• lang/new_object_list.h (modified) (3 diffs)
• util/loading/factory.cc (modified) (1 diff)

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -91 +91 @@
       virtual void operator--() = 0;
       virtual BaseObject* operator*() = 0;
-      virtual __base_iterator_base& operator=(const base_iterator& iterator) = 0;
+      virtual __base_iterator_base* operator=(const __base_iterator_base& iterator) = 0;
       virtual bool operator==(const __base_iterator_base& iterator) const = 0;
       virtual bool operator!=(const __base_iterator_base& iterator) const = 0;
@@ -98 +98 @@
 
   public:
-    base_iterator(__base_iterator_base& it) { _it = it.clone(); };
+    base_iterator(const __base_iterator_base& it) { _it = it.clone(); };
     ~base_iterator() { delete _it; }
     void operator++() { (*_it)++; };
@@ -193 +193 @@
     void operator--(int) { --_iter; };
     void operator--()  { _iter--; };
-    BaseObject* operator*() { return *iter; };
-    base_iterator::__base_iterator_base& operator=(const base_iterator& iterator) { _iter = iterator._iter; return *this; };
-    bool operator==(const __base_iterator_base& iterator) const { return _iter == iterator._iter; };
-    bool operator!=(const __base_iterator_base& iterator) const { return _iter != iterator._iter; };
+    BaseObject* operator*() { return *_iter; };
+    base_iterator::__base_iterator_base* operator=(const __base_iterator_base& iterator) { this->_iter = static_cast<const __base_iterator&>(iterator)._iter; return this; };
+    bool operator==(const __base_iterator_base& iterator) const { return _iter == static_cast<const __base_iterator&>(iterator)._iter; };
+    bool operator!=(const __base_iterator_base& iterator) const { return _iter != static_cast<const __base_iterator&>(iterator)._iter; };
   private:
-    iterator _iter;
+    const_iterator _iter;
   };
 

branches/new_class_id/src/lib/util/loading/factory.cc

@@ -174 +174 @@
 BaseObject* Factory::fabricate(const NewClassID& classID)
 {
-  Factory::fabricate(classID.id());
+  return Factory::fabricate(classID.id());
 }