diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2010-11-19 22:17:28 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2010-11-19 22:17:28 +0000 |
| commit | ca740483988a36f54a94ecb515d23f055fddf384 (patch) | |
| tree | e24bf6469057fedb0e402f6e6ad51a193561b978 /libcxx/include/utility | |
| parent | dfb8c3bbfcab611b98f6d8a532e67169bb46ece4 (diff) | |
| download | bcm5719-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/utility')
| -rw-r--r-- | libcxx/include/utility | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index f4c94bea94f..f8a8fc529a9 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -38,7 +38,7 @@ template <class T> typename remove_reference<T>::type&& move(T&&); template <class T> typename conditional < - !has_nothrow_move_constructor<T>::value && has_copy_constructor<T>::value, + !is_nothrow_move_constructible<T>::value && is_copy_constructible<T>::value, const T&, T&& >::type @@ -178,7 +178,7 @@ inline _LIBCPP_INLINE_VISIBILITY #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES typename conditional < - !has_nothrow_move_constructor<_Tp>::value && has_copy_constructor<_Tp>::value, + !is_nothrow_move_constructible<_Tp>::value && is_copy_constructible<_Tp>::value, const _Tp&, _Tp&& >::type |
