From: Jim Meyering <meyering@fb.com>
Date: Mon, 19 Dec 2016 17:53:32 +0000 (-0800)
Subject: folly/fibers/TimedMutex-inl.h: avoid shadowing warnings
X-Git-Tag: v2017.03.06.00~182
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=a7ddbd6f931cabad893b559490b948ecb87b1bca

folly/fibers/TimedMutex-inl.h: avoid shadowing warnings

Summary:
Fix a warning exposed by gcc's -Wshadow-compatible-local.

Rename inner "lockStolen" to "stolen".

Differential Revision: D4346385

fbshipit-source-id: 323cb6c96ecfe18b5540525f4124dbd75faf0b1b
---

diff --git a/folly/fibers/TimedMutex-inl.h b/folly/fibers/TimedMutex-inl.h
index 26e523c7..b6736cd5 100644
--- a/folly/fibers/TimedMutex-inl.h
+++ b/folly/fibers/TimedMutex-inl.h
@@ -61,9 +61,9 @@ TimedMutex::LockResult TimedMutex::lockHelper(WaitFunc&& waitFunc) {
     auto lockStolen = [&] {
       std::lock_guard<folly::SpinLock> lg(lock_);
 
-      auto lockStolen = notifiedFiber_ != &waiter;
+      auto stolen = notifiedFiber_ != &waiter;
       notifiedFiber_ = nullptr;
-      return lockStolen;
+      return stolen;
     }();
 
     if (lockStolen) {