From 2aad5a96331b40d84a4158d46c1624b5ea74d13a Mon Sep 17 00:00:00 2001 From: Marc Celani Date: Tue, 6 May 2014 20:43:41 -0700 Subject: [PATCH] Fix rebase fail Summary: whoops Test Plan: reran unit tests Reviewed By: davejwatson@fb.com Blame Rev: --- folly/ExceptionWrapper.h | 1 + 1 file changed, 1 insertion(+) diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h index a18ee1f0..9174f6f7 100644 --- a/folly/ExceptionWrapper.h +++ b/folly/ExceptionWrapper.h @@ -127,6 +127,7 @@ class exception_wrapper { } catch (...) { return std::current_exception(); } + return std::exception_ptr(); } private: -- 2.34.1