llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 03:32:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qualify some type names that I thought were fine, but some of the bots don't like.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291580 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-01-10 18:40:01 +00:00
parent f6c0b90773
commit bd7c88461b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/memory
View File

@@ -4713,7 +4713,7 @@ inline _LIBCPP_INLINE_VISIBILITY
typename enable_if typename enable_if
< <
!is_array<_Yp>::value && !is_array<_Yp>::value &&
is_convertible<_Yp*, element_type*>::value, is_convertible<_Yp*, typename shared_ptr<_Tp>::element_type*>::value,
shared_ptr<_Tp>& shared_ptr<_Tp>&
>::type >::type
shared_ptr<_Tp>::operator=(auto_ptr<_Yp> __r) shared_ptr<_Tp>::operator=(auto_ptr<_Yp> __r)
@@ -4728,7 +4728,8 @@ inline _LIBCPP_INLINE_VISIBILITY
typename enable_if typename enable_if
< <
!is_array<_Yp>::value && !is_array<_Yp>::value &&
is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value, is_convertible<typename unique_ptr<_Yp, _Dp>::pointer,
typename shared_ptr<_Tp>::element_type*>::value,
shared_ptr<_Tp>& shared_ptr<_Tp>&
>::type >::type
shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r) shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r)