Show
Ignore:
Timestamp:
04/07/08 02:50:33 (8 months ago)
Author:
vossg
Message:

changed: merged some merge changes back to have a running reference

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGNodeCoreFieldTraits.h

    r1072 r1138  
    7575    typedef FieldTraits<NodeCorePtr>  Self; 
    7676         
    77     typedef ChildPointerMField     <NodeCore> ChildMField; 
    78     typedef ParentPointerMField    <NodeCore> ParentMField; 
    79     typedef UnrecordedPointerMField<NodeCore> UnrecordedMField; 
    80     typedef WeakPointerMField      <NodeCore> WeakMField; 
     77    typedef ChildPointerMField     <NodeCore, 0> ChildMField; 
     78    typedef ParentPointerMField    <NodeCore, 0> ParentMField; 
     79    typedef UnrecordedPointerMField<NodeCore, 0> UnrecordedMField; 
     80    typedef WeakPointerMField      <NodeCore, 0> WeakMField; 
    8181     
    82     typedef ChildPointerSField     <NodeCore> ChildSField; 
    83     typedef ParentPointerSField    <NodeCore> ParentSField; 
    84     typedef UnrecordedPointerSField<NodeCore> UnrecordedSField; 
    85     typedef WeakPointerSField      <NodeCore> WeakSField; 
     82    typedef ChildPointerSField     <NodeCore, 0> ChildSField; 
     83    typedef ParentPointerSField    <NodeCore, 0> ParentSField; 
     84    typedef UnrecordedPointerSField<NodeCore, 0> UnrecordedSField; 
     85    typedef WeakPointerSField      <NodeCore, 0> WeakSField; 
    8686     
    8787    enum { Convertible = Self::NotConvertible };