1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00

Update Role.hpp

This commit is contained in:
Sandu Liviu Catalin 2021-09-18 21:35:30 +03:00
parent 0487f26865
commit 87cb6a2cba

View File

@ -59,11 +59,7 @@ struct DpRole
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Destructor. * Destructor.
*/ */
~DpRole() noexcept ~DpRole() noexcept { Cleanup(); }
{
// Do we own this to try delete it?
if (!mOwned && mPtr) [[maybe_unused]] auto p = mPtr.release();
}
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Copy assignment operator (disabled). * Copy assignment operator (disabled).
*/ */
@ -74,14 +70,24 @@ struct DpRole
DpRole & operator = (DpRole && o) noexcept DpRole & operator = (DpRole && o) noexcept
{ {
if (this != &o) { if (this != &o) {
// Do we own this to try delete it? Cleanup();
if (!mOwned && mPtr) [[maybe_unused]] auto p = mPtr.release();
// Transfer members values // Transfer members values
mPtr = std::move(o.mPtr); mPtr = std::move(o.mPtr);
mOwned = o.mOwned; mOwned = o.mOwned;
} }
return *this; return *this;
} }
/* --------------------------------------------------------------------------------------------
* Release any referenced resources and default to an empty/invalid state.
*/
void Cleanup()
{
// Do we own this to try delete it?
if (!mOwned && mPtr) {
// Not our job, simply forget about it
[[maybe_unused]] auto p = mPtr.release();
} else mPtr.reset(); // We own this so delete the instance
}
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Validate the managed handle. * Validate the managed handle.
*/ */