Commit 0e8d462a authored by James Sedgwick's avatar James Sedgwick Committed by Viswanath Sivakumar

fix shadowed variables

Summary: as above, fixes builds

Test Plan: compiled thrift + mcrouter

Reviewed By: seanc@fb.com

Subscribers: seanc, fugalh, folly-diffs@

FB internal diff: D1771910

Signature: t1:1771910:1420733490:7f33e57a5853395cab786e5d35d4c15c75a15c5a
parent 4ea6cf43
...@@ -370,8 +370,8 @@ Future<T>::onError(F&& func) { ...@@ -370,8 +370,8 @@ Future<T>::onError(F&& func) {
f2.setCallback_([pm](Try<T>&& t2) mutable { f2.setCallback_([pm](Try<T>&& t2) mutable {
pm->fulfilTry(std::move(t2)); pm->fulfilTry(std::move(t2));
}); });
} catch (const std::exception& e) { } catch (const std::exception& e2) {
pm->setException(exception_wrapper(std::current_exception(), e)); pm->setException(exception_wrapper(std::current_exception(), e2));
} catch (...) { } catch (...) {
pm->setException(exception_wrapper(std::current_exception())); pm->setException(exception_wrapper(std::current_exception()));
} }
...@@ -811,9 +811,9 @@ Future<T> Future<T>::within(Duration dur, E e, Timekeeper* tk) { ...@@ -811,9 +811,9 @@ Future<T> Future<T>::within(Duration dur, E e, Timekeeper* tk) {
try { try {
t.throwIfFailed(); t.throwIfFailed();
ctx->promise.setException(std::move(ctx->exception)); ctx->promise.setException(std::move(ctx->exception));
} catch (std::exception const& e) { } catch (std::exception const& e2) {
ctx->promise.setException( ctx->promise.setException(
exception_wrapper(std::current_exception(), e)); exception_wrapper(std::current_exception(), e2));
} catch (...) { } catch (...) {
ctx->promise.setException( ctx->promise.setException(
exception_wrapper(std::current_exception())); exception_wrapper(std::current_exception()));
......
...@@ -84,9 +84,9 @@ Promise<T>::setException(E const& e) { ...@@ -84,9 +84,9 @@ Promise<T>::setException(E const& e) {
} }
template <class T> template <class T>
void Promise<T>::setException(std::exception_ptr const& e) { void Promise<T>::setException(std::exception_ptr const& ep) {
try { try {
std::rethrow_exception(e); std::rethrow_exception(ep);
} catch (const std::exception& e) { } catch (const std::exception& e) {
setException(exception_wrapper(std::current_exception(), e)); setException(exception_wrapper(std::current_exception(), e));
} catch (...) { } catch (...) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment