(wangle) fix shadow
authorHans Fugal <fugalh@fb.com>
Mon, 7 Jul 2014 16:01:47 +0000 (09:01 -0700)
committerTudor Bosman <tudorb@fb.com>
Wed, 9 Jul 2014 20:51:54 +0000 (13:51 -0700)
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

folly/wangle/Future-inl.h

index a8f5b94bb1da2d162981b43d9fbacd521f00d70f..3783126e8b72d624776556363def5863d4739f1c 100644 (file)
@@ -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;