diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h index e6c48b450..81aa5df3d 100644 --- a/src/libCom/cxxTemplates/tsDLList.h +++ b/src/libCom/cxxTemplates/tsDLList.h @@ -196,8 +196,8 @@ public: tsDLIterBD operator = (T *pNewEntry); - tsDLIterBD itemAfter (); - tsDLIterBD itemBefore (); + tsDLIterBD itemAfter (); + tsDLIterBD itemBefore (); bool operator == (const tsDLIterBD &rhs) const; bool operator != (const tsDLIterBD &rhs) const; @@ -206,10 +206,31 @@ public: T * operator -> () const; //operator T* () const; - tsDLIterBD operator ++ (); // prefix ++ - tsDLIterBD operator ++ (int); // postfix ++ - tsDLIterBD operator -- (); // prefix -- - tsDLIterBD operator -- (int); // postfix -- + tsDLIterBD operator ++ () // prefix ++ + { + this->tsDLIterConstBD::operator ++ (); + return *this; + } + + tsDLIterBD operator ++ (int) // postfix ++ + { + tsDLIterBD tmp = *this; + this->tsDLIterConstBD::operator ++ (1); + return tmp; + } + + tsDLIterBD operator -- () // prefix -- + { + this->tsDLIterConstBD::operator -- (); + return *this; + } + + tsDLIterBD operator -- (int) // postfix -- + { + tsDLIterBD tmp = *this; + this->tsDLIterConstBD::operator -- (1); + return tmp; + } # if defined(_MSC_VER) && _MSC_VER < 1200 tsDLIterBD (const class tsDLIterBD ©In); @@ -319,7 +340,7 @@ public: void reset (); void reset (tsDLList &listIn); void operator = (tsDLList &listIn); - T * operator () (); + T * operator () () { return this->tsDLIter::prev(); } T * prev (); T * last(); // @@ -846,54 +867,6 @@ inline tsDLIterBD tsDLIterBD::itemBefore () return tsDLIterBD (node.pPrev); } -// -// prefix ++ -// -template -inline tsDLIterBD tsDLIterBD::operator ++ () -{ - this->tsDLIterConstBD::operator ++ (); - return *this; -} - -// -// postfix ++ -// -template -inline tsDLIterBD tsDLIterBD::operator ++ (int) -{ - tsDLIterBD tmp = *this; - this->tsDLIterConstBD::operator ++ (1); - return tmp; -} - -// -// prefix -- -// -template -inline tsDLIterBD tsDLIterBD::operator -- () -{ - this->tsDLIterConstBD::operator -- (); - return *this; -} - -// -// postfix -- -// -template -inline tsDLIterBD tsDLIterBD::operator -- (int) -{ - tsDLIterBD tmp = *this; - this->tsDLIterConstBD::operator -- (1); - return tmp; -} - -template -inline bool tsDLIterBD::valid () const -{ - return this->tsDLIterConstBD::valid (); -} - // // tsDLIterBD::eol // @@ -1069,15 +1042,6 @@ void tsDLBwdIter::remove () } } -// -// tsDLBwdIter::operator () () -// -template -inline T * tsDLBwdIter::operator () () -{ - return this->tsDLIter::prev(); -} - ////////////////////////////////////////// // tsDLFwdIter member functions //////////////////////////////////////////