commit 0337adeec470b881b3670c3a23807f211b9e6f58
author Howard Hinnant <hhinnant@apple.com> Fri May 04 17:21:02 2012 +0000
committer Howard Hinnant <hhinnant@apple.com> Fri May 04 17:21:02 2012 +0000
tree 0900e5253786b3eb353fb5b60fd5462fbd314aaf
parent 02b4bf34060d63d2a715cf7ac00602609daa0bed

Constrain __bind functor constructor such that it won't accidentally get used as a copy constructor from a non-const lvalue.  Fixes <rdar://problem/11359080>.

llvm-svn: 156182
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: df7aad41fd347e82dbab24fdc7c2fbaa6ca767fb

include/functional

diff --git a/include/functional b/include/functional
index 884a577..495ca7c 100644
--- a/include/functional
+++ b/include/functional
@@ -1707,7 +1707,11 @@
 
 #endif  // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
 
-    template <class _Gp, class ..._BA>
+    template <class _Gp, class ..._BA,
+              class = typename enable_if
+                               <
+                                  is_constructible<_Fd, _Gp>::value
+                               >::type>
       _LIBCPP_INLINE_VISIBILITY
       explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
         : __f_(_VSTD::forward<_Gp>(__f)),