Fix rebase fail
authorMarc Celani <marccelani@fb.com>
Wed, 7 May 2014 03:43:41 +0000 (20:43 -0700)
committerDave Watson <davejwatson@fb.com>
Tue, 20 May 2014 19:53:58 +0000 (12:53 -0700)
Summary: whoops

Test Plan: reran unit tests

Reviewed By: davejwatson@fb.com

Blame Rev:

folly/ExceptionWrapper.h

index a18ee1f01b702caacccb6ab97b0d59f98e0d4166..9174f6f7bb44276d4618ad84ed11723e6f6756a6 100644 (file)
@@ -127,6 +127,7 @@ class exception_wrapper {
     } catch (...) {
       return std::current_exception();
     }
+    return std::exception_ptr();
   }
 
  private: