aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorChris Apers2006-02-11 18:02:13 +0000
committerChris Apers2006-02-11 18:02:13 +0000
commit32b2efb8d75a42a8ad0fd241065451cb35125c9f (patch)
tree27f34f335105bf1038491915c1f723dd3596e2d6 /common
parentcc07cd38370f73306c6676c86fb922430f10cb34 (diff)
downloadscummvm-rg350-32b2efb8d75a42a8ad0fd241065451cb35125c9f.tar.gz
scummvm-rg350-32b2efb8d75a42a8ad0fd241065451cb35125c9f.tar.bz2
scummvm-rg350-32b2efb8d75a42a8ad0fd241065451cb35125c9f.zip
This seems to definitively fix my compilation problem
svn-id: r20554
Diffstat (limited to 'common')
-rw-r--r--common/list.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/common/list.h b/common/list.h
index a5c0d69c99..8fb59a12a9 100644
--- a/common/list.h
+++ b/common/list.h
@@ -72,7 +72,11 @@ public:
}
// Postfix inc
Iterator<T2> operator++(int) {
+#ifndef PALMOS_MODE
Iterator<T2> tmp(_node);
+#else
+ Iterator tmp(_node);
+#endif
if (_node)
_node = _node->_next;
return tmp;
@@ -85,7 +89,11 @@ public:
}
// Postfix dec
Iterator<T2> operator--(int) {
+#ifndef PALMOS_MODE
Iterator<T2> tmp(_node);
+#else
+ Iterator tmp(_node);
+#endif
if (_node)
_node = _node->_prev;
return tmp;
@@ -177,15 +185,9 @@ public:
}
iterator erase(iterator first, iterator last) {
- while (first != last) {
-#ifndef PALMOS_MODE
+ while (first != last)
erase(first++);
-#else
- iterator tmp = first._node->_next;
- erase(first);
- first = tmp;
-#endif
- }
+
return last;
}