[Scummvm-cvs-logs] scummvm master -> da96f800169955ca4a94c76cfe2f8c061de99909

lordhoto lordhoto at gmail.com
Wed Feb 22 20:26:34 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da96f80016 TEST: Silence some signed/unsigned comparison warnings.


Commit: da96f800169955ca4a94c76cfe2f8c061de99909
    https://github.com/scummvm/scummvm/commit/da96f800169955ca4a94c76cfe2f8c061de99909
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-22T11:25:26-08:00

Commit Message:
TEST: Silence some signed/unsigned comparison warnings.

Changed paths:
    test/common/fixedstack.h
    test/common/stack.h



diff --git a/test/common/fixedstack.h b/test/common/fixedstack.h
index 9aa00b4..9d4cceb 100644
--- a/test/common/fixedstack.h
+++ b/test/common/fixedstack.h
@@ -18,18 +18,20 @@ public:
 	}
 
 	void test_size() {
-		Common::FixedStack<int> stack;
-		TS_ASSERT_EQUALS(stack.size(), 0);
+		typedef Common::FixedStack<int> Stack;
+
+		Stack stack;
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)0);
 
 		stack.push(5);
-		TS_ASSERT_EQUALS(stack.size(), 1);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)1);
 
 		stack.push(9);
 		stack.push(0);
-		TS_ASSERT_EQUALS(stack.size(), 3);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)3);
 
 		stack.pop();
-		TS_ASSERT_EQUALS(stack.size(), 2);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)2);
 	}
 
 	void test_top_pop() {
@@ -44,7 +46,7 @@ public:
 		stack[0] = -23;
 		stack.top() = 42;
 		TS_ASSERT_EQUALS(stack[0], -23);
-		TS_ASSERT_EQUALS(stack.top(),   42);
+		TS_ASSERT_EQUALS(stack.top(), 42);
 
 		stack.pop();
 		TS_ASSERT_EQUALS(stack[0], -23);
diff --git a/test/common/stack.h b/test/common/stack.h
index 0b1bcee..ed32ec6 100644
--- a/test/common/stack.h
+++ b/test/common/stack.h
@@ -18,18 +18,20 @@ public:
 	}
 
 	void test_size() {
-		Common::Stack<int> stack;
-		TS_ASSERT_EQUALS(stack.size(), 0);
+		typedef Common::Stack<int> Stack;
+
+		Stack stack;
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)0);
 
 		stack.push(5);
-		TS_ASSERT_EQUALS(stack.size(), 1);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)1);
 
 		stack.push(9);
 		stack.push(0);
-		TS_ASSERT_EQUALS(stack.size(), 3);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)3);
 
 		stack.pop();
-		TS_ASSERT_EQUALS(stack.size(), 2);
+		TS_ASSERT_EQUALS(stack.size(), (Stack::size_type)2);
 	}
 
 	void test_top_pop() {






More information about the Scummvm-git-logs mailing list