From a0d5122fbea372d9f5c943f1418a8104e3b1774f Mon Sep 17 00:00:00 2001 From: Hans Fugal Date: Mon, 7 Jul 2014 09:01:47 -0700 Subject: [PATCH] (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 --- folly/wangle/Future-inl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Future::via(Executor* executor) { auto f = then([=](Try&& t) { MoveWrapper> promise; MoveWrapper> 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; -- 2.34.1