commit ca740483988a36f54a94ecb515d23f055fddf384
author Howard Hinnant <hhinnant@apple.com> Fri Nov 19 22:17:28 2010
committer Howard Hinnant <hhinnant@apple.com> Fri Nov 19 22:17:28 2010
tree e24bf6469057fedb0e402f6e6ad51a193561b978
parent dfb8c3bbfcab611b98f6d8a532e67169bb46ece4

N3142.  Many of these traits are just placeholders with medium quality emulation; waiting on compiler intrinsics to do it right.

llvm-svn: 119854

libcxx/include/iterator

diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 0ad489b..6fcb259 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -1038,7 +1038,7 @@
 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 @@
     friend
     typename enable_if
     <
-        has_trivial_copy_assign<_Tp>::value,
+        is_trivially_copy_assignable<_Tp>::value,
         _Tp*
     >::type
     __unwrap_iter(__wrap_iter<_Tp*>);