From bd7c88461bf08a50036700100def7d555c20da48 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 10 Jan 2017 18:40:01 +0000 Subject: [PATCH] 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/memory b/include/memory index 588b3ce10..2a25f0ecb 100644 --- a/include/memory +++ b/include/memory @@ -4713,7 +4713,7 @@ inline _LIBCPP_INLINE_VISIBILITY 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 @@ inline _LIBCPP_INLINE_VISIBILITY typename enable_if < !is_array<_Yp>::value && - is_convertible::pointer, element_type*>::value, + is_convertible::pointer, + typename shared_ptr<_Tp>::element_type*>::value, shared_ptr<_Tp>& >::type shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r)