Changeset 988 for branches/Carsten_PtrWork/Source/System/FieldContainer/Base/OSGParentPointer.inl

Timestamp:

10/24/07 19:30:30 (11 months ago)

Author:

cneumann

Message:

fixed: FieldBundle? templates, pointers and fields updated

lots of compile errors - some remain

Files:

• branches/Carsten_PtrWork/Source/System/FieldContainer/Base/OSGParentPointer.inl (modified) (8 diffs)

branches/Carsten_PtrWork/Source/System/FieldContainer/Base/OSGParentPointer.inl

@@ -91 +91 @@
-inline 
-ParentPointer<ObjectT, RootObjectT>::ParentPointer(
-
-
-
-
+
+
+
+
+
-{
-}
@@ -103 +104 @@
-ParentPointer<ObjectT, RootObjectT>::ParentPointer(
-    ParentPointer<OtherObjectT, RootObjectT> const &parentPtr)
+    
-    : _pointer      (Self::castPtrUp(parentPtr.get())),
-      _parentFieldId(parentPtr.getFieldId()          )
+{
+}
+
+template <class ObjectT, class RootObjectT>
+template <class OtherObjectT              >
+inline
+ParentPointer<ObjectT, RootObjectT>::ParentPointer(
+    ParentPointer<OtherObjectT, RootObjectT> const &parentPtr,
+    detail::StaticCastTag)
+    : _pointer      (parentPtr._pointer, detail::StaticCastTag()),
+      _parentFieldId(parentPtr.getFieldId()                     )
+{
+}
+
+template <class ObjectT, class RootObjectT>
+template <class OtherObjectT              >
+inline
+ParentPointer<ObjectT, RootObjectT>::ParentPointer(
+    ParentPointer<OtherObjectT, RootObjectT> const &parentPtr,
+    detail::ConstCastTag)
+    : _pointer      (parentPtr._pointer, detail::ConstCastTag()),
+      _parentFieldId(parentPtr.getFieldId()                    )
+{
+}
+
+template <class ObjectT, class RootObjectT>
+template <class OtherObjectT              >
+inline
+ParentPointer<ObjectT, RootObjectT>::ParentPointer(
+    ParentPointer<OtherObjectT, RootObjectT> const &parentPtr,
+    detail::DynamicCastTag)
+    : _pointer      (parentPtr._pointer,    detail::DynamicCastTag()),
+      _parentFieldId(parentPtr.getFieldId()                           )
-{
-}
@@ -115 +150 @@
-                          OtherRefCountPolicyT,
-                          RootObjectT          > const &refPtr,
-
+
+
-    : _pointer      (Self::castPtrUp(refPtr.get())),
-      _parentFieldId(fieldId                      )
@@ -168 +204 @@
-template <class ObjectT,      class RootObjectT         >
-template <class OtherObjectT, class OtherRefCountPolicyT>
-
+typename ParentPointer<ObjectT, RootObjectT>::Self &
-ParentPointer<ObjectT, RootObjectT>::operator=(
-    ReferenceCountPointer<OtherObjectT,
@@ -194 +230 @@
-
-template <class ObjectT, class RootObjectT>
-
+t
-ParentPointer<ObjectT, RootObjectT>::operator->(void) const
-{
@@ -201 +237 @@
-
-template <class ObjectT, class RootObjectT>
-
+t
-ParentPointer<ObjectT, RootObjectT>::operator*(void) const
-{
@@ -208 +244 @@
-
-template <class ObjectT, class RootObjectT>
-
+t
-ParentPointer<ObjectT, RootObjectT>::get(void) const
-{
@@ -245 +281 @@
-
-OSG_END_NAMESPACE
+
+namespace boost
+{
+
+template <class TargetObjectT, class SourceObjectT, class RootObjectT>
+OSG::ParentPointer<TargetObjectT, RootObjectT>
+static_pointer_cast(OSG::ParentPointer<SourceObjectT,
+                                       RootObjectT   > const &source)
+{
+    return OSG::ParentPointer<TargetObjectT, RootObjectT>(
+        source, OSG::detail::StaticCastTag());
+}
+
+template <class TargetObjectT, class SourceObjectT, class RootObjectT>
+OSG::ParentPointer<TargetObjectT, RootObjectT>
+const_pointer_cast(OSG::ParentPointer<SourceObjectT,
+                                      RootObjectT   > const &source)
+{
+    return OSG::ParentPointer<TargetObjectT, RootObjectT>(
+        source, OSG::detail::ConstCastTag());
+}
+
+template <class TargetObjectT, class SourceObjectT, class RootObjectT>
+OSG::ParentPointer<TargetObjectT, RootObjectT>
+dynamic_pointer_cast(OSG::ParentPointer<SourceObjectT,
+                                        RootObjectT   > const &source)
+{
+    return OSG::ParentPointer<TargetObjectT, RootObjectT>(
+        source, OSG::detail::DynamicCastTag());
+}
+
+} // namespace boost