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/SortLast/OSGBinarySwapComposerBase.h

    r1020 r1032  
    9898    OSG_GEN_INTERNALPTR(BinarySwapComposer); 
    9999 
    100     typedef WeakRefCountPtrBuilder<BinarySwapComposer>::Ptr ObjWeakRefPtr; 
    101     typedef MTRefCountPtrBuilder  <BinarySwapComposer>::Ptr ObjMTRefPtr; 
    102     typedef RefCountPtrBuilder    <BinarySwapComposer>::Ptr ObjRefPtr; 
    103     typedef ParentPtrBuilder      <BinarySwapComposer>::Ptr ObjParentPtr; 
     100    typedef MTRefCountPtrBuilder      <BinarySwapComposer>::Ptr ObjMTRefPtr; 
     101    typedef RefCountPtrBuilder        <BinarySwapComposer>::Ptr ObjRefPtr; 
     102    typedef ParentPtrBuilder          <BinarySwapComposer>::Ptr ObjParentPtr; 
     103    typedef WeakRefCountPtrBuilder    <BinarySwapComposer>::Ptr ObjWeakRefPtr; 
     104    typedef InternalRefCountPtrBuilder<BinarySwapComposer>::Ptr ObjInternalRefPtr; 
    104105     
    105106    /*! \}                                                                 */ 
    …… 
    212213    /*! \{                                                                 */ 
    213214 
    214     static  BinarySwapComposerPtr create     (void); 
     215    static  ObjRefPtr        create     (void); 
    215216    static  BinarySwapComposerPtr createEmpty(void); 
    216217 
    …… 
    220221    /*! \{                                                                 */ 
    221222 
    222     virtual FieldContainerPtr shallowCopy(void) const; 
     223    virtual FieldContainerRefPtr shallowCopy(void) const; 
    223224 
    224225    /*! \}                                                                 */ 
    …… 
    315316}; 
    316317 
    317 typedef BinarySwapComposerBase::ObjRefPtr      BinarySwapComposerRefPtr; 
    318 typedef BinarySwapComposerBase::ObjMTRefPtr    BinarySwapComposerMTRefPtr; 
    319 typedef BinarySwapComposerBase::ObjWeakRefPtr  BinarySwapComposerWeakRefPtr; 
    320 typedef BinarySwapComposerBase::ObjParentPtr   BinarySwapComposerParentPtr; 
     318typedef BinarySwapComposerBase::ObjRefPtr         BinarySwapComposerRefPtr; 
     319typedef BinarySwapComposerBase::ObjMTRefPtr       BinarySwapComposerMTRefPtr; 
     320typedef BinarySwapComposerBase::ObjWeakRefPtr     BinarySwapComposerWeakRefPtr; 
     321typedef BinarySwapComposerBase::ObjParentPtr      BinarySwapComposerParentPtr; 
     322typedef BinarySwapComposerBase::ObjInternalRefPtr BinarySwapComposerInternalPtr; 
    321323 
    322324typedef boost::mpl::if_<