diff -ur hearts-1.98-ori/common/general/circular_iterator.h hearts-1.98/common/general/circular_iterator.h
--- hearts-1.98-ori/common/general/circular_iterator.h	2004-04-08 19:54:10.000000000 -0400
+++ hearts-1.98/common/general/circular_iterator.h	2005-08-02 22:26:04.000000000 -0400
@@ -137,7 +137,7 @@
 inline circular_iterator<It>& circular_iterator<It>::operator += ( circular_iterator<It>::difference_type n )
 {
 	n %= last - first; // put it in range
-	circular_iterator::difference_type d = last - cur;
+	typename circular_iterator::difference_type d = last - cur;
 	if ( d > n ) {
 		cur += n;
 		return *this;
diff -ur hearts-1.98-ori/common/network/message.h hearts-1.98/common/network/message.h
--- hearts-1.98-ori/common/network/message.h	2003-11-26 14:07:57.000000000 -0500
+++ hearts-1.98/common/network/message.h	2005-08-02 22:30:48.000000000 -0400
@@ -129,7 +129,7 @@
 }
 
 template <typename T>
-inline const T Message::arg( size_t idx ) const
+inline const T Message::arg( unsigned idx ) const
 {
 	QString rep = arg( idx );
 	return to<T>( rep );