maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix PR#18843. Thanks to Howard for the fix 

llvm-svn: 240136
This commit is contained in:
Marshall Clow 2015-06-19 15:54:13 +00:00
parent b6c13ff689
commit 55112defb0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcxx/include/memory
View File

@ -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

4
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
View File

@ -34,6 +34,10 @@ struct Z : Y {};
int main()
{
{ // https://llvm.org/bugs/show_bug.cgi?id=18843
std::shared_ptr<T const> t1(new T);
std::shared_ptr<T const> t2(std::make_shared<T>());
}
{
std::shared_ptr<Y> p(new Z);
std::shared_ptr<T> q = p->shared_from_this();