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

    r1072 r1138  
    5252    WeakSFieldReferenceProxy<ObjectTypeT>::operator value_type(void) const 
    5353{ 
    54     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     54    return AccessHandler::validate(*_pValue); 
    5555} 
    5656 
     
    5959     WeakSFieldReferenceProxy<ObjectTypeT>::operator->(void) const 
    6060{ 
    61     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     61    return AccessHandler::validate(*_pValue); 
    6262} 
    6363 
     
    6969        static_cast<SFieldType *>(0), 
    7070        *_pValue, 
    71         detail::void_cast<StoredType>(newValue)); 
     71        newValue); 
    7272     
    73     *_pValue = detail::void_cast<StoredType>(newValue)
     73    *_pValue = newValue
    7474} 
    7575