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/Base/OSGClusterWindowBase.h

    r1020 r1032  
    118118    OSG_GEN_INTERNALPTR(ClusterWindow); 
    119119 
    120     typedef WeakRefCountPtrBuilder<ClusterWindow>::Ptr ObjWeakRefPtr; 
    121     typedef MTRefCountPtrBuilder  <ClusterWindow>::Ptr ObjMTRefPtr; 
    122     typedef RefCountPtrBuilder    <ClusterWindow>::Ptr ObjRefPtr; 
    123     typedef ParentPtrBuilder      <ClusterWindow>::Ptr ObjParentPtr; 
     120    typedef MTRefCountPtrBuilder      <ClusterWindow>::Ptr ObjMTRefPtr; 
     121    typedef RefCountPtrBuilder        <ClusterWindow>::Ptr ObjRefPtr; 
     122    typedef ParentPtrBuilder          <ClusterWindow>::Ptr ObjParentPtr; 
     123    typedef WeakRefCountPtrBuilder    <ClusterWindow>::Ptr ObjWeakRefPtr; 
     124    typedef InternalRefCountPtrBuilder<ClusterWindow>::Ptr ObjInternalRefPtr; 
    124125     
    125126    /*! \}                                                                 */ 
    …… 
    436437    /*! \{                                                                 */ 
    437438 
    438     static  ClusterWindowPtr create     (void); 
     439    static  ObjRefPtr        create     (void); 
    439440    static  ClusterWindowPtr createEmpty(void); 
    440441 
    …… 
    444445    /*! \{                                                                 */ 
    445446 
    446     virtual FieldContainerPtr shallowCopy(void) const; 
     447    virtual FieldContainerRefPtr shallowCopy(void) const; 
    447448 
    448449    /*! \}                                                                 */ 
    …… 
    570571}; 
    571572 
    572 typedef ClusterWindowBase::ObjRefPtr      ClusterWindowRefPtr; 
    573 typedef ClusterWindowBase::ObjMTRefPtr    ClusterWindowMTRefPtr; 
    574 typedef ClusterWindowBase::ObjWeakRefPtr  ClusterWindowWeakRefPtr; 
    575 typedef ClusterWindowBase::ObjParentPtr   ClusterWindowParentPtr; 
     573typedef ClusterWindowBase::ObjRefPtr         ClusterWindowRefPtr; 
     574typedef ClusterWindowBase::ObjMTRefPtr       ClusterWindowMTRefPtr; 
     575typedef ClusterWindowBase::ObjWeakRefPtr     ClusterWindowWeakRefPtr; 
     576typedef ClusterWindowBase::ObjParentPtr      ClusterWindowParentPtr; 
     577typedef ClusterWindowBase::ObjInternalRefPtr ClusterWindowInternalPtr; 
    576578 
    577579typedef boost::mpl::if_<