Revert "Core/RefCounted: Remove persistent boolean"
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]]. Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]] Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98] Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
This commit is contained in:
@@ -23,10 +23,13 @@ namespace Nz
|
||||
*/
|
||||
|
||||
/*!
|
||||
* \brief Constructs a RefCounted object
|
||||
* \brief Constructs a RefCounted object with a persistance aspect
|
||||
*
|
||||
* \param persistent if false, object is destroyed when no more referenced
|
||||
*/
|
||||
|
||||
RefCounted::RefCounted() :
|
||||
RefCounted::RefCounted(bool persistent) :
|
||||
m_persistent(persistent),
|
||||
m_referenceCount(0)
|
||||
{
|
||||
}
|
||||
@@ -64,6 +67,16 @@ namespace Nz
|
||||
return m_referenceCount;
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Checks whether the object is persistent
|
||||
* \return true if object is not destroyed when no more referenced
|
||||
*/
|
||||
|
||||
bool RefCounted::IsPersistent() const
|
||||
{
|
||||
return m_persistent;
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Removes a reference to the object
|
||||
* \return true if object is deleted because no more referenced
|
||||
@@ -81,7 +94,7 @@ namespace Nz
|
||||
}
|
||||
#endif
|
||||
|
||||
if (--m_referenceCount == 0)
|
||||
if (--m_referenceCount == 0 && !m_persistent)
|
||||
{
|
||||
delete this; // Suicide
|
||||
|
||||
@@ -90,4 +103,26 @@ namespace Nz
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Sets the persistence of the object
|
||||
* \return true if object is deleted because no more referenced
|
||||
*
|
||||
* \param persistent Sets the persistence of the object
|
||||
* \param checkReferenceCount Checks if the object should be destroyed if true
|
||||
*/
|
||||
|
||||
bool RefCounted::SetPersistent(bool persistent, bool checkReferenceCount)
|
||||
{
|
||||
m_persistent = persistent;
|
||||
|
||||
if (checkReferenceCount && !persistent && m_referenceCount == 0)
|
||||
{
|
||||
delete this;
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user