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/Cluster/Window/SortLast/OSGParallelComposerBase.h

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