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

    r1072 r1138  
    4949#include "OSGPointerFieldTraitsBase.h" 
    5050 
     51#if 0 
    5152#include "OSGChildPointerMField.h" 
    5253#include "OSGParentPointerMField.h" 
     
    5859#include "OSGUnrecordedPointerSField.h" 
    5960#include "OSGWeakPointerSField.h" 
     61#endif 
    6062 
    6163OSG_BEGIN_NAMESPACE 
     64 
     65class PointerMFieldBase; 
     66class PointerSFieldBase; 
    6267 
    6368#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
     
    7782    typedef FieldTraits<FieldContainerPtr> Self; 
    7883   
    79     typedef ChildPointerMField     <FieldContainer> ChildMField; 
    80     typedef ParentPointerMField    <FieldContainer> ParentMField; 
    81     typedef UnrecordedPointerMField<FieldContainer> UnrecordedMField; 
    82     typedef WeakPointerMField      <FieldContainer> WeakMField; 
     84    typedef ChildPointerMField     <FieldContainer, 0> ChildMField; 
     85    typedef ParentPointerMField    <FieldContainer, 0> ParentMField; 
     86    typedef UnrecordedPointerMField<FieldContainer, 0> UnrecordedMField; 
     87    typedef WeakPointerMField      <FieldContainer, 0> WeakMField; 
    8388     
    84     typedef ChildPointerSField     <FieldContainer> ChildSField; 
    85     typedef ParentPointerSField    <FieldContainer> ParentSField; 
    86     typedef UnrecordedPointerSField<FieldContainer> UnrecordedSField; 
    87     typedef WeakPointerSField      <FieldContainer> WeakSField; 
     89    typedef ChildPointerSField     <FieldContainer, 0> ChildSField; 
     90    typedef ParentPointerSField    <FieldContainer, 0> ParentSField; 
     91    typedef UnrecordedPointerSField<FieldContainer, 0> UnrecordedSField; 
     92    typedef WeakPointerSField      <FieldContainer, 0> WeakSField; 
    8893         
    8994    enum { Convertible = Self::NotConvertible };