summaryrefslogtreecommitdiffstats
path: root/libcxx/include/utility
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-08-29 01:09:47 +0000
committerEric Fiselier <eric@efcs.ca>2016-08-29 01:09:47 +0000
commit0678cc793a6d126b72cd20bb5d5a18f0eb6410cc (patch)
tree5d9a2dc48507fc69e71136eabc2a7599a5c9f1de /libcxx/include/utility
parent6b21751ba9f40dcc553b0d48033edec0f44ef32c (diff)
downloadbcm5719-llvm-0678cc793a6d126b72cd20bb5d5a18f0eb6410cc.tar.gz
bcm5719-llvm-0678cc793a6d126b72cd20bb5d5a18f0eb6410cc.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. llvm-svn: 279953
Diffstat (limited to 'libcxx/include/utility')
-rw-r--r--libcxx/include/utility2
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) {
OpenPOWER on IntegriCloud