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

    r1072 r1138  
    5454    ChildSFieldReferenceProxy<ObjectTypeT>::operator value_type(void) const 
    5555{ 
    56     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     56    return AccessHandler::validate(*_pValue); 
    5757} 
    5858             
    …… 
    6161     ChildSFieldReferenceProxy<ObjectTypeT>::operator->(void) const 
    6262{ 
    63     return detail::void_cast<value_type>(AccessHandler::validate(*_pValue)); 
     63    return AccessHandler::validate(*_pValue); 
    6464} 
    6565     
    …… 
    6868     ChildSFieldReferenceProxy<ObjectTypeT>::operator=(value_type newValue) 
    6969{ 
    70     AccessHandler::onReplace( 
    71         _pField, *_pValue, detail::void_cast<StoredType>(newValue)); 
     70    AccessHandler::onReplace(_pField, *_pValue, newValue); 
    7271     
    73     *_pValue = detail::void_cast<StoredType>(newValue); 
     72    *_pValue = newValue; 
    7473} 
    7574 
    …… 
    156155                       NamespaceI  >::setValue(ValueType value) 
    157156{ 
    158     this->ptrStoreSet(detail::void_cast<StoredType>(value)); 
     157    this->ptrStoreSet(value); 
    159158} 
    160159 
    …… 
    164163                       NamespaceI  >::setValue(Self const &source) 
    165164{ 
    166     this->ptrStoreSet(detail::void_cast<StoredType>(source.ptrStoreGet())); 
     165    this->ptrStoreSet(source.ptrStoreGet()); 
    167166} 
    168167