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

[lordhoto at users.sourceforge.net]

Revision: 30906
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30906&view=rev
Author:   lordhoto
Date:     2008-02-18 16:10:05 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Fixed some warnings.

Modified Paths:
--------------
    scummvm/trunk/test/common/pack.h
    scummvm/trunk/test/common/seekablesubreadstream.h

Modified: scummvm/trunk/test/common/pack.h
===================================================================
--- scummvm/trunk/test/common/pack.h	2008-02-18 23:24:31 UTC (rev 30905)
+++ scummvm/trunk/test/common/pack.h	2008-02-19 00:10:05 UTC (rev 30906)
@@ -22,15 +22,15 @@
 	public:
 	void test_packing( void )
 	{
-		TS_ASSERT_EQUALS( sizeof(TestStruct), 4+1+2+4+1 );
+		TS_ASSERT_EQUALS( sizeof(TestStruct), size_t(4+1+2+4+1) );
 	}
 
 	void test_offsets( void )
 	{
-		TS_ASSERT_EQUALS( OFFS(TestStruct, x), 0 );
-		TS_ASSERT_EQUALS( OFFS(TestStruct, y), 4 );
-		TS_ASSERT_EQUALS( OFFS(TestStruct, z), 5 );
-		TS_ASSERT_EQUALS( OFFS(TestStruct, a), 7 );
-		TS_ASSERT_EQUALS( OFFS(TestStruct, b), 11 );
+		TS_ASSERT_EQUALS( OFFS(TestStruct, x), (ptrdiff_t)0 );
+		TS_ASSERT_EQUALS( OFFS(TestStruct, y), (ptrdiff_t)4 );
+		TS_ASSERT_EQUALS( OFFS(TestStruct, z), (ptrdiff_t)5 );
+		TS_ASSERT_EQUALS( OFFS(TestStruct, a), (ptrdiff_t)7 );
+		TS_ASSERT_EQUALS( OFFS(TestStruct, b), (ptrdiff_t)11 );
 	}
 };

Modified: scummvm/trunk/test/common/seekablesubreadstream.h
===================================================================
--- scummvm/trunk/test/common/seekablesubreadstream.h	2008-02-18 23:24:31 UTC (rev 30905)
+++ scummvm/trunk/test/common/seekablesubreadstream.h	2008-02-19 00:10:05 UTC (rev 30906)
@@ -20,7 +20,7 @@
 		{
 			TS_ASSERT( !ssrs.eos() );
 
-			TS_ASSERT_EQUALS( i - start, ssrs.pos() );
+			TS_ASSERT_EQUALS( uint32(i - start), ssrs.pos() );
 
 			ssrs.read(&b, 1);
 			TS_ASSERT_EQUALS( i, b );
@@ -37,34 +37,34 @@
 		Common::SeekableSubReadStream ssrs = Common::SeekableSubReadStream(&ms, 1, 9);
 		byte b;
 
-		TS_ASSERT_EQUALS( ssrs.pos(), 0 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)0 );
 
 		ssrs.seek(1, SEEK_SET);
-		TS_ASSERT_EQUALS( ssrs.pos(), 1 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)1 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 2 );
 
 		ssrs.seek(5, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), 7 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)7 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 8 );
 
 		ssrs.seek(-3, SEEK_CUR);
-		TS_ASSERT_EQUALS( ssrs.pos(), 5 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)5 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 6 );
 
 		ssrs.seek(0, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), 8 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)8 );
 		TS_ASSERT( ssrs.eos() );
 
 		ssrs.seek(3, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), 5 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)5 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 6 );
 
 		ssrs.seek(8, SEEK_END);
-		TS_ASSERT_EQUALS( ssrs.pos(), 0 );
+		TS_ASSERT_EQUALS( ssrs.pos(), (uint32)0 );
 		b = ssrs.readByte();
 		TS_ASSERT_EQUALS( b, 1 );
 	}


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