From 6786799608b6ef203db9d7e880b99d0bc7330ede Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Mon, 4 Dec 2017 20:57:02 -0800
Subject: [PATCH] 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
---
 folly/futures/Future.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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>
-- 
2.34.1