From 37c4acfe5e73271fa9c08148c9bb1de79f6a2d5a Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Fri, 13 Sep 2013 23:56:00 +0000 Subject: [PATCH] G M: Make shared_ptr a little more gentle for some compilers. No impact on clang. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@190732 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/memory | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/memory b/include/memory index 79cfe9df7..3a98d1d5e 100644 --- a/include/memory +++ b/include/memory @@ -3895,8 +3895,8 @@ public: < !is_array<_Yp>::value && is_convertible<_Yp*, element_type*>::value, - shared_ptr& - >::type + shared_ptr + >::type& operator=(auto_ptr<_Yp>&& __r); #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES template @@ -4522,8 +4522,8 @@ typename enable_if < !is_array<_Yp>::value && is_convertible<_Yp*, _Tp*>::value, - shared_ptr<_Tp>& ->::type + shared_ptr<_Tp> +>::type& shared_ptr<_Tp>::operator=(auto_ptr<_Yp>&& __r) { shared_ptr(_VSTD::move(__r)).swap(*this);