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/Base/OSGPointerMFieldCommon.h

    r1072 r1138  
    4343 
    4444    typedef typename Inherited::StoredType               StoredType; 
    45     typedef typename Inherited::PtrStoreType             PtrStoreType; 
    46     typedef typename Inherited::PtrStoreItType           PtrStoreItType; 
    47     typedef typename Inherited::PtrStoreConstItType      PtrStoreConstItType; 
     45    typedef typename Inherited::StorageType              PtrStoreType; 
     46    typedef typename Inherited::StorageIt                PtrStoreItType; 
     47    typedef typename Inherited::StorageConstIt           PtrStoreConstItType; 
    4848 
    4949    typedef typename Inherited::size_type                size_type;