From b66a82aa441ddd80f61d5b8049d6e3a35ebddb1b Mon Sep 17 00:00:00 2001
From: jules <julianstorer@gmail.com>
Date: Fri, 17 Feb 2012 16:42:23 +0000
Subject: [PATCH] Added automatic up-casting to ReferenceCountedObjectPtr.

---
 .../memory/juce_ReferenceCountedObject.h      | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/modules/juce_core/memory/juce_ReferenceCountedObject.h b/modules/juce_core/memory/juce_ReferenceCountedObject.h
index 660ba822cd..b038570ccc 100644
--- a/modules/juce_core/memory/juce_ReferenceCountedObject.h
+++ b/modules/juce_core/memory/juce_ReferenceCountedObject.h
@@ -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;
-
-        if (newObject != referencedObject)
-        {
-            if (newObject != nullptr)
-                newObject->incReferenceCount();
-
-            ReferenceCountedObjectClass* const oldObject = referencedObject;
-            referencedObject = newObject;
+        return operator= (other.referencedObject);
+    }
 
-            if (oldObject != nullptr)
-                oldObject->decReferenceCount();
-        }
+    /** Changes this pointer to point at a different object.
 
-        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);