From: Jim Meyering <meyering@fb.com>
Date: Wed, 19 Oct 2016 15:43:59 +0000 (-0700)
Subject: folly/test/SynchronizedTestLib-inl.h: avoid shadowing warnings
X-Git-Tag: v2016.10.24.00~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4bcf8a24b1f0acc376eb561ec78f171779c1a018;p=folly.git

folly/test/SynchronizedTestLib-inl.h: avoid shadowing warnings

Summary: Fix warnings exposed by the upstream-proposed -Wshadow-compatible-local option.

Reviewed By: igorsugak

Differential Revision: D4041931

fbshipit-source-id: fcddbc8636c16124a9711c4491a08cc7db76a224
---

diff --git a/folly/test/SynchronizedTestLib-inl.h b/folly/test/SynchronizedTestLib-inl.h
index 3bb89c4f..843d8240 100644
--- a/folly/test/SynchronizedTestLib-inl.h
+++ b/folly/test/SynchronizedTestLib-inl.h
@@ -468,15 +468,15 @@ void testDeprecated() {
     EXPECT_EQ(10, obj.back());
     EXPECT_EQ(1000, obj2->size());
 
-    UNSYNCHRONIZED(obj) {
-      EXPECT_EQ(1001, obj->size());
+    UNSYNCHRONIZED(o) {
+      EXPECT_EQ(1001, o->size());
     }
   }
 
   SYNCHRONIZED_CONST (obj) {
     EXPECT_EQ(1001, obj.size());
-    UNSYNCHRONIZED(obj) {
-      EXPECT_EQ(1001, obj->size());
+    UNSYNCHRONIZED(o) {
+      EXPECT_EQ(1001, o->size());
     }
   }