Changeset 1204

Timestamp:

05/07/08 18:37:24 (4 days ago)

Author:

cneumann

Message:

added: templated c'tor to convert from ref ptr with different ObjectT and/or

RefCountPolicyT
This is needed so that base class ref pointers can point to derived objects

Files:

• trunk/Source/System/FieldContainer/Base/OSGRefCountPtr.h (modified) (1 diff)
• trunk/Source/System/FieldContainer/Base/OSGRefCountPtr.inl (modified) (2 diffs)

trunk/Source/System/FieldContainer/Base/OSGRefCountPtr.h

@@ -91 +91 @@
-    template <class OtherObjectT>
-    RefCountPtr(TransitPtr<OtherObjectT> const &other);
-
-
-
+
+
+
+
-
-    RefCountPtr(Object           * const  pObj );

trunk/Source/System/FieldContainer/Base/OSGRefCountPtr.inl

@@ -59 +59 @@
-
-template <class ObjectT, 
-          class RefCountPolicyT> inline
-RefCountPtr<ObjectT, RefCountPolicyT>::RefCountPtr(ObjectTransitPtr &other)
-{
-    RefCountPolicy::convertTransitPtr(_pObj, other._pObj);
-}
-
-template <class ObjectT, 
-          class RefCountPolicyT>
-template <class OtherObjectT   > inline
@@ -76 +69 @@
-}
-
+template <class ObjectT,
+          class RefCountPolicyT     >
+template <class OtherObjectT,
+          class OtherRefCountPolicyT> inline
+RefCountPtr<ObjectT, RefCountPolicyT>::RefCountPtr(
+    RefCountPtr<OtherObjectT, OtherRefCountPolicyT> const &other) :
+    
+    _pObj(NULL)
+{
+    ObjectT *pOther = other.get();
+
+    RefCountPolicyT::addRef(pOther);
+
+    _pObj = pOther;
+}
-
-template <class ObjectT,