Show
Ignore:
Timestamp:
04/07/08 02:50:33 (8 months ago)
Author:
vossg
Message:

changed: merged some merge changes back to have a running reference

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/Base/OSGParentPointerMField.inl

    r1072 r1138  
    168168    ParentMFieldConstIterator<ObjectTypeT>::getPtr(void) const 
    169169{ 
    170     return detail::void_cast<value_type>( 
    171         AccessHandler::validate(this->Inherited::operator*())); 
     170    return AccessHandler::validate(this->Inherited::operator*()); 
    172171} 
    173172 
    …… 
    234233    ParentMFieldConstReferenceProxy<ObjectTypeT>::operator value_type(void) const 
    235234{ 
    236     return detail::void_cast<value_type>(AccessHandler::validate(*_storeIt)); 
     235    return AccessHandler::validate(*_storeIt); 
    237236} 
    238237           
    …… 
    241240    ParentMFieldConstReferenceProxy<ObjectTypeT>::operator->(void) const 
    242241{ 
    243     return detail::void_cast<value_type>(AccessHandler::validate(*_storeIt)); 
     242    return AccessHandler::validate(*_storeIt); 
    244243} 
    245244 
    …… 
    249248    ParentMFieldConstReferenceProxy<ObjectTypeT>::getPtr(void) const 
    250249{ 
    251     return detail::void_cast<value_type>(AccessHandler::validate(*_storeIt)); 
     250    return AccessHandler::validate(*_storeIt); 
    252251}     
    253252