[Scummvm-cvs-logs] SF.net SVN: scummvm: [20554] scummvm/trunk/common/list.h

chrilith at users.sourceforge.net chrilith at users.sourceforge.net
Sat Feb 11 10:03:04 CET 2006


Revision: 20554
Author:   chrilith
Date:     2006-02-11 10:02:13 -0800 (Sat, 11 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20554&view=rev

Log Message:
-----------
This seems to definitively fix my compilation problem

Modified Paths:
--------------
    scummvm/trunk/common/list.h
Modified: scummvm/trunk/common/list.h
===================================================================
--- scummvm/trunk/common/list.h	2006-02-11 17:18:18 UTC (rev 20553)
+++ scummvm/trunk/common/list.h	2006-02-11 18:02:13 UTC (rev 20554)
@@ -72,7 +72,11 @@
 		}
 		// 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 @@
 		}
 		// 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 @@
 	}
 
 	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;
 	}
 







More information about the Scummvm-git-logs mailing list