fix gcc-5 build

[folly.git] / folly / test / TimeseriesHistogramTest.cpp

diff --git a/folly/test/TimeseriesHistogramTest.cpp b/folly/test/TimeseriesHistogramTest.cpp
index cb6d134e38b2d6d7a3177444e1d43e85e5e22b35..4ee4a69c85ab170f4bddcbdef465157106ab8126 100644 (file)
--- a/folly/test/TimeseriesHistogramTest.cpp
+++ b/folly/test/TimeseriesHistogramTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ TEST(TimeseriesHistogram, Percentile) {
     EXPECT_EQ(10, h.getMin());
     EXPECT_EQ(110, h.getMax());
 
-    for (int i = 0; i < h.getNumBuckets(); ++i) {
+    for (size_t i = 0; i < h.getNumBuckets(); ++i) {
       EXPECT_EQ(4, h.getBucket(i).numLevels());
     }
 
@@ -133,7 +133,7 @@ TEST(TimeseriesHistogram, String) {
 
     CHECK_EQ(IntMTMHTS::NUM_LEVELS, hist.getNumLevels());
 
-    for (int level = 0; level < hist.getNumLevels(); ++level) {
+    for (size_t level = 0; level < hist.getNumLevels(); ++level) {
       EXPECT_EQ(kStringValues1[level], hist.getString(level));
     }
 
@@ -150,7 +150,7 @@ TEST(TimeseriesHistogram, String) {
 
     CHECK_EQ(IntMTMHTS::NUM_LEVELS, hist.getNumLevels());
 
-    for (int level = 0; level < hist.getNumLevels(); ++level) {
+    for (size_t level = 0; level < hist.getNumLevels(); ++level) {
       EXPECT_EQ(kStringValues2[level], hist.getString(level));
     }
   }
@@ -172,7 +172,7 @@ TEST(TimeseriesHistogram, Clear) {
     // check clearing
     hist.clear();
 
-    for (int b = 0; b < hist.getNumBuckets(); ++b) {
+    for (size_t b = 0; b < hist.getNumBuckets(); ++b) {
       EXPECT_EQ(0, hist.getBucket(b).count(IntMTMHTS::MINUTE));
       EXPECT_EQ(0, hist.getBucket(b).count(IntMTMHTS::TEN_MINUTE));
       EXPECT_EQ(0, hist.getBucket(b).count(IntMTMHTS::HOUR));
@@ -217,7 +217,7 @@ TEST(TimeseriesHistogram, Basic) {
       EXPECT_EQ(expected, hist.getPercentileBucketMin(pct, IntMTMHTS::ALLTIME));
     }
 
-    for (int b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
+    for (size_t b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
       EXPECT_EQ(600, hist.getBucket(b).count(IntMTMHTS::MINUTE));
       EXPECT_EQ(6000, hist.getBucket(b).count(IntMTMHTS::TEN_MINUTE));
       EXPECT_EQ(36000, hist.getBucket(b).count(IntMTMHTS::HOUR));
@@ -296,11 +296,11 @@ TEST(TimeseriesHistogram, Basic) {
       EXPECT_EQ(expected, hist.getPercentileBucketMin(pct, IntMTMHTS::ALLTIME));
    }
 
-    for (int b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
-      EXPECT_EQ(600 * 2, hist.getBucket(b).count(IntMTMHTS::MINUTE));
-      EXPECT_EQ(6000 * 2, hist.getBucket(b).count(IntMTMHTS::TEN_MINUTE));
-      EXPECT_EQ(36000 * 2, hist.getBucket(b).count(IntMTMHTS::HOUR));
-      EXPECT_EQ(36000 * 2, hist.getBucket(b).count(IntMTMHTS::ALLTIME));
+   for (size_t b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
+     EXPECT_EQ(600 * 2, hist.getBucket(b).count(IntMTMHTS::MINUTE));
+     EXPECT_EQ(6000 * 2, hist.getBucket(b).count(IntMTMHTS::TEN_MINUTE));
+     EXPECT_EQ(36000 * 2, hist.getBucket(b).count(IntMTMHTS::HOUR));
+     EXPECT_EQ(36000 * 2, hist.getBucket(b).count(IntMTMHTS::ALLTIME));
     }
     EXPECT_EQ(0, hist.getBucket(0).count(IntMTMHTS::MINUTE));
     EXPECT_EQ(0, hist.getBucket(hist.getNumBuckets() - 1).count(
@@ -346,7 +346,7 @@ TEST(TimeseriesHistogram, Basic) {
               hist.getBucket(hist.getNumBuckets() - 1).count(
                 IntMTMHTS::ALLTIME));
 
-    for (int b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
+    for (size_t b = 1; (b + 1) < hist.getNumBuckets(); ++b) {
       EXPECT_EQ(600, hist.getBucket(b).count(IntMTMHTS::MINUTE));
       EXPECT_EQ(6000, hist.getBucket(b).count(IntMTMHTS::TEN_MINUTE));
       EXPECT_EQ(36000, hist.getBucket(b).count(IntMTMHTS::HOUR));