Show
Ignore:
Timestamp:
12/12/07 18:00:42 (10 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/OSGCubeTextureChunkBase.h

    r1020 r1032  
    104104    OSG_GEN_INTERNALPTR(CubeTextureChunk); 
    105105 
    106     typedef WeakRefCountPtrBuilder<CubeTextureChunk>::Ptr ObjWeakRefPtr; 
    107     typedef MTRefCountPtrBuilder  <CubeTextureChunk>::Ptr ObjMTRefPtr; 
    108     typedef RefCountPtrBuilder    <CubeTextureChunk>::Ptr ObjRefPtr; 
    109     typedef ParentPtrBuilder      <CubeTextureChunk>::Ptr ObjParentPtr; 
     106    typedef MTRefCountPtrBuilder      <CubeTextureChunk>::Ptr ObjMTRefPtr; 
     107    typedef RefCountPtrBuilder        <CubeTextureChunk>::Ptr ObjRefPtr; 
     108    typedef ParentPtrBuilder          <CubeTextureChunk>::Ptr ObjParentPtr; 
     109    typedef WeakRefCountPtrBuilder    <CubeTextureChunk>::Ptr ObjWeakRefPtr; 
     110    typedef InternalRefCountPtrBuilder<CubeTextureChunk>::Ptr ObjInternalRefPtr; 
    110111     
    111112    /*! \}                                                                 */ 
    …… 
    278279    /*! \{                                                                 */ 
    279280 
    280     static  CubeTextureChunkPtr create     (void); 
     281    static  ObjRefPtr        create     (void); 
    281282    static  CubeTextureChunkPtr createEmpty(void); 
    282283 
    …… 
    286287    /*! \{                                                                 */ 
    287288 
    288     virtual FieldContainerPtr shallowCopy(void) const; 
     289    virtual FieldContainerRefPtr shallowCopy(void) const; 
    289290 
    290291    /*! \}                                                                 */ 
    …… 
    391392}; 
    392393 
    393 typedef CubeTextureChunkBase::ObjRefPtr      CubeTextureChunkRefPtr; 
    394 typedef CubeTextureChunkBase::ObjMTRefPtr    CubeTextureChunkMTRefPtr; 
    395 typedef CubeTextureChunkBase::ObjWeakRefPtr  CubeTextureChunkWeakRefPtr; 
    396 typedef CubeTextureChunkBase::ObjParentPtr   CubeTextureChunkParentPtr; 
     394typedef CubeTextureChunkBase::ObjRefPtr         CubeTextureChunkRefPtr; 
     395typedef CubeTextureChunkBase::ObjMTRefPtr       CubeTextureChunkMTRefPtr; 
     396typedef CubeTextureChunkBase::ObjWeakRefPtr     CubeTextureChunkWeakRefPtr; 
     397typedef CubeTextureChunkBase::ObjParentPtr      CubeTextureChunkParentPtr; 
     398typedef CubeTextureChunkBase::ObjInternalRefPtr CubeTextureChunkInternalPtr; 
    397399 
    398400typedef boost::mpl::if_<