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/Contrib/Manipulators/OSGScaleManipulatorBase.h

    r1020 r1032  
    9292    OSG_GEN_INTERNALPTR(ScaleManipulator); 
    9393 
    94     typedef WeakRefCountPtrBuilder<ScaleManipulator>::Ptr ObjWeakRefPtr; 
    95     typedef MTRefCountPtrBuilder  <ScaleManipulator>::Ptr ObjMTRefPtr; 
    96     typedef RefCountPtrBuilder    <ScaleManipulator>::Ptr ObjRefPtr; 
    97     typedef ParentPtrBuilder      <ScaleManipulator>::Ptr ObjParentPtr; 
     94    typedef MTRefCountPtrBuilder      <ScaleManipulator>::Ptr ObjMTRefPtr; 
     95    typedef RefCountPtrBuilder        <ScaleManipulator>::Ptr ObjRefPtr; 
     96    typedef ParentPtrBuilder          <ScaleManipulator>::Ptr ObjParentPtr; 
     97    typedef WeakRefCountPtrBuilder    <ScaleManipulator>::Ptr ObjWeakRefPtr; 
     98    typedef InternalRefCountPtrBuilder<ScaleManipulator>::Ptr ObjInternalRefPtr; 
    9899     
    99100    /*! \}                                                                 */ 
    …… 
    137138    /*! \{                                                                 */ 
    138139 
    139     static  ScaleManipulatorPtr create     (void); 
     140    static  ObjRefPtr        create     (void); 
    140141    static  ScaleManipulatorPtr createEmpty(void); 
    141142 
    …… 
    145146    /*! \{                                                                 */ 
    146147 
    147     virtual FieldContainerPtr shallowCopy(void) const; 
     148    virtual FieldContainerRefPtr shallowCopy(void) const; 
    148149 
    149150    /*! \}                                                                 */ 
    …… 
    225226}; 
    226227 
    227 typedef ScaleManipulatorBase::ObjRefPtr      ScaleManipulatorRefPtr; 
    228 typedef ScaleManipulatorBase::ObjMTRefPtr    ScaleManipulatorMTRefPtr; 
    229 typedef ScaleManipulatorBase::ObjWeakRefPtr  ScaleManipulatorWeakRefPtr; 
    230 typedef ScaleManipulatorBase::ObjParentPtr   ScaleManipulatorParentPtr; 
     228typedef ScaleManipulatorBase::ObjRefPtr         ScaleManipulatorRefPtr; 
     229typedef ScaleManipulatorBase::ObjMTRefPtr       ScaleManipulatorMTRefPtr; 
     230typedef ScaleManipulatorBase::ObjWeakRefPtr     ScaleManipulatorWeakRefPtr; 
     231typedef ScaleManipulatorBase::ObjParentPtr      ScaleManipulatorParentPtr; 
     232typedef ScaleManipulatorBase::ObjInternalRefPtr ScaleManipulatorInternalPtr; 
    231233 
    232234typedef boost::mpl::if_<