generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The bind and function functor constructors and assignment operators were overly general and getting confused with the copy constructor and copy assignment operators. Constrained them. This fixes http://llvm.org/bugs/show_bug.cgi?id=16385

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185297 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-07-01 00:01:51 +00:00
parent c05e98660f
commit 099dec1ba0
2 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/functional
View File

@ -1139,8 +1139,11 @@ public:
function(const function&); function(const function&);
function(function&&) _NOEXCEPT; function(function&&) _NOEXCEPT;
template<class _Fp> template<class _Fp>
function(_Fp, function(_Fp, typename enable_if
typename enable_if<__callable<_Fp>::value>::type* = 0); <
__callable<_Fp>::value &&
!is_same<_Fp, function>::value
>::type* = 0);
template<class _Alloc> template<class _Alloc>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
@ -1162,7 +1165,8 @@ public:
template<class _Fp> template<class _Fp>
typename enable_if typename enable_if
< <
__callable<typename decay<_Fp>::type>::value, __callable<typename decay<_Fp>::type>::value &&
!is_same<typename remove_reference<_Fp>::type, function>::value,
function& function&
>::type >::type
operator=(_Fp&&); operator=(_Fp&&);
@ -1266,7 +1270,11 @@ function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
template<class _Rp, class ..._ArgTypes> template<class _Rp, class ..._ArgTypes>
template <class _Fp> template <class _Fp>
function<_Rp(_ArgTypes...)>::function(_Fp __f, function<_Rp(_ArgTypes...)>::function(_Fp __f,
typename enable_if<__callable<_Fp>::value>::type*) typename enable_if
<
__callable<_Fp>::value &&
!is_same<_Fp, function>::value
>::type*)
: __f_(0) : __f_(0)
{ {
if (__not_null(__f)) if (__not_null(__f))
@ -1370,7 +1378,8 @@ template<class _Rp, class ..._ArgTypes>
template <class _Fp> template <class _Fp>
typename enable_if typename enable_if
< <
function<_Rp(_ArgTypes...)>::template __callable<typename decay<_Fp>::type>::value, function<_Rp(_ArgTypes...)>::template __callable<typename decay<_Fp>::type>::value &&
!is_same<typename remove_reference<_Fp>::type, function<_Rp(_ArgTypes...)>>::value,
function<_Rp(_ArgTypes...)>& function<_Rp(_ArgTypes...)>&
>::type >::type
function<_Rp(_ArgTypes...)>::operator=(_Fp&& __f) function<_Rp(_ArgTypes...)>::operator=(_Fp&& __f)
@ -1749,7 +1758,9 @@ public:
template <class _Gp, class ..._BA, template <class _Gp, class ..._BA,
class = typename enable_if class = typename enable_if
< <
is_constructible<_Fd, _Gp>::value is_constructible<_Fd, _Gp>::value &&
!is_same<typename remove_reference<_Gp>::type,
__bind>::value
>::type> >::type>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit __bind(_Gp&& __f, _BA&& ...__bound_args) explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
@ -1814,7 +1825,13 @@ public:
#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS #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 &&
!is_same<typename remove_reference<_Gp>::type,
__bind_r>::value
>::type>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args) explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
: base(_VSTD::forward<_Gp>(__f), : base(_VSTD::forward<_Gp>(__f),

35
test/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp Normal file
View File

@ -0,0 +1,35 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <functional>
// template<CopyConstructible Fn, CopyConstructible... Types>
// unspecified bind(Fn, Types...);
// template<Returnable R, CopyConstructible Fn, CopyConstructible... Types>
// unspecified bind(Fn, Types...);
// http://llvm.org/bugs/show_bug.cgi?id=16385
#include <functional>
#include <cmath>
#include <cassert>
float _pow(float a, float b)
{
return std::pow(a, b);
}
int main()
{
std::function<float(float, float)> fnc = _pow;
auto task = std::bind(fnc, 2.f, 4.f);
auto task2(task);
assert(task() == 16);
assert(task2() == 16);
}