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/Cluster/Window/Base/OSGImageComposerBase.h

    r1020 r1032  
    9696    OSG_GEN_INTERNALPTR(ImageComposer); 
    9797 
    98     typedef WeakRefCountPtrBuilder<ImageComposer>::Ptr ObjWeakRefPtr; 
    99     typedef MTRefCountPtrBuilder  <ImageComposer>::Ptr ObjMTRefPtr; 
    100     typedef RefCountPtrBuilder    <ImageComposer>::Ptr ObjRefPtr; 
    101     typedef ParentPtrBuilder      <ImageComposer>::Ptr ObjParentPtr; 
     98    typedef MTRefCountPtrBuilder      <ImageComposer>::Ptr ObjMTRefPtr; 
     99    typedef RefCountPtrBuilder        <ImageComposer>::Ptr ObjRefPtr; 
     100    typedef ParentPtrBuilder          <ImageComposer>::Ptr ObjParentPtr; 
     101    typedef WeakRefCountPtrBuilder    <ImageComposer>::Ptr ObjWeakRefPtr; 
     102    typedef InternalRefCountPtrBuilder<ImageComposer>::Ptr ObjInternalRefPtr; 
    102103     
    103104    /*! \}                                                                 */ 
    …… 
    271272}; 
    272273 
    273 typedef ImageComposerBase::ObjRefPtr      ImageComposerRefPtr; 
    274 typedef ImageComposerBase::ObjMTRefPtr    ImageComposerMTRefPtr; 
    275 typedef ImageComposerBase::ObjWeakRefPtr  ImageComposerWeakRefPtr; 
    276 typedef ImageComposerBase::ObjParentPtr   ImageComposerParentPtr; 
     274typedef ImageComposerBase::ObjRefPtr         ImageComposerRefPtr; 
     275typedef ImageComposerBase::ObjMTRefPtr       ImageComposerMTRefPtr; 
     276typedef ImageComposerBase::ObjWeakRefPtr     ImageComposerWeakRefPtr; 
     277typedef ImageComposerBase::ObjParentPtr      ImageComposerParentPtr; 
     278typedef ImageComposerBase::ObjInternalRefPtr ImageComposerInternalPtr; 
    277279 
    278280typedef boost::mpl::if_<