diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-08-29 01:43:41 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-08-29 01:43:41 +0000 |
| commit | 4268a742f5911a48ef460122847f81526232e1c0 (patch) | |
| tree | 64f9718eaa900eaf02d640a7451614fafa5d4023 /libcxx/include/utility | |
| parent | 67c234417412b2d27e30ec30d6883ab9c8d60fc6 (diff) | |
| download | bcm5719-llvm-4268a742f5911a48ef460122847f81526232e1c0.tar.gz bcm5719-llvm-4268a742f5911a48ef460122847f81526232e1c0.zip | |
Fix pair::operator=(TupleLike&&).
This assignment operator was previously broken since the SFINAE always resulted
in substitution failure. This caused assignments to turn into
copy construction + assignment.
This patch was originally committed as r279953 but was reverted due to warnings
in the test-suite. This new patch corrects those warnings.
llvm-svn: 279955
Diffstat (limited to 'libcxx/include/utility')
| -rw-r--r-- | libcxx/include/utility | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index fbb06f33526..095748d861b 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -515,7 +515,7 @@ struct _LIBCPP_TYPE_VIS_ONLY pair } template <class _Tuple, _EnableB< - _CheckTLC<_Tuple>::template __enable_assign() + _CheckTLC<_Tuple>::template __enable_assign<_Tuple>() > = false> _LIBCPP_INLINE_VISIBILITY pair& operator=(_Tuple&& __p) { |
