Fix PR#18843. Thanks to Howard for the fix

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@240136 91177308-0d34-0410-b5e6-96231b3b80d8
2015-06-19 15:54:13 +00:00
parent 3d08766099
commit c41133728d
2 changed files with 8 additions and 1 deletions
--- a/include/memory
+++ b/include/memory
@@ -4073,7 +4073,10 @@ private:
        __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT
        {
            if (__e)
-                __e->__weak_this_ = *this;
+            {
+                __e->__weak_this_.__ptr_ = const_cast<_Yp*>(static_cast<const _Yp*>(__e));
+                __e->__weak_this_.__cntrl_ = __cntrl_;
+            }
        }

    _LIBCPP_INLINE_VISIBILITY