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/OSGPipelineComposerBase.h

    r1020 r1032  
    100100    OSG_GEN_INTERNALPTR(PipelineComposer); 
    101101 
    102     typedef WeakRefCountPtrBuilder<PipelineComposer>::Ptr ObjWeakRefPtr; 
    103     typedef MTRefCountPtrBuilder  <PipelineComposer>::Ptr ObjMTRefPtr; 
    104     typedef RefCountPtrBuilder    <PipelineComposer>::Ptr ObjRefPtr; 
    105     typedef ParentPtrBuilder      <PipelineComposer>::Ptr ObjParentPtr; 
     102    typedef MTRefCountPtrBuilder      <PipelineComposer>::Ptr ObjMTRefPtr; 
     103    typedef RefCountPtrBuilder        <PipelineComposer>::Ptr ObjRefPtr; 
     104    typedef ParentPtrBuilder          <PipelineComposer>::Ptr ObjParentPtr; 
     105    typedef WeakRefCountPtrBuilder    <PipelineComposer>::Ptr ObjWeakRefPtr; 
     106    typedef InternalRefCountPtrBuilder<PipelineComposer>::Ptr ObjInternalRefPtr; 
    106107     
    107108    /*! \}                                                                 */ 
    …… 
    234235    /*! \{                                                                 */ 
    235236 
    236     static  PipelineComposerPtr create     (void); 
     237    static  ObjRefPtr        create     (void); 
    237238    static  PipelineComposerPtr createEmpty(void); 
    238239 
    …… 
    242243    /*! \{                                                                 */ 
    243244 
    244     virtual FieldContainerPtr shallowCopy(void) const; 
     245    virtual FieldContainerRefPtr shallowCopy(void) const; 
    245246 
    246247    /*! \}                                                                 */ 
    …… 
    340341}; 
    341342 
    342 typedef PipelineComposerBase::ObjRefPtr      PipelineComposerRefPtr; 
    343 typedef PipelineComposerBase::ObjMTRefPtr    PipelineComposerMTRefPtr; 
    344 typedef PipelineComposerBase::ObjWeakRefPtr  PipelineComposerWeakRefPtr; 
    345 typedef PipelineComposerBase::ObjParentPtr   PipelineComposerParentPtr; 
     343typedef PipelineComposerBase::ObjRefPtr         PipelineComposerRefPtr; 
     344typedef PipelineComposerBase::ObjMTRefPtr       PipelineComposerMTRefPtr; 
     345typedef PipelineComposerBase::ObjWeakRefPtr     PipelineComposerWeakRefPtr; 
     346typedef PipelineComposerBase::ObjParentPtr      PipelineComposerParentPtr; 
     347typedef PipelineComposerBase::ObjInternalRefPtr PipelineComposerInternalPtr; 
    346348 
    347349typedef boost::mpl::if_<