generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes test build errors (warnings treated as errors) in system_wrappers.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/212003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@725 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2011-10-11 14:49:27 +00:00
parent 26c9ff983e
commit a0258defd4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/system_wrappers/source/list_unittest.cc
View File

@ -360,7 +360,7 @@ TEST(ListWrapperTest,PopTest) {
ASSERT_FALSE(ascending_list == NULL);
ASSERT_FALSE(ascending_list->Empty());
EXPECT_EQ(0,ascending_list->PopFront());
EXPECT_EQ(1,ascending_list->GetUnsignedItem(ascending_list->First()));
EXPECT_EQ(1U, ascending_list->GetUnsignedItem(ascending_list->First()));
EXPECT_EQ(0,ascending_list->PopBack());
EXPECT_EQ(kNumberOfElements - 2,ascending_list->GetUnsignedItem(
@ -377,14 +377,14 @@ TEST(ListWrapperTest,InterLeaveTest) {
ListWrapperSimple* decending_list = CreateDecendingList(rand()%2);
ASSERT_FALSE(decending_list == NULL);
for (int i = 0; i < kNumberOfElements/2; ++i) {
for (unsigned int i = 0; i < kNumberOfElements/2; ++i) {
ASSERT_EQ(0,interleave_list->PopBack());
ASSERT_EQ(0,decending_list->PopBack());
}
ASSERT_EQ(kNumberOfElements/2,interleave_list->GetSize());
ASSERT_EQ(kNumberOfElements/2,decending_list->GetSize());
int insert_position = kNumberOfElements/2;
unsigned int insert_position = kNumberOfElements/2;
ASSERT_EQ(insert_position * 2, kNumberOfElements);
while (!decending_list->Empty())
{
@ -398,7 +398,7 @@ TEST(ListWrapperTest,InterLeaveTest) {
ASSERT_FALSE(insert_item == NULL);
item = interleave_list->First();
ASSERT_FALSE(item == NULL);
for (int j = 0; j < insert_position - 1; ++j) {
for (unsigned int j = 0; j < insert_position - 1; ++j) {
item = interleave_list->Next(item);
ASSERT_FALSE(item == NULL);
}
@ -425,14 +425,14 @@ TEST(ListWrapperTest,InterLeaveTestII) {
ListWrapperSimple* ascending_list = CreateAscendingList(rand()%2);
ASSERT_FALSE(ascending_list == NULL);
for (int i = 0; i < kNumberOfElements/2; ++i) {
for (unsigned int i = 0; i < kNumberOfElements/2; ++i) {
ASSERT_EQ(0,interleave_list->PopBack());
ASSERT_EQ(0,ascending_list->PopBack());
}
ASSERT_EQ(kNumberOfElements/2,interleave_list->GetSize());
ASSERT_EQ(kNumberOfElements/2,ascending_list->GetSize());
int insert_position = kNumberOfElements/2;
unsigned int insert_position = kNumberOfElements/2;
ASSERT_EQ(insert_position * 2, kNumberOfElements);
while (!ascending_list->Empty())
{
@ -446,7 +446,7 @@ TEST(ListWrapperTest,InterLeaveTestII) {
ASSERT_FALSE(insert_item == NULL);
item = interleave_list->First();
ASSERT_FALSE(item == NULL);
for (int j = 0; j < insert_position - 1; ++j) {
for (unsigned int j = 0; j < insert_position - 1; ++j) {
item = interleave_list->Next(item);
ASSERT_FALSE(item == NULL);
}

4
src/system_wrappers/source/map_unittest.cc
View File

@ -15,7 +15,7 @@
using ::webrtc::MapWrapper;
using ::webrtc::MapItem;
const unsigned int kNumberOfElements = 10;
const int kNumberOfElements = 10;
int* ItemPointer(MapItem* item) {
if (item == NULL) {
@ -48,7 +48,7 @@ void PrintToConsole(const char* message, bool supress) {
if (supress) {
return;
}
printf(message);
printf("%s", message);
}
bool CreateAscendingMap(MapWrapper* ascending_map) {