Changeset 143

Show
Ignore:
Timestamp:
05/25/08 20:25:04 (8 months ago)
Author:
zork
Message:

fixed gcc 4 compilation in wxdba

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wxdba/wxdba/array_filter.h

    r51 r143  
    6060    */ 
    6161    Array(A& pList) : dba::InstanceFilter<A, T>(pList) {}; 
    62     virtual dba::CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    63     virtual void clear() { mMember->Clear(); }; 
    64     virtual void add(const T& pToAdd) { 
    65       mMember->Add(pToAdd); 
     62    virtual dba::CollectionFilterIterator* createIterator() const {  
     63      return new iterator(*(dba::CollectionFilter<A>::mMember));  
     64    }; 
     65    virtual void clear() { (dba::CollectionFilter<A>::mMember)->Clear(); }; 
     66    virtual dba::Storeable* add(const T& pToAdd) { 
     67      T* copy = new T(pToAdd); 
     68      (dba::CollectionFilter<A>::mMember)->Add(copy); 
     69      return copy; 
    6670    }; 
    6771    virtual ~Array() {}; 
  • trunk/wxdba/wxdba/list_filter.h

    r51 r143  
    7070    */ 
    7171    List(wxListBase& pList) : dba::InstanceFilter<wxListBase, T>(pList) {}; 
    72     virtual dba::CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    73     virtual void clear() { mMember->Clear(); }; 
    74     virtual void add(const T& pToAdd) { 
     72    virtual dba::CollectionFilterIterator* createIterator() const {  
     73      return new iterator(*(dba::InstanceFilter<wxListBase, T>::mMember));  
     74    }; 
     75    virtual void clear() { (dba::InstanceFilter<wxListBase, T>::mMember)->Clear(); }; 
     76    virtual dba::Storeable* add(const T& pToAdd) { 
    7577      //std::cerr << "adding obj "<< pToAdd.getId() << " to list " << mMember << std::endl; 
    76       ListAccessor* lst = reinterpret_cast<ListAccessor*>(mMember); 
    77       lst->Append(new T(pToAdd)); 
     78      ListAccessor* lst = reinterpret_cast<ListAccessor*>(dba::InstanceFilter<wxListBase, T>::mMember); 
     79      T* added = new T(pToAdd); 
     80      lst->Append(added); 
     81      return added; 
    7882    }; 
    7983    virtual ~List() {};