aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-04-21 19:14:11 +0000
committerJohannes Schickel2009-04-21 19:14:11 +0000
commit1453f1849b254d7e68675d0ff3da990b5749f82b (patch)
treea3149ea2de7b6441518873d3b921bfde8f36b292
parent283788ec4e39018ce10909d4b9f543025103bf5c (diff)
downloadscummvm-rg350-1453f1849b254d7e68675d0ff3da990b5749f82b.tar.gz
scummvm-rg350-1453f1849b254d7e68675d0ff3da990b5749f82b.tar.bz2
scummvm-rg350-1453f1849b254d7e68675d0ff3da990b5749f82b.zip
Fix warnings (patch for array.h was supplied via salty-horse on IRC).
svn-id: r40054
-rw-r--r--test/common/array.h12
-rw-r--r--test/common/list.h8
2 files changed, 10 insertions, 10 deletions
diff --git a/test/common/array.h b/test/common/array.h
index ad92acaf3a..5ee117e524 100644
--- a/test/common/array.h
+++ b/test/common/array.h
@@ -74,7 +74,7 @@ class ArrayTestSuite : public CxxTest::TestSuite
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 @@ class ArrayTestSuite : public CxxTest::TestSuite
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 @@ class ArrayTestSuite : public CxxTest::TestSuite
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 @@ class ArrayTestSuite : public CxxTest::TestSuite
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 @@ class ArrayTestSuite : public CxxTest::TestSuite
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 );
}
};
diff --git a/test/common/list.h b/test/common/list.h
index ef00a0d2a9..629150d554 100644
--- a/test/common/list.h
+++ b/test/common/list.h
@@ -18,13 +18,13 @@ class ListTestSuite : public CxxTest::TestSuite
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() {