mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added automatic up-casting to ReferenceCountedObjectPtr.

Browse source
This commit is contained in:
jules 2012-02-17 16:42:23 +00:00
parent 07189e3c23
commit b66a82aa44
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/juce_core/memory/juce_ReferenceCountedObject.h
View file

@ -219,7 +219,6 @@ public:
}
/** Copies another pointer.
This will increment the object's reference-count (if it is non-null).
*/
inline ReferenceCountedObjectPtr (const ReferenceCountedObjectPtr& other) noexcept
@ -230,6 +229,7 @@ public:
}
#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS
/** Takes-over the object from another pointer. */
inline ReferenceCountedObjectPtr (ReferenceCountedObjectPtr&& other) noexcept
: referencedObject (other.referencedObject)
{
@ -237,6 +237,17 @@ public:
}
#endif
/** Copies another pointer.
This will increment the object's reference-count (if it is non-null).
*/
template <class DerivedClass>
inline ReferenceCountedObjectPtr (const ReferenceCountedObjectPtr<DerivedClass>& other) noexcept
: referencedObject (static_cast <ReferenceCountedObjectClass*> (other.getObject()))
{
if (referencedObject != nullptr)
referencedObject->incReferenceCount();
}
/** Changes this pointer to point at a different object.
The reference count of the old object is decremented, and it might be
@ -244,24 +255,22 @@ public:
*/
ReferenceCountedObjectPtr& operator= (const ReferenceCountedObjectPtr& other)
{
ReferenceCountedObjectClass* const newObject = other.referencedObject;
return operator= (other.referencedObject);
}
if (newObject != referencedObject)
{
if (newObject != nullptr)
newObject->incReferenceCount();
/** Changes this pointer to point at a different object.
ReferenceCountedObjectClass* const oldObject = referencedObject;
referencedObject = newObject;
if (oldObject != nullptr)
oldObject->decReferenceCount();
}
return *this;
The reference count of the old object is decremented, and it might be
deleted if it hits zero. The new object's count is incremented.
*/
template <class DerivedClass>
ReferenceCountedObjectPtr& operator= (const ReferenceCountedObjectPtr<DerivedClass>& other)
{
return operator= (static_cast <ReferenceCountedObjectClass*> (other.getObject()));
}
#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS
/** Takes-over the object from another pointer. */
ReferenceCountedObjectPtr& operator= (ReferenceCountedObjectPtr&& other)
{
std::swap (referencedObject, other.referencedObject);