From: Hans Fugal <fugalh@fb.com>
Date: Mon, 7 Jul 2014 16:01:47 +0000 (-0700)
Subject: (wangle) fix shadow
X-Git-Tag: v0.22.0~472
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a0d5122fbea372d9f5c943f1418a8104e3b1774f;p=folly.git

(wangle) fix shadow

Summary: Not sure why this shadow error didn't turn up in my tests, but whatevs

Test Plan: traffic manager builds without warning-errors

Reviewed By: suhas@fb.com

Subscribers: hannesr, net-systems@, fugalh, exa

FB internal diff: D1421495

Tasks: 4653938
---

diff --git a/folly/wangle/Future-inl.h b/folly/wangle/Future-inl.h
index a8f5b94b..3783126e 100644
--- a/folly/wangle/Future-inl.h
+++ b/folly/wangle/Future-inl.h
@@ -193,9 +193,9 @@ inline Future<T> Future<T>::via(Executor* executor) {
   auto f = then([=](Try<T>&& t) {
     MoveWrapper<Promise<T>> promise;
     MoveWrapper<Try<T>> tw(std::move(t));
-    auto f = promise->getFuture();
+    auto f2 = promise->getFuture();
     executor->add([=]() mutable { promise->fulfilTry(std::move(*tw)); });
-    return f;
+    return f2;
   });
   f.deactivate();
   return f;