From 69f1072ba22b0cd9747a11c002a0918ba5e05df1 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 20 Mar 2018 22:37:37 +0000 Subject: [PATCH] Implement LWG 3039 and 3041 - 'Treating Unnecessary decay'. llvm-svn: 328054 --- libcxx/include/future | 8 ++++---- libcxx/include/thread | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libcxx/include/future b/libcxx/include/future index a7c28a4..536574e 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -2021,7 +2021,7 @@ public: class = typename enable_if < !is_same< - typename decay<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -2032,7 +2032,7 @@ public: class = typename enable_if < !is_same< - typename decay<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -2150,7 +2150,7 @@ public: class = typename enable_if < !is_same< - typename decay<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type @@ -2161,7 +2161,7 @@ public: class = typename enable_if < !is_same< - typename decay<_Fp>::type, + typename __uncvref<_Fp>::type, packaged_task >::value >::type diff --git a/libcxx/include/thread b/libcxx/include/thread index 1b8dca3..0629d70 100644 --- a/libcxx/include/thread +++ b/libcxx/include/thread @@ -298,7 +298,7 @@ public: template ::type, thread>::value + !is_same::type, thread>::value >::type > _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS -- 2.7.4