Show
Ignore:
Timestamp:
12/12/07 18:00:42 (1 year 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/MultiDisplay/OSGMultiDisplayWindowBase.h

    r1020 r1032  
    102102    OSG_GEN_INTERNALPTR(MultiDisplayWindow); 
    103103 
    104     typedef WeakRefCountPtrBuilder<MultiDisplayWindow>::Ptr ObjWeakRefPtr; 
    105     typedef MTRefCountPtrBuilder  <MultiDisplayWindow>::Ptr ObjMTRefPtr; 
    106     typedef RefCountPtrBuilder    <MultiDisplayWindow>::Ptr ObjRefPtr; 
    107     typedef ParentPtrBuilder      <MultiDisplayWindow>::Ptr ObjParentPtr; 
     104    typedef MTRefCountPtrBuilder      <MultiDisplayWindow>::Ptr ObjMTRefPtr; 
     105    typedef RefCountPtrBuilder        <MultiDisplayWindow>::Ptr ObjRefPtr; 
     106    typedef ParentPtrBuilder          <MultiDisplayWindow>::Ptr ObjParentPtr; 
     107    typedef WeakRefCountPtrBuilder    <MultiDisplayWindow>::Ptr ObjWeakRefPtr; 
     108    typedef InternalRefCountPtrBuilder<MultiDisplayWindow>::Ptr ObjInternalRefPtr; 
    108109     
    109110    /*! \}                                                                 */ 
    …… 
    256257    /*! \{                                                                 */ 
    257258 
    258     static  MultiDisplayWindowPtr create     (void); 
     259    static  ObjRefPtr        create     (void); 
    259260    static  MultiDisplayWindowPtr createEmpty(void); 
    260261 
    …… 
    264265    /*! \{                                                                 */ 
    265266 
    266     virtual FieldContainerPtr shallowCopy(void) const; 
     267    virtual FieldContainerRefPtr shallowCopy(void) const; 
    267268 
    268269    /*! \}                                                                 */ 
    …… 
    365366}; 
    366367 
    367 typedef MultiDisplayWindowBase::ObjRefPtr      MultiDisplayWindowRefPtr; 
    368 typedef MultiDisplayWindowBase::ObjMTRefPtr    MultiDisplayWindowMTRefPtr; 
    369 typedef MultiDisplayWindowBase::ObjWeakRefPtr  MultiDisplayWindowWeakRefPtr; 
    370 typedef MultiDisplayWindowBase::ObjParentPtr   MultiDisplayWindowParentPtr; 
     368typedef MultiDisplayWindowBase::ObjRefPtr         MultiDisplayWindowRefPtr; 
     369typedef MultiDisplayWindowBase::ObjMTRefPtr       MultiDisplayWindowMTRefPtr; 
     370typedef MultiDisplayWindowBase::ObjWeakRefPtr     MultiDisplayWindowWeakRefPtr; 
     371typedef MultiDisplayWindowBase::ObjParentPtr      MultiDisplayWindowParentPtr; 
     372typedef MultiDisplayWindowBase::ObjInternalRefPtr MultiDisplayWindowInternalPtr; 
    371373 
    372374typedef boost::mpl::if_<