kcat
/
openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify some move assignments

master
Chris Robinson 2022-03-25 16:36:46 -07:00
parent b80dc50495
commit 6d0bd1a532
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/comptr.h
View File

@ -46,10 +46,8 @@ public:
{
if(likely(&rhs != this))
{
if(mPtr)
mPtr->Release();
mPtr = rhs.mPtr;
rhs.mPtr = nullptr;
if(mPtr) mPtr->Release();
mPtr = std::exchange(rhs.mPtr, nullptr);
}
return *this;
}

8
common/intrusive_ptr.h
View File

@ -62,6 +62,8 @@ public:
intrusive_ptr& operator=(const intrusive_ptr &rhs) noexcept
{
static_assert(noexcept(std::declval<T*>()->release()), "release must be noexcept");
if(rhs.mPtr) rhs.mPtr->add_ref();
if(mPtr) mPtr->release();
mPtr = rhs.mPtr;
@ -71,10 +73,8 @@ public:
{
if(likely(&rhs != this))
{
if(mPtr)
mPtr->release();
mPtr = rhs.mPtr;
rhs.mPtr = nullptr;
if(mPtr) mPtr->release();
mPtr = std::exchange(rhs.mPtr, nullptr);
}
return *this;
}