Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9695 in orxonox.OLD for branches/new_class_id/src/lib


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/lang/new_object_list.h

    r9693 r9695  
    9191      virtual void operator--() = 0;
    9292      virtual BaseObject* operator*() = 0;
    93       virtual __base_iterator_base& operator=(const base_iterator& iterator) = 0;
     93      virtual __base_iterator_base* operator=(const __base_iterator_base& iterator) = 0;
    9494      virtual bool operator==(const __base_iterator_base& iterator) const = 0;
    9595      virtual bool operator!=(const __base_iterator_base& iterator) const = 0;
     
    9898
    9999  public:
    100     base_iterator(__base_iterator_base& it) { _it = it.clone(); };
     100    base_iterator(const __base_iterator_base& it) { _it = it.clone(); };
    101101    ~base_iterator() { delete _it; }
    102102    void operator++() { (*_it)++; };
     
    193193    void operator--(int) { --_iter; };
    194194    void operator--()  { _iter--; };
    195     BaseObject* operator*() { return *iter; };
    196     base_iterator::__base_iterator_base& operator=(const base_iterator& iterator) { _iter = iterator._iter; return *this; };
    197     bool operator==(const __base_iterator_base& iterator) const { return _iter == iterator._iter; };
    198     bool operator!=(const __base_iterator_base& iterator) const { return _iter != iterator._iter; };
     195    BaseObject* operator*() { return *_iter; };
     196    base_iterator::__base_iterator_base* operator=(const __base_iterator_base& iterator) { this->_iter = static_cast<const __base_iterator&>(iterator)._iter; return this; };
     197    bool operator==(const __base_iterator_base& iterator) const { return _iter == static_cast<const __base_iterator&>(iterator)._iter; };
     198    bool operator!=(const __base_iterator_base& iterator) const { return _iter != static_cast<const __base_iterator&>(iterator)._iter; };
    199199  private:
    200     iterator _iter;
     200    const_iterator _iter;
    201201  };
    202202
  • branches/new_class_id/src/lib/util/loading/factory.cc

    r9691 r9695  
    174174BaseObject* Factory::fabricate(const NewClassID& classID)
    175175{
    176   Factory::fabricate(classID.id());
     176  return Factory::fabricate(classID.id());
    177177}
Note: See TracChangeset for help on using the changeset viewer.