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/OSGFieldContainerAttachmentFieldTraits.h

    r1072 r1138  
    7373    typedef FieldTraits<FieldContainerAttachmentPtr> Self; 
    7474   
    75     typedef ChildPointerMField     <FieldContainerAttachment> ChildMField; 
    76     typedef ParentPointerMField    <FieldContainerAttachment> ParentMField; 
    77     typedef UnrecordedPointerMField<FieldContainerAttachment> UnrecordedMField; 
    78     typedef WeakPointerMField      <FieldContainerAttachment> WeakMField; 
     75    typedef ChildPointerMField     <FieldContainerAttachment,  
     76                                    0                       > ChildMField; 
     77    typedef ParentPointerMField    <FieldContainerAttachment,  
     78                                    0                       > ParentMField; 
     79    typedef UnrecordedPointerMField<FieldContainerAttachment,  
     80                                    0                       > UnrecordedMField; 
     81    typedef WeakPointerMField      <FieldContainerAttachment, 
     82                                    0                       > WeakMField; 
    7983     
    80     typedef ChildPointerSField     <FieldContainerAttachment> ChildSField; 
    81     typedef ParentPointerSField    <FieldContainerAttachment> ParentSField; 
    82     typedef UnrecordedPointerSField<FieldContainerAttachment> UnrecordedSField; 
    83     typedef WeakPointerSField      <FieldContainerAttachment> WeakSField; 
     84    typedef ChildPointerSField     <FieldContainerAttachment, 
     85                                    0                       > ChildSField; 
     86    typedef ParentPointerSField    <FieldContainerAttachment, 
     87                                    0                       > ParentSField; 
     88    typedef UnrecordedPointerSField<FieldContainerAttachment, 
     89                                    0                       > UnrecordedSField; 
     90    typedef WeakPointerSField      <FieldContainerAttachment, 
     91                                    0                       > WeakSField; 
    8492         
    8593    enum { Convertible = Self::NotConvertible };