Commit 20589911 authored by paul.lind's avatar paul.lind Committed by Commit bot

Fix gcc 4.9.2 signed-compare error.

From 60e7ea8a / https://codereview.chromium.org/1409993012

BUG=

Review URL: https://codereview.chromium.org/1442143003

Cr-Commit-Position: refs/heads/master@{#31999}
parent 1f4d9ecf
...@@ -116,8 +116,8 @@ TEST(CancelableTask, SequentialMultipleTasks) { ...@@ -116,8 +116,8 @@ TEST(CancelableTask, SequentialMultipleTasks) {
TestTask* task2 = new TestTask(&manager, &result2); TestTask* task2 = new TestTask(&manager, &result2);
SequentialRunner runner1(task1); SequentialRunner runner1(task1);
SequentialRunner runner2(task2); SequentialRunner runner2(task2);
EXPECT_EQ(task1->id(), 1); EXPECT_EQ(task1->id(), 1u);
EXPECT_EQ(task2->id(), 2); EXPECT_EQ(task2->id(), 2u);
EXPECT_EQ(GetValue(&result1), 0); EXPECT_EQ(GetValue(&result1), 0);
runner1.Run(); // Don't touch task1 after running it. runner1.Run(); // Don't touch task1 after running it.
...@@ -181,7 +181,7 @@ TEST(CancelableTask, RemoveBeforeCancelAndWait) { ...@@ -181,7 +181,7 @@ TEST(CancelableTask, RemoveBeforeCancelAndWait) {
TestTask* task1 = new TestTask(&manager, &result1, TestTask::kCheckNotRun); TestTask* task1 = new TestTask(&manager, &result1, TestTask::kCheckNotRun);
ThreadedRunner runner1(task1); ThreadedRunner runner1(task1);
uint32_t id = task1->id(); uint32_t id = task1->id();
EXPECT_EQ(id, 1); EXPECT_EQ(id, 1u);
EXPECT_TRUE(manager.TryAbort(id)); EXPECT_TRUE(manager.TryAbort(id));
runner1.Start(); runner1.Start();
runner1.Join(); runner1.Join();
...@@ -196,7 +196,7 @@ TEST(CancelableTask, RemoveAfterCancelAndWait) { ...@@ -196,7 +196,7 @@ TEST(CancelableTask, RemoveAfterCancelAndWait) {
TestTask* task1 = new TestTask(&manager, &result1); TestTask* task1 = new TestTask(&manager, &result1);
ThreadedRunner runner1(task1); ThreadedRunner runner1(task1);
uint32_t id = task1->id(); uint32_t id = task1->id();
EXPECT_EQ(id, 1); EXPECT_EQ(id, 1u);
runner1.Start(); runner1.Start();
runner1.Join(); runner1.Join();
manager.CancelAndWait(); manager.CancelAndWait();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment