summaryrefslogtreecommitdiffstats
path: root/libcxx/include/iterator
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2010-11-19 22:17:28 +0000
committerHoward Hinnant <hhinnant@apple.com>2010-11-19 22:17:28 +0000
commitca740483988a36f54a94ecb515d23f055fddf384 (patch)
treee24bf6469057fedb0e402f6e6ad51a193561b978 /libcxx/include/iterator
parentdfb8c3bbfcab611b98f6d8a532e67169bb46ece4 (diff)
downloadbcm5719-llvm-ca740483988a36f54a94ecb515d23f055fddf384.tar.gz
bcm5719-llvm-ca740483988a36f54a94ecb515d23f055fddf384.zip
N3142. Many of these traits are just placeholders with medium quality emulation; waiting on compiler intrinsics to do it right.
llvm-svn: 119854
Diffstat (limited to 'libcxx/include/iterator')
-rw-r--r--libcxx/include/iterator4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 0ad489b9652..6fcb259f9a2 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -1038,7 +1038,7 @@ template <class _B1, class _B2> _B2 move_backward(_B1, _B1, _B2);
template <class _Tp>
typename enable_if
<
- has_trivial_copy_assign<_Tp>::value,
+ is_trivially_copy_assignable<_Tp>::value,
_Tp*
>::type
__unwrap_iter(__wrap_iter<_Tp*>);
@@ -1137,7 +1137,7 @@ private:
friend
typename enable_if
<
- has_trivial_copy_assign<_Tp>::value,
+ is_trivially_copy_assignable<_Tp>::value,
_Tp*
>::type
__unwrap_iter(__wrap_iter<_Tp*>);
OpenPOWER on IntegriCloud