Show
Ignore:
Timestamp:
12/12/07 18:00:42 (1 year ago)
Author:
cneumann
Message:

added: generic interface
changed: factory functions return RefPtr?

The unittests don't pass right now, because of the change
to the factory functions, which leads to containers
being immediately destroyed as they are not assigned to
a RefPtr?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Attachments/OSGStringAttributeMapBase.h

    r1020 r1032  
    9696    OSG_GEN_INTERNALPTR(StringAttributeMap); 
    9797 
    98     typedef WeakRefCountPtrBuilder<StringAttributeMap>::Ptr ObjWeakRefPtr; 
    99     typedef MTRefCountPtrBuilder  <StringAttributeMap>::Ptr ObjMTRefPtr; 
    100     typedef RefCountPtrBuilder    <StringAttributeMap>::Ptr ObjRefPtr; 
    101     typedef ParentPtrBuilder      <StringAttributeMap>::Ptr ObjParentPtr; 
     98    typedef MTRefCountPtrBuilder      <StringAttributeMap>::Ptr ObjMTRefPtr; 
     99    typedef RefCountPtrBuilder        <StringAttributeMap>::Ptr ObjRefPtr; 
     100    typedef ParentPtrBuilder          <StringAttributeMap>::Ptr ObjParentPtr; 
     101    typedef WeakRefCountPtrBuilder    <StringAttributeMap>::Ptr ObjWeakRefPtr; 
     102    typedef InternalRefCountPtrBuilder<StringAttributeMap>::Ptr ObjInternalRefPtr; 
    102103     
    103104    /*! \}                                                                 */ 
    …… 
    155156    /*! \{                                                                 */ 
    156157 
    157     static  StringAttributeMapPtr create     (void); 
     158    static  ObjRefPtr        create     (void); 
    158159    static  StringAttributeMapPtr createEmpty(void); 
    159160 
    …… 
    163164    /*! \{                                                                 */ 
    164165 
    165     virtual FieldContainerPtr shallowCopy(void) const; 
     166    virtual FieldContainerRefPtr shallowCopy(void) const; 
    166167 
    167168    /*! \}                                                                 */ 
    …… 
    295296}; 
    296297 
    297 typedef StringAttributeMapBase::ObjRefPtr      StringAttributeMapRefPtr; 
    298 typedef StringAttributeMapBase::ObjMTRefPtr    StringAttributeMapMTRefPtr; 
    299 typedef StringAttributeMapBase::ObjWeakRefPtr  StringAttributeMapWeakRefPtr; 
    300 typedef StringAttributeMapBase::ObjParentPtr   StringAttributeMapParentPtr; 
     298typedef StringAttributeMapBase::ObjRefPtr         StringAttributeMapRefPtr; 
     299typedef StringAttributeMapBase::ObjMTRefPtr       StringAttributeMapMTRefPtr; 
     300typedef StringAttributeMapBase::ObjWeakRefPtr     StringAttributeMapWeakRefPtr; 
     301typedef StringAttributeMapBase::ObjParentPtr      StringAttributeMapParentPtr; 
     302typedef StringAttributeMapBase::ObjInternalRefPtr StringAttributeMapInternalPtr; 
    301303 
    302304typedef boost::mpl::if_<