diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-04-07 13:32:26 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-04-07 13:32:26 +0000 |
| commit | 886c6a645f451ddb56df609c2bb6fe7388045f3e (patch) | |
| tree | d6377bd7e73b6f6ec5196121218b2f9fb7bc5314 /libcxx/include/future | |
| parent | edc8cbf9a5c929789e88e34fa532204aa235c278 (diff) | |
| download | bcm5719-llvm-886c6a645f451ddb56df609c2bb6fe7388045f3e.tar.gz bcm5719-llvm-886c6a645f451ddb56df609c2bb6fe7388045f3e.zip | |
Fix PR19819
llvm-svn: 205709
Diffstat (limited to 'libcxx/include/future')
| -rw-r--r-- | libcxx/include/future | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 73d5456d717..de00f25d7fb 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -1872,7 +1872,7 @@ template <class _Fp> __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 @@ __packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function( : __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_)) { |
