Changeset 1072 for branches/Carsten_PtrWork2/Source/Base/Base/OSGContainerForwards.h

Timestamp:

04/02/08 14:18:07 (8 months ago)

Author:

cneumann

Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

• new OSB loader works (well, the unittest does)
  
• VRML loader is deactivated
  
• get/edit handle for dynamic (pointer) fields missing
  
• need to remove some more old files - they get moved in this commit
  
• generated (i.e. base) code in following commit
  

Files:

• branches/Carsten_PtrWork2/Source/Base/Base/OSGContainerForwards.h (modified) (6 diffs)

branches/Carsten_PtrWork2/Source/Base/Base/OSGContainerForwards.h

@@ -64 +64 @@
-    typedef CLASST const *       NAME##ConstPtrArg
-
+#define OSG_INHERIT_NAMED_PTR(BASECLASS, NAME)                    \
+    typedef BASECLASS::NAME##Ptr            NAME##Ptr;            \
+    typedef BASECLASS::NAME##PtrConst       NAME##PtrConst;       \
+    typedef BASECLASS::NAME##ConstPtr       NAME##ConstPtr;       \
+    typedef BASECLASS::NAME##ConstPtrConst  NAME##ConstPtrConst;  \
+                                                                  \
+    typedef BASECLASS::NAME##PtrArg         NAME##PtrArg;         \
+    typedef BASECLASS::NAME##PtrConstArg    NAME##PtrConstArg;    \
+    typedef BASECLASS::NAME##ConstPtrArg    NAME##ConstPtrArg
+    
+#define OSG_INHERIT_NAMED_PTR_TMPL(BASECLASS, NAME)                        \
+    typedef typename BASECLASS::NAME##Ptr            NAME##Ptr;            \
+    typedef typename BASECLASS::NAME##PtrConst       NAME##PtrConst;       \
+    typedef typename BASECLASS::NAME##ConstPtr       NAME##ConstPtr;       \
+    typedef typename BASECLASS::NAME##ConstPtrConst  NAME##ConstPtrConst;  \
+                                                                           \
+    typedef typename BASECLASS::NAME##PtrArg         NAME##PtrArg;         \
+    typedef typename BASECLASS::NAME##PtrConstArg    NAME##PtrConstArg;    \
+    typedef typename BASECLASS::NAME##ConstPtrArg    NAME##ConstPtrArg
+    
-#define OSG_GEN_NAMED_P(CLASST, NAME)                       \
-    typedef CLASST       *       NAME##P;                   \
@@ -185 +205 @@
-
-/*-------------------------------------------------------------------------*/
-/* ParentPtrWrapper<ObjectT>                                               */
-/*-------------------------------------------------------------------------*/
-
-template <class ObjectT>
-class ParentPtrWrapper;
-    
-template <class ObjectT>
-struct ParentPtrBuilder
-{
-    typedef ParentPtrWrapper<ObjectT      >       Ptr;
-    typedef ParentPtrWrapper<ObjectT      > const PtrConst;
-    typedef ParentPtrWrapper<ObjectT const>       ConstPtr;
-    typedef ParentPtrWrapper<ObjectT const> const ConstPtrConst;
-};
-
-/*-------------------------------------------------------------------------*/
-/* Pointer Types                                                           */
-/*-------------------------------------------------------------------------*/
@@ -208 +212 @@
-typedef InternalRefCountPtrBuilder<FieldContainer>::Ptr
-    FieldContainerInternalRefPtr;
-typedef ParentPtrBuilder          <FieldContainer>::Ptr
-    FieldContainerParentPtr;
-typedef TransitPtrBuilder         <FieldContainer>::Ptr
-    FieldContainerTransitPtr;
@@ -217 +219 @@
-typedef InternalRefCountPtrBuilder<FieldContainerAttachment>::Ptr
-    FieldContainerAttachmentInternalRefPtr;
-typedef ParentPtrBuilder          <FieldContainerAttachment>::Ptr
-    FieldContainerAttachmentParentPtr;
-    
-typedef RefCountPtrBuilder        <AttachmentContainer>::Ptr
@@ -224 +224 @@
-typedef InternalRefCountPtrBuilder<AttachmentContainer>::Ptr
-    AttachmentContainerInternalRefPtr;
-typedef ParentPtrBuilder          <AttachmentContainer>::Ptr
-    AttachmentContainerParentPtr;
-    
-typedef RefCountPtrBuilder        <Node>::Ptr NodeRefPtr;
-typedef InternalRefCountPtrBuilder<Node>::Ptr NodeInternalRefPtr;
-typedef ParentPtrBuilder          <Node>::Ptr NodeParentPtr;
-    
-typedef RefCountPtrBuilder        <NodeCore>::Ptr NodeCoreRefPtr;
-typedef InternalRefCountPtrBuilder<NodeCore>::Ptr NodeCoreInternalRefPtr;
-typedef ParentPtrBuilder          <NodeCore>::Ptr NodeCoreParentPtr;
-    
-OSG_GEN_CONTAINERPTR(FieldContainer);
@@ -241 +237 @@
-OSG_GEN_CONTAINERPTR(NodeCore);
-
+namespace detail
+{
+    template <class TargetTypeT, class SourceTypeT>
+    TargetTypeT
+    void_cast(SourceTypeT source)
+    {
+        return static_cast<TargetTypeT>(static_cast<void *>(source));
+    }
+    
+} // namespace detail
+
-template <class CoreT>
-class CoredNodeRefPtr;