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/OSGUnrecordedPointerSField.inl

    r1072 r1138  
    5353    UnrecordedSFieldReferenceProxy<ObjectTypeT>::operator value_type(void) const 
    5454{ 
    55     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     55    return AccessHandler::validate(*_pValue); 
    5656} 
    5757             
    …… 
    6060     UnrecordedSFieldReferenceProxy<ObjectTypeT>::operator->(void) const 
    6161{ 
    62     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     62    return AccessHandler::validate(*_pValue); 
    6363} 
    6464     
    …… 
    6868{ 
    6969    AccessHandler::onReplace( 
    70         static_cast<SFieldType *>(0), 
    71         *_pValue, 
    72         detail::void_cast<StoredType>(newValue)); 
     70        static_cast<SFieldType *>(0), *_pValue, newValue); 
    7371     
    74     *_pValue = detail::void_cast<StoredType>(newValue); 
     72    *_pValue = newValue; 
    7573} 
    7674