From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Tue, 5 Dec 2017 04:57:02 +0000 (-0800)
Subject: Add missing check against SemiFuture in FutureBase ctor
X-Git-Tag: v2017.12.11.00~29
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=6786799608b6ef203db9d7e880b99d0bc7330ede

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 e6fc8ebe..5eda2c34 100644
--- 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<
-          !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>