Changeset 134

Show
Ignore:
Timestamp:
05/21/08 22:07:38 (8 months ago)
Author:
zork
Message:

gcc 4 fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dba/dba/convspec.h

    r128 r134  
    9090      strftime compatibile format for datetime conversion to query value 
    9191    */ 
    92     char* mTimestampFormat; 
     92    const char* mTimestampFormat; 
    9393    /** 
    9494      strftime compatibile format for date conversion to query value 
    9595    */ 
    96     char* mDateFormat; 
     96    const char* mDateFormat; 
    9797#ifdef _WIN32 
    9898    /** 

  • trunk/dba/dba/dbupdate.h

    r97 r134  
    3939      @param pFileParser parser capable of reading update scripts 
    4040    */ 
    41     DbUpdate::DbUpdate(SharedSQLArchive& pArchive, DbUpdateScriptsParser& pFileParser); 
     41    DbUpdate(SharedSQLArchive& pArchive, DbUpdateScriptsParser& pFileParser); 
    4242 
    4343    /**  

  • trunk/dba/dba/postgres.cpp

    r97 r134  
    2525const char* 
    2626getError(PGconn* pConn) { 
    27   char *ret = "Postgres connection handle is NULL"; 
     27  const char *ret = "Postgres connection handle is NULL"; 
    2828  if (pConn != NULL) { 
    2929    return PQerrorMessage(pConn);    

  • trunk/dba/dba/stddeque.h

    r97 r134  
    5050    */ 
    5151    stdDeque(std::deque<T>& pDeque) : InstanceFilter<std::deque<T>, T>(pDeque) {}; 
    52     virtual CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    53     virtual void clear() { mMember->clear(); }; 
     52    virtual CollectionFilterIterator* createIterator() const {  
     53      return new iterator(*(CollectionFilter<std::deque<T> >::mMember));  
     54    }; 
     55    virtual void clear() { (CollectionFilter<std::deque<T> >::mMember)->clear(); }; 
    5456    virtual void add(const T& pToAdd) { 
    5557      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl; 
    56       mMember->push_back(pToAdd); 
     58      (CollectionFilter<std::deque<T> >::mMember)->push_back(pToAdd); 
    5759    }; 
    5860    virtual ~stdDeque() {}; 

  • trunk/dba/dba/stdlist.h

    r48 r134  
    5050    */ 
    5151    stdList(std::list<T>& pList) : InstanceFilter<std::list<T>, T>(pList) {}; 
    52     virtual CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    53     virtual void clear() { mMember->clear(); }; 
     52    virtual CollectionFilterIterator* createIterator() const {  
     53      return new iterator(*(CollectionFilter<std::list<T> >::mMember));  
     54    }; 
     55    virtual void clear() { (CollectionFilter<std::list<T> >::mMember)->clear(); }; 
    5456    virtual void add(const T& pToAdd) { 
    5557      //std::cerr << "adding obj "<< pToAdd.getId() << " to list " << mMember << std::endl; 
    56       mMember->push_back(pToAdd); 
     58      (CollectionFilter<std::list<T> >::mMember)->push_back(pToAdd); 
    5759    }; 
    5860    virtual ~stdList() {}; 

  • trunk/dba/dba/stdmultiset.h

    r48 r134  
    5050    */ 
    5151    stdMultiset(std::multiset<T>& pList) : InstanceFilter<std::multiset<T>, T>(pList) {}; 
    52     virtual CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    53     virtual void clear() { mMember->clear(); }; 
     52    virtual CollectionFilterIterator* createIterator() const {  
     53      return new iterator(*(CollectionFilter<std::multiset<T> >::mMember));  
     54    }; 
     55    virtual void clear() { (CollectionFilter<std::multiset<T> >::mMember)->clear(); }; 
    5456    virtual void add(const T& pToAdd) { 
    5557      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mSet << std::endl; 
    56       mMember->insert(pToAdd); 
     58      (CollectionFilter<std::multiset<T> >::mMember)->insert(pToAdd); 
    5759    }; 
    5860    virtual ~stdMultiset() {}; 

  • trunk/dba/dba/stdset.h

    r97 r134  
    5353    */ 
    5454    stdSet(std::set<T>& pSet) : InstanceFilter<std::set<T>, T>(pSet) {}; 
    55     virtual CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    56     virtual void clear() { mMember->clear(); }; 
     55    virtual CollectionFilterIterator* createIterator() const {  
     56      return new iterator(*(CollectionFilter<std::set<T> >::mMember));  
     57    }; 
     58    virtual void clear() { (CollectionFilter<std::set<T> >::mMember)->clear(); }; 
    5759    virtual void add(const T& pToAdd) { 
    5860      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl; 
    59       mMember->insert(pToAdd); 
     61      (CollectionFilter<std::set<T> >::mMember)->insert(pToAdd); 
    6062    }; 
    6163    virtual ~stdSet() {}; 

  • trunk/dba/dba/stdvector.h

    r97 r134  
    5050    */ 
    5151    stdVector(std::vector<T>& pVector) : InstanceFilter<std::vector<T>, T>(pVector) {}; 
    52     virtual CollectionFilterIterator* createIterator() const { return new iterator(*mMember); }; 
    53     virtual void clear() { mMember->clear(); }; 
     52    virtual CollectionFilterIterator* createIterator() const {  
     53      return new iterator(*(CollectionFilter<std::vector<T> >::mMember));  
     54    }; 
     55    virtual void clear() { (CollectionFilter<std::vector<T> >::mMember)->clear(); }; 
    5456    virtual void add(const T& pToAdd) { 
    5557      //std::cerr << "adding obj "<< pToAdd.getId() << " to set " << mMember << std::endl; 
    56       mMember->push_back(pToAdd); 
     58      (CollectionFilter<std::vector<T> >::mMember)->push_back(pToAdd); 
    5759    }; 
    5860    virtual ~stdVector() {}; 

  • trunk/dba/test/stdfilters_test.h

    r20 r134  
    8181    virtual void setUp() { 
    8282      FiltersTestCase<std::string,dba::String>::setUp(); 
    83       sDefaultSpecs.mTimestampFormat="%Y-%m-%d %H:%M:%S"; 
     83      sDefaultSpecs.mTimestampFormat = "%Y-%m-%d %H:%M:%S"; 
    8484    }; 
    8585    void test1() { notNull("not null"); };