Show
Ignore:
Timestamp:
12/12/07 18:00:42 (9 months 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/Depreciated/State/OSGTextureChunkBase.h

    r1020 r1032  
    202202    OSG_GEN_INTERNALPTR(TextureChunk); 
    203203 
    204     typedef WeakRefCountPtrBuilder<TextureChunk>::Ptr ObjWeakRefPtr; 
    205     typedef MTRefCountPtrBuilder  <TextureChunk>::Ptr ObjMTRefPtr; 
    206     typedef RefCountPtrBuilder    <TextureChunk>::Ptr ObjRefPtr; 
    207     typedef ParentPtrBuilder      <TextureChunk>::Ptr ObjParentPtr; 
     204    typedef MTRefCountPtrBuilder      <TextureChunk>::Ptr ObjMTRefPtr; 
     205    typedef RefCountPtrBuilder        <TextureChunk>::Ptr ObjRefPtr; 
     206    typedef ParentPtrBuilder          <TextureChunk>::Ptr ObjParentPtr; 
     207    typedef WeakRefCountPtrBuilder    <TextureChunk>::Ptr ObjWeakRefPtr; 
     208    typedef InternalRefCountPtrBuilder<TextureChunk>::Ptr ObjInternalRefPtr; 
    208209     
    209210    /*! \}                                                                 */ 
    …… 
    13581359    /*! \{                                                                 */ 
    13591360 
    1360     static  TextureChunkPtr create     (void); 
     1361    static  ObjRefPtr        create     (void); 
    13611362    static  TextureChunkPtr createEmpty(void); 
    13621363 
    …… 
    13661367    /*! \{                                                                 */ 
    13671368 
    1368     virtual FieldContainerPtr shallowCopy(void) const; 
     1369    virtual FieldContainerRefPtr shallowCopy(void) const; 
    13691370 
    13701371    /*! \}                                                                 */ 
    …… 
    16181619}; 
    16191620 
    1620 typedef TextureChunkBase::ObjRefPtr      TextureChunkRefPtr; 
    1621 typedef TextureChunkBase::ObjMTRefPtr    TextureChunkMTRefPtr; 
    1622 typedef TextureChunkBase::ObjWeakRefPtr  TextureChunkWeakRefPtr; 
    1623 typedef TextureChunkBase::ObjParentPtr   TextureChunkParentPtr; 
     1621typedef TextureChunkBase::ObjRefPtr         TextureChunkRefPtr; 
     1622typedef TextureChunkBase::ObjMTRefPtr       TextureChunkMTRefPtr; 
     1623typedef TextureChunkBase::ObjWeakRefPtr     TextureChunkWeakRefPtr; 
     1624typedef TextureChunkBase::ObjParentPtr      TextureChunkParentPtr; 
     1625typedef TextureChunkBase::ObjInternalRefPtr TextureChunkInternalPtr; 
    16241626 
    16251627typedef boost::mpl::if_<