Add missing check against SemiFuture in FutureBase ctor

Summary: [Folly] Add missing check against `SemiFuture` in `FutureBase` ctor.

Reviewed By: LeeHowes

Differential Revision: D6469021

fbshipit-source-id: 0ca31461afee4bf64725e065a8cb4d5e933d2013

diff --git a/folly/futures/Future.h b/folly/futures/Future.h
index e6fc8ebeeacaa3102d994151fcda212c4e6efda3..5eda2c34b4d9c8d263815bfe3f1ea9b1b269440f 100644 (file)
--- a/folly/futures/Future.h
+++ b/folly/futures/Future.h
@@ -59,7 +59,8 @@ class FutureBase {
   template <
       class T2 = T,
       typename = typename std::enable_if<
   template <
       class T2 = T,
       typename = typename std::enable_if<

-          !isFuture<typename std::decay<T2>::type>::value>::type>
+          !isFuture<typename std::decay<T2>::type>::value &&
+          !isSemiFuture<typename std::decay<T2>::type>::value>::type>

   /* implicit */ FutureBase(T2&& val);
 
   template <class T2 = T>
   /* implicit */ FutureBase(T2&& val);
 
   template <class T2 = T>