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

    r1020 r1032  
    124124    OSG_GEN_INTERNALPTR(Manipulator); 
    125125 
    126     typedef WeakRefCountPtrBuilder<Manipulator>::Ptr ObjWeakRefPtr; 
    127     typedef MTRefCountPtrBuilder  <Manipulator>::Ptr ObjMTRefPtr; 
    128     typedef RefCountPtrBuilder    <Manipulator>::Ptr ObjRefPtr; 
    129     typedef ParentPtrBuilder      <Manipulator>::Ptr ObjParentPtr; 
     126    typedef MTRefCountPtrBuilder      <Manipulator>::Ptr ObjMTRefPtr; 
     127    typedef RefCountPtrBuilder        <Manipulator>::Ptr ObjRefPtr; 
     128    typedef ParentPtrBuilder          <Manipulator>::Ptr ObjParentPtr; 
     129    typedef WeakRefCountPtrBuilder    <Manipulator>::Ptr ObjWeakRefPtr; 
     130    typedef InternalRefCountPtrBuilder<Manipulator>::Ptr ObjInternalRefPtr; 
    130131     
    131132    /*! \}                                                                 */ 
    …… 
    624625}; 
    625626 
    626 typedef ManipulatorBase::ObjRefPtr      ManipulatorRefPtr; 
    627 typedef ManipulatorBase::ObjMTRefPtr    ManipulatorMTRefPtr; 
    628 typedef ManipulatorBase::ObjWeakRefPtr  ManipulatorWeakRefPtr; 
    629 typedef ManipulatorBase::ObjParentPtr   ManipulatorParentPtr; 
     627typedef ManipulatorBase::ObjRefPtr         ManipulatorRefPtr; 
     628typedef ManipulatorBase::ObjMTRefPtr       ManipulatorMTRefPtr; 
     629typedef ManipulatorBase::ObjWeakRefPtr     ManipulatorWeakRefPtr; 
     630typedef ManipulatorBase::ObjParentPtr      ManipulatorParentPtr; 
     631typedef ManipulatorBase::ObjInternalRefPtr ManipulatorInternalPtr; 
    630632 
    631633typedef boost::mpl::if_<