[Scummvm-cvs-logs] SF.net SVN: scummvm:[40054] scummvm/trunk/test/common

[lordhoto at users.sourceforge.net]

Revision: 40054
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40054&view=rev
Author:   lordhoto
Date:     2009-04-21 19:14:11 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
Fix warnings (patch for array.h was supplied via salty-horse on IRC).

Modified Paths:
--------------
    scummvm/trunk/test/common/array.h
    scummvm/trunk/test/common/list.h

Modified: scummvm/trunk/test/common/array.h
===================================================================
--- scummvm/trunk/test/common/array.h	2009-04-21 18:54:35 UTC (rev 40053)
+++ scummvm/trunk/test/common/array.h	2009-04-21 19:14:11 UTC (rev 40054)
@@ -74,7 +74,7 @@
 		TS_ASSERT_EQUALS( array[3], 25 );
 		TS_ASSERT_EQUALS( array[4], -11 );
 
-		TS_ASSERT_EQUALS( array.size(), 5 );
+		TS_ASSERT_EQUALS( array.size(), (unsigned int)5 );
 	}
 
 	void test_remove_at() {
@@ -95,7 +95,7 @@
 		TS_ASSERT_EQUALS( array[2], 25 );
 		TS_ASSERT_EQUALS( array[3], -11 );
 
-		TS_ASSERT_EQUALS( array.size(), 4 );
+		TS_ASSERT_EQUALS( array.size(), (unsigned int)4 );
 	}
 
 	void test_push_back() {
@@ -119,8 +119,8 @@
 		TS_ASSERT_EQUALS( array1[4], -2 );
 		TS_ASSERT_EQUALS( array1[5], -131 );
 
-		TS_ASSERT_EQUALS( array1.size(), 6 );
-		TS_ASSERT_EQUALS( array2.size(), 3 );
+		TS_ASSERT_EQUALS( array1.size(), (unsigned int)6 );
+		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
 	}
 
 	void test_copy_constructor() {
@@ -137,7 +137,7 @@
 		TS_ASSERT_EQUALS( array2[1], 5 );
 		TS_ASSERT_EQUALS( array2[2], 9 );
 
-		TS_ASSERT_EQUALS( array2.size(), 3 );
+		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
 	}
 
 	void test_array_constructor() {
@@ -149,6 +149,6 @@
 		TS_ASSERT_EQUALS( array2[1], 5 );
 		TS_ASSERT_EQUALS( array2[2], 9 );
 
-		TS_ASSERT_EQUALS( array2.size(), 3 );
+		TS_ASSERT_EQUALS( array2.size(), (unsigned int)3 );
 	}
 };

Modified: scummvm/trunk/test/common/list.h
===================================================================
--- scummvm/trunk/test/common/list.h	2009-04-21 18:54:35 UTC (rev 40053)
+++ scummvm/trunk/test/common/list.h	2009-04-21 19:14:11 UTC (rev 40054)
@@ -18,13 +18,13 @@
 	public:
 	void test_size() {
 		Common::List<int> container;
-		TS_ASSERT_EQUALS( container.size(), 0 );
+		TS_ASSERT_EQUALS( container.size(), (unsigned int)0 );
 		container.push_back(17);
-		TS_ASSERT_EQUALS( container.size(), 1 );
+		TS_ASSERT_EQUALS( container.size(), (unsigned int)1 );
 		container.push_back(33);
-		TS_ASSERT_EQUALS( container.size(), 2 );
+		TS_ASSERT_EQUALS( container.size(), (unsigned int)2 );
 		container.clear();
-		TS_ASSERT_EQUALS( container.size(), 0 );
+		TS_ASSERT_EQUALS( container.size(), (unsigned int)0 );
 	}
 
 	void test_iterator_begin_end() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.