From: Marc Celani <marccelani@fb.com>
Date: Wed, 7 May 2014 03:43:41 +0000 (-0700)
Subject: Fix rebase fail
X-Git-Tag: v0.22.0~556
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2aad5a96331b40d84a4158d46c1624b5ea74d13a;p=folly.git

Fix rebase fail

Summary: whoops

Test Plan: reran unit tests

Reviewed By: davejwatson@fb.com

Blame Rev:
---

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: