From 99e4b40a55d0c501c02e2b28abdbc55d8ba58369 Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Thu, 27 Feb 2014 17:55:10 -0800 Subject: [PATCH] Fix the [-Werror=sign-compare] issues Summary: Test Plan: Reviewers: CC: Task ID: # Blame Rev: --- util/thread_local_test.cc | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/util/thread_local_test.cc b/util/thread_local_test.cc index bc7aa5b52..2d663f31c 100644 --- a/util/thread_local_test.cc +++ b/util/thread_local_test.cc @@ -58,45 +58,45 @@ TEST(ThreadLocalTest, UniqueIdTest) { port::Mutex mu; port::CondVar cv(&mu); - ASSERT_EQ(IDChecker::PeekId(), 0); + ASSERT_EQ(IDChecker::PeekId(), 0u); // New ThreadLocal instance bumps id by 1 { // Id used 0 - Params p1(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 1); + Params p1(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 1u); // Id used 1 - Params p2(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 2); + Params p2(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 2u); // Id used 2 - Params p3(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 3); + Params p3(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 3u); // Id used 3 - Params p4(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 4); + Params p4(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 4u); } // id 3, 2, 1, 0 are in the free queue in order - ASSERT_EQ(IDChecker::PeekId(), 0); + ASSERT_EQ(IDChecker::PeekId(), 0u); // pick up 0 - Params p1(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 1); + Params p1(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 1u); // pick up 1 - Params* p2 = new Params(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 2); + Params* p2 = new Params(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 2u); // pick up 2 - Params p3(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 3); + Params p3(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 3u); // return up 1 delete p2; - ASSERT_EQ(IDChecker::PeekId(), 1); + ASSERT_EQ(IDChecker::PeekId(), 1u); // Now we have 3, 1 in queue // pick up 1 - Params p4(&mu, &cv, nullptr, 1); - ASSERT_EQ(IDChecker::PeekId(), 3); + Params p4(&mu, &cv, nullptr, 1u); + ASSERT_EQ(IDChecker::PeekId(), 3u); // pick up 3 - Params p5(&mu, &cv, nullptr, 1); + Params p5(&mu, &cv, nullptr, 1u); // next new id - ASSERT_EQ(IDChecker::PeekId(), 4); + ASSERT_EQ(IDChecker::PeekId(), 4u); // After exit, id sequence in queue: // 3, 1, 2, 0 }