Show
Ignore:
Timestamp:
12/19/07 17:56:03 (10 months ago)
Author:
cneumann
Message:

changed: generic interface activated
fixed: single parent unlinking

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGFieldContainer.h

    r1032 r1033  
    8282    OSG_GEN_INTERNALPTR(FieldContainer); 
    8383     
    84     typedef WeakRefCountPtrBuilder<FieldContainer>::Ptr ObjWeakRefPtr; 
    85     typedef MTRefCountPtrBuilder  <FieldContainer>::Ptr ObjMTRefPtr; 
    86     typedef RefCountPtrBuilder    <FieldContainer>::Ptr ObjRefPtr; 
    87     typedef ParentPtrBuilder      <FieldContainer>::Ptr ObjParentPtr; 
     84    typedef WeakRefCountPtrBuilder    <FieldContainer>::Ptr ObjWeakRefPtr; 
     85    typedef MTRefCountPtrBuilder      <FieldContainer>::Ptr ObjMTRefPtr; 
     86    typedef RefCountPtrBuilder        <FieldContainer>::Ptr ObjRefPtr; 
     87    typedef ParentPtrBuilder          <FieldContainer>::Ptr ObjParentPtr; 
     88    typedef InternalRefCountPtrBuilder<FieldContainer>::Ptr ObjInternalRefPtr; 
    8889 
    8990    struct  attempt_to_create_CoredNodePtr_on_non_NodeCore_FC {}; 
    …… 
    451452    friend ContainerPtr convertToCurrentAspect(ContainerPtr pFC); 
    452453 
     454    template <class BaseObjectT> 
     455    friend struct MTRefCountPolicy; 
     456     
    453457#ifdef OSG_MT_CPTR_ASPECT 
    454458    friend struct HandledFieldContainerFactoryDesc; 
    …… 
    461465}; 
    462466 
    463 typedef FieldContainer::ObjRefPtr      FieldContainerRefPtr; 
    464 typedef FieldContainer::ObjMTRefPtr    FieldContainerMTRefPtr; 
    465 typedef FieldContainer::ObjWeakRefPtr  FieldContainerWeakRefPtr; 
    466 typedef FieldContainer::ObjParentPtr   FieldContainerParentPtr; 
     467typedef FieldContainer::ObjRefPtr         FieldContainerRefPtr; 
     468typedef FieldContainer::ObjMTRefPtr       FieldContainerMTRefPtr; 
     469typedef FieldContainer::ObjWeakRefPtr     FieldContainerWeakRefPtr; 
     470typedef FieldContainer::ObjParentPtr      FieldContainerParentPtr; 
     471typedef FieldContainer::ObjInternalRefPtr FieldContainerInternalRefPtr; 
    467472 
    468473 
    …… 
    483488 
    484489OSG_SYSTEM_DLLMAPPING 
    485 FieldContainerPtr deepClone(       
     490FieldContainerRefPtr deepClone(       
    486491          FieldContainerPtrConstArg                    src, 
    487492    const std::vector<std::string>                    &shareTypeNames, 
    …… 
    497502 
    498503OSG_SYSTEM_DLLMAPPING 
    499 FieldContainerPtr deepClone( 
     504FieldContainerRefPtr deepClone( 
    500505          FieldContainerPtrConstArg                    src, 
    501506    const std::vector<UInt16>                         &shareGroupIds, 
    …… 
    505510 
    506511OSG_SYSTEM_DLLMAPPING 
    507 FieldContainerPtr deepClone(       
     512FieldContainerRefPtr deepClone(       
    508513          FieldContainerPtrConstArg                    src, 
    509514    const std::string                                 &shareTypesString, 
    …… 
    513518 
    514519OSG_SYSTEM_DLLMAPPING 
    515 FieldContainerPtr deepClone( 
     520FieldContainerRefPtr deepClone( 
    516521          FieldContainerPtrConstArg                    src, 
    517522