commit 886c6a645f451ddb56df609c2bb6fe7388045f3e
author Marshall Clow <mclow.lists@gmail.com> Mon Apr 07 13:32:26 2014 +0000
committer Marshall Clow <mclow.lists@gmail.com> Mon Apr 07 13:32:26 2014 +0000
tree d6377bd7e73b6f6ec5196121218b2f9fb7bc5314
parent edc8cbf9a5c929789e88e34fa532204aa235c278

Fix PR19819

llvm-svn: 205709

libcxx/include/future

diff --git a/libcxx/include/future b/libcxx/include/future
index 73d5456..de00f25 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -1872,7 +1872,7 @@
 __packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(_Fp&& __f)
     : __f_(nullptr)
 {
-    typedef typename remove_reference<_Fp>::type _FR;
+    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
     typedef __packaged_task_func<_FR, allocator<_FR>, _Rp(_ArgTypes...)> _FF;
     if (sizeof(_FF) <= sizeof(__buf_))
     {
@@ -1897,7 +1897,7 @@
     : __f_(nullptr)
 {
     typedef allocator_traits<_Alloc> __alloc_traits;
-    typedef typename remove_reference<_Fp>::type _FR;
+    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
     typedef __packaged_task_func<_FR, _Alloc, _Rp(_ArgTypes...)> _FF;
     if (sizeof(_FF) <= sizeof(__buf_))
     {