[Scummvm-cvs-logs] CVS: scummvm/common list.h,1.29.2.2,1.29.2.3

Jonathan Gray khalek at users.sourceforge.net
Sat Jan 28 19:50:01 CET 2006


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24001

Modified Files:
      Tag: branch-0-8-0
	list.h 
Log Message:
Backport cyx's GCC 2.95 compilation fix.


Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- list.h	18 Jan 2006 18:07:26 -0000	1.29.2.2
+++ list.h	29 Jan 2006 03:49:13 -0000	1.29.2.3
@@ -91,7 +91,11 @@
 		}
 		T2& operator*() const {
 			assert(_node);
+#if (__GNUC__ == 2) && (__GNUC_MINOR__ >= 95)
+			return static_cast<List<T>::Node<T2> *>(_node)->_data;
+#else
 			return static_cast<Node<T2>*>(_node)->_data;
+#endif
 		}
 		T2* operator->() const {
 			return &(operator*());





More information about the Scummvm-git-logs mailing list