Show
Ignore:
Timestamp:
12/19/07 17:56:03 (8 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/OSGFieldContainerType.cpp

    r1032 r1033  
    6161 
    6262/*! Constructor for a new field container type. 
    63 * 
     63 
     64    \dev 
     65    The prototype is not held in a RefPtr because that creates circular 
     66    dependencies between FieldContainer and FieldContainerType headers. 
     67    Instead the prototypes ref count is handled manually here. 
     68    \enddev 
    6469*/ 
    6570FieldContainerType::FieldContainerType( 
    …… 
    110115{ 
    111116    if(_pPrototype != NullFC) 
    112         addRef(_pPrototype); 
     117        _pPrototype->addReference(); 
    113118} 
    114119 
    …… 
    178183void FieldContainerType::terminate(void) 
    179184{ 
    180     subRef(_pPrototype); 
     185    if(_pPrototype != NullFC) 
     186        _pPrototype->subReference(); 
    181187} 
    182188 
    …… 
    194200    { 
    195201        _pPrototype = _fPrototypeCreate(); 
    196  
    197         addRef(_pPrototype); 
     202         
     203        if(_pPrototype != NullFC) 
     204            _pPrototype->addReference(); 
    198205    } 
    199206