commit 25bcaf6aa9602fb6df3ba3a4a5ab21c8db97ddf4
author Howard Hinnant <hhinnant@apple.com> Fri Sep 13 23:56:00 2013 +0000
committer Howard Hinnant <hhinnant@apple.com> Fri Sep 13 23:56:00 2013 +0000
tree dfeebc417fb14e77a898cb1ed2107539fe77d3e3
parent a77b71b363f29e8c37ba354d2546a87c7bcfedf3

G M: Make shared_ptr a little more gentle for some compilers.  No impact on clang.

llvm-svn: 190732
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 84f996fb2e4865452220fce20e2d16890b500828

include/memory

diff --git a/include/memory b/include/memory
index 79cfe9d..3a98d1d 100644
--- a/include/memory
+++ b/include/memory
@@ -3895,8 +3895,8 @@
         <
             !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<class _Yp>
@@ -4522,8 +4522,8 @@
 <
     !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);