[libcxx] r190732 - G M: Make shared_ptr a little more gentle for some compilers. No impact on clang.

Howard Hinnant hhinnant at apple.com
Fri Sep 13 16:56:00 PDT 2013


Author: hhinnant
Date: Fri Sep 13 18:56:00 2013
New Revision: 190732

URL: http://llvm.org/viewvc/llvm-project?rev=190732&view=rev
Log:
G M: Make shared_ptr a little more gentle for some compilers.  No impact on clang.

Modified:
    libcxx/trunk/include/memory

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=190732&r1=190731&r2=190732&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Fri Sep 13 18:56:00 2013
@@ -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<class _Yp>
@@ -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);





More information about the cfe-commits mailing list