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/BalancedMultiWindow/OSGBalancedMultiWindowBase.h

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