From eae8e5cbc753b858e514be345b382cc606806dac Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Wed, 15 Dec 2004 20:22:52 +0000 Subject: fix compilation (under mingw/gcc3.4) svn-id: r16062 --- saga/list.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'saga/list.h') diff --git a/saga/list.h b/saga/list.h index dbffc4176c..619060cf2f 100644 --- a/saga/list.h +++ b/saga/list.h @@ -38,11 +38,11 @@ public: public: iterator pushFront(const T& element) { - return insert(begin(), element); + return insert(Common::List::begin(), element); } iterator pushBack(const T& element) { - return insert(end(), element); + return insert(Common::List::end(), element); } iterator insert(iterator pos, const T& element) { @@ -51,11 +51,11 @@ public: } iterator pushFront() { - return insert(begin()); + return insert(Common::List::begin()); } iterator pushBack() { - return insert(end()); + return insert(Common::List::end()); } iterator insert(iterator pos) { @@ -64,17 +64,17 @@ public: } iterator pushFront(const T& element, CompareFunction* compareFunction) { - return insert(begin(), element, compareFunction); + return insert(Common::List::begin(), element, compareFunction); } iterator pushBack(const T& element, CompareFunction* compareFunction) { - return insert(end(), element, compareFunction); + return insert(Common::List::end(), element, compareFunction); } iterator insert(iterator pos, const T& element, CompareFunction* compareFunction) { int res; - for (iterator i = begin(); i != end(); ++i) { + for (iterator i = Common::List::begin(); i != Common::List::end(); ++i) { res = compareFunction(element, i.operator*()); if (res < 0) { return insert(i, element); @@ -88,7 +88,7 @@ public: int res; --i; - while (i != end()) { + while (i != Common::List::end()) { res = compareFunction(i.operator*(), pos.operator*()); if (res <= 0) { @@ -107,7 +107,7 @@ public: int res; ++i; - while (i != end()) { + while (i != Common::List::end()) { res = compareFunction(i.operator*(), pos.operator*()); if (res >= 0) { @@ -121,7 +121,7 @@ public: } iterator eraseAndPrev(iterator pos) { - assert(pos != end()); + assert(pos != Common::List::end()); iterator res(pos); --res; @@ -130,7 +130,7 @@ public: } void remove(const T* val) { - for (iterator i = begin(); i != end(); ++i) + for (iterator i = Common::List::begin(); i != Common::List::end(); ++i) if(val == i.operator->()) { erase(i); return; @@ -139,7 +139,7 @@ public: bool locate(const T* val, iterator& foundedIterator) { - for (iterator i = begin(); i != end(); ++i) + for (iterator i = Common::List::begin(); i != Common::List::end(); ++i) if (val == i.operator->()) { foundedIterator = i; -- cgit v1.2.3