commit c34f847b805325e167d09304f387a654a542175d
author Marshall Clow <mclow.lists@gmail.com> Sun May 10 13:59:45 2015 +0000
committer Marshall Clow <mclow.lists@gmail.com> Sun May 10 13:59:45 2015 +0000
tree b5e38d1604344a5828fa68e51ddf6ef37b3e6a9e
parent 0b0671ae36d8cab4ba8f1129b3c754b95ade6118

Fix for LWG Issue 2415: Inconsistency between unique_ptr and shared_ptr

llvm-svn: 236953

libcxx/include/memory

diff --git a/libcxx/include/memory b/libcxx/include/memory
index 3f7ea1a..eb4a30f 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -1639,7 +1639,7 @@
 struct __rebind_alloc_helper
 {
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-	typedef typename _Traits::template rebind_alloc<_Tp>        type;
+    typedef typename _Traits::template rebind_alloc<_Tp>        type;
 #else
     typedef typename _Traits::template rebind_alloc<_Tp>::other type;
 #endif
@@ -4277,9 +4277,16 @@
                             >::type)
     : __ptr_(__r.get())
 {
-    typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), __r.get_deleter(), allocator<_Yp>());
-    __enable_weak_this(__r.get());
+#if _LIBCPP_STD_VER > 11
+    if (__ptr_ == nullptr)
+        __cntrl_ = nullptr;
+    else
+#endif
+    {
+        typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
+        __cntrl_ = new _CntrlBlk(__r.get(), __r.get_deleter(), allocator<_Yp>());
+        __enable_weak_this(__r.get());
+    }
     __r.release();
 }
 
@@ -4299,11 +4306,18 @@
                             >::type)
     : __ptr_(__r.get())
 {
-    typedef __shared_ptr_pointer<_Yp*,
-                                 reference_wrapper<typename remove_reference<_Dp>::type>,
-                                 allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), ref(__r.get_deleter()), allocator<_Yp>());
-    __enable_weak_this(__r.get());
+#if _LIBCPP_STD_VER > 11
+    if (__ptr_ == nullptr)
+        __cntrl_ = nullptr;
+    else
+#endif
+    {
+        typedef __shared_ptr_pointer<_Yp*,
+                                     reference_wrapper<typename remove_reference<_Dp>::type>,
+                                     allocator<_Yp> > _CntrlBlk;
+        __cntrl_ = new _CntrlBlk(__r.get(), ref(__r.get_deleter()), allocator<_Yp>());
+        __enable_weak_this(__r.get());
+    }
     __r.release();
 }