diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/DList.h | 8 | ||||
-rw-r--r-- | utils/List.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/utils/DList.h b/utils/DList.h index 9c978b3..3c84753 100644 --- a/utils/DList.h +++ b/utils/DList.h @@ -37,7 +37,7 @@ friend class CcuDListIter; CcuDListLink* Next; inline CcuDListLink (CcuDListItem* e, CcuDListLink* p) : Entry (e), Previous (p), Next (p->Next) { Previous->Next = Next->Previous = this; } inline CcuDListLink (CcuDListItem* e) : Entry (e), Previous (this), Next (this) {} - void* operator new (unsigned int); + void* operator new (unsigned long); void operator delete (void*); }; #endif @@ -130,7 +130,7 @@ inline int Find (ITEM* it) const { return CcuDList::Find (it); } inline void Append (ITEM* it) { CcuDList::Append (it); } inline void Prepend (ITEM* it) { CcuDList::Prepend (it); } -inline CcuDListOf& operator << (ITEM* it) { CcuDList::Append (it); return *this; } +inline CcuDListOf <ITEM>& operator << (ITEM* it) { CcuDList::Append (it); return *this; } inline ITEM* RemoveFirst () { return (ITEM*) (CcuDList::RemoveFirst ()); } inline ITEM* RemoveLast () { return (ITEM*) (CcuDList::RemoveLast ()); } @@ -146,8 +146,8 @@ inline ITEM* RemoveAt (CcuDListIterOf <ITEM>& li) { return (ITEM*) CcuDList::Re template <class ITEM> class CcuDListIterOf : public CcuDListIter { public: inline CcuDListIterOf (const CcuDListOf <ITEM>& l) : CcuDListIter (l) { } -inline CcuDListIterOf& operator = (const CcuDListOf <ITEM>& l) { return (CcuDListIterOf&) CcuDListIter::operator = (l); } -inline CcuDListIterOf& operator = (const CcuDListIterOf& li) { return (CcuDListIterOf&) CcuDListIter::operator = (li); } +inline CcuDListIterOf <ITEM>& operator = (const CcuDListOf <ITEM>& l) { return (CcuDListIterOf <ITEM>&) CcuDListIter::operator = (l); } +inline CcuDListIterOf <ITEM>& operator = (const CcuDListIterOf <ITEM>& li) { return (CcuDListIterOf <ITEM>&) CcuDListIter::operator = (li); } inline ITEM* operator * () const { return (ITEM*) CcuDListIter::operator * (); } inline int Find (ITEM* it) { return CcuDListIter::Find (it); } inline int FindBack (ITEM* it) { return CcuDListIter::FindBack (it); } diff --git a/utils/List.h b/utils/List.h index 98311a9..72b015f 100644 --- a/utils/List.h +++ b/utils/List.h @@ -36,7 +36,7 @@ friend class CcuListIter; CcuListLink* Next; inline CcuListLink (CcuListItem* e, CcuListLink* n = 0) { Entry = e; Next = n ? n : this; } CcuListLink* Previous (); - void* operator new (unsigned int); + void* operator new (unsigned long); void operator delete (void*); }; #endif @@ -129,7 +129,7 @@ inline int Find (ITEM* it) const { return CcuList::Find (it); } inline void Append (ITEM* it) { CcuList::Append (it); } inline void Prepend (ITEM* it) { CcuList::Prepend (it); } -inline CcuListOf& operator << (ITEM* it) { CcuList::Append (it); return *this; } +inline CcuListOf<ITEM>& operator << (ITEM* it) { CcuList::Append (it); return *this; } inline ITEM* RemoveFirst () { return (ITEM*) (CcuList::RemoveFirst ()); } inline ITEM* RemoveLast () { return (ITEM*) (CcuList::RemoveLast ()); } @@ -144,9 +144,9 @@ inline ITEM* RemoveAfter (const CcuListIterOf <ITEM>& li) { return (ITEM*) CcuL template <class ITEM> class CcuListIterOf : public CcuListIter { public: inline CcuListIterOf (const CcuListOf <ITEM>& l) : CcuListIter (l) { } -inline CcuListIterOf& operator = (const CcuListOf <ITEM>& l) { return (CcuListIterOf&) CcuListIter::operator = (l); } -inline CcuListIterOf& operator = (const CcuListIterOf& li) { return (CcuListIterOf&) CcuListIter::operator = (li); } -inline CcuListIterOf& operator ++ () { return (CcuListIterOf&) CcuListIter::operator ++ (); } +inline CcuListIterOf<ITEM>& operator = (const CcuListOf <ITEM>& l) { return (CcuListIterOf <ITEM>&) CcuListIter::operator = (l); } +inline CcuListIterOf<ITEM>& operator = (const CcuListIterOf <ITEM>& li) { return (CcuListIterOf <ITEM>&) CcuListIter::operator = (li); } +inline CcuListIterOf<ITEM>& operator ++ () { return (CcuListIterOf <ITEM>&) CcuListIter::operator ++ (); } inline ITEM* operator * () const { return (ITEM*) CcuListIter::operator * (); } inline int Find (ITEM* it) { return CcuListIter::Find (it); } }; |