From: Jim Meyering <meyering@fb.com>
Date: Sun, 19 Mar 2017 02:53:26 +0000 (-0700)
Subject: folly/test/TimeseriesTest.cpp: avoid shadowing warnings
X-Git-Tag: v2017.03.20.00^0
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=5d9dbb73c161a0c9d3f4b3d7275350c16969ae24

folly/test/TimeseriesTest.cpp: avoid shadowing warnings

Summary:
Fix warnings exposed by gcc's -Wshadow-compatible-local.
Rename lambda parameter "ts" to "timeSeries".

This avoids the following errors:

  folly/test/TimeseriesTest.cpp:802:27: error: declaration of 'ts' shadows a previous local [-Werror=shadow-compatible-local]
  folly/test/TimeseriesTest.cpp:809:31: error: shadowed declaration is here [-Werror=shadow-compatible-local]

Reviewed By: yfeldblum, liuxuli

Differential Revision: D4735180

fbshipit-source-id: 59b3fecf4031b3c6615e5b764fbc4ea04754eb50
---

diff --git a/folly/test/TimeseriesTest.cpp b/folly/test/TimeseriesTest.cpp
index 27e73117..02e86594 100644
--- a/folly/test/TimeseriesTest.cpp
+++ b/folly/test/TimeseriesTest.cpp
@@ -799,10 +799,10 @@ TEST(BucketedTimeSeries, addHistorical) {
 }
 
 TEST(BucketedTimeSeries, reConstructEmptyTimeSeries) {
-  auto verify = [](auto ts) {
-    EXPECT_TRUE(ts.empty());
-    EXPECT_EQ(0, ts.sum());
-    EXPECT_EQ(0, ts.count());
+  auto verify = [](auto timeSeries) {
+    EXPECT_TRUE(timeSeries.empty());
+    EXPECT_EQ(0, timeSeries.sum());
+    EXPECT_EQ(0, timeSeries.count());
   };
 
   // Create a 100 second timeseries with 10 buckets_