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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291580 91177308-0d34-0410-b5e6-96231b3b80d8

include/memory

diff --git a/include/memory b/include/memory
index 588b3ce..2a25f0e 100644
--- a/include/memory
+++ b/include/memory
@@ -4713,7 +4713,7 @@
 typename enable_if
 <
     !is_array<_Yp>::value &&
-    is_convertible<_Yp*, element_type*>::value,
+    is_convertible<_Yp*, typename shared_ptr<_Tp>::element_type*>::value,
     shared_ptr<_Tp>&
 >::type
 shared_ptr<_Tp>::operator=(auto_ptr<_Yp> __r)
@@ -4728,7 +4728,8 @@
 typename enable_if
 <
     !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>&
 >::type
 shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r)