Fix more -Werror=sign-compare bugs with GCC 4.9.2

test/unittests/counters-unittest.cc

Index: test/unittests/counters-unittest.cc
diff --git a/test/unittests/counters-unittest.cc b/test/unittests/counters-unittest.cc
index dd60a0d9c1a7a87a9a9b3ee50e88300915969a4e..822a5c552ecb0b94addf11abb21878157693c85c 100644
--- a/test/unittests/counters-unittest.cc
+++ b/test/unittests/counters-unittest.cc
@@ -49,7 +49,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample1) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
 }
 
@@ -58,7 +58,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample2) {
   FLAG_histogram_interval = 10;
   AddSample(10, 500);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -69,7 +69,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample3) {
   AddSample(15, 500);
   AddSample(15, 1000);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -79,7 +79,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample4) {
   AddSample(10, 500);
   AddSample(15, 750);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -88,7 +88,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples1) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -99,7 +99,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples2) {
   AddSample(10, 1000);
   AddSample(20, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -111,7 +111,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples3) {
   AddSample(20, 1000);
   AddSample(20, 500);
   AddSample(30, 500);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(500, (*samples())[1]);
 }
@@ -121,7 +121,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples4) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(30, 0);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
   EXPECT_EQ(250, (*samples())[1]);
 }
@@ -131,7 +131,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples5) {
   FLAG_histogram_interval = 10;
   AddSample(10, 0);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(250, (*samples())[0]);
   EXPECT_EQ(750, (*samples())[1]);
 }
@@ -142,7 +142,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples6) {
   AddSample(10, 0);
   AddSample(15, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 1000) / 2, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -154,7 +154,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples7) {
   AddSample(15, 1000);
   AddSample(25, 0);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 750) / 2, (*samples())[0]);
   EXPECT_EQ((250 + 500) / 2, (*samples())[1]);
 }
@@ -166,7 +166,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples8) {
   AddSample(15, 0);
   AddSample(25, 1000);
   AddSample(30, 0);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 250) / 2, (*samples())[0]);
   EXPECT_EQ((750 + 500) / 2, (*samples())[1]);
 }
@@ -177,7 +177,7 @@ TEST_F(AggregatedMemoryHistogramTest, ManySamples1) {
   const int kMaxSamples = 1000;
   AddSample(0, 0);
   AddSample(10 * kMaxSamples, 10 * kMaxSamples);
-  EXPECT_EQ(kMaxSamples, samples()->size());
+  EXPECT_EQ(static_cast<unsigned>(kMaxSamples), samples()->size());
   for (int i = 0; i < kMaxSamples; i++) {
     EXPECT_EQ(i * 10 + 5, (*samples())[i]);
   }
@@ -189,7 +189,7 @@ TEST_F(AggregatedMemoryHistogramTest, ManySamples2) {
   const int kMaxSamples = 1000;
   AddSample(0, 0);
   AddSample(10 * (2 * kMaxSamples), 10 * (2 * kMaxSamples));
-  EXPECT_EQ(kMaxSamples, samples()->size());
+  EXPECT_EQ(static_cast<unsigned>(kMaxSamples), samples()->size());
   for (int i = 0; i < kMaxSamples; i++) {
     EXPECT_EQ(i * 10 + 5, (*samples())[i]);
   }