Changeset 3:c3f0aa1ccd48 in rrlib_rtti_conversion


Ignore:
Timestamp:
08.06.2017 02:51:06 (20 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Phase:
public
Message:

Fixes bug in construction of tConversionOptions and serialization of tConversionOperationSequence

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tConversionOperationSequence.cpp

    r0 r3  
    472472    if (operation.second) 
    473473    { 
    474       stream << operation.second; 
     474      stream << *operation.second; 
    475475    } 
    476476    else 
  • tConversionOperationSequence.h

    r0 r3  
    139139   * \param source_type Source Type (can be omitted if first operation has fixed source type) 
    140140   * \param destination_type Destination Type (can be omitted if last operation has fixed destination type) 
     141   * \throw Throws exception if conversion operation sequence erroneous, ambiguous, or cannot be used to convert specified types 
    141142   */ 
    142143  tCompiledConversionOperation Compile(bool allow_reference_to_source, const tType& source_type = tType(), const tType& destination_type = tType()) const; 
  • tConversionOption.h

    r0 r3  
    184184    source_type(source_type), 
    185185    destination_type(destination_type), 
    186     type(tConversionOptionType::STANDARD_CONVERSION_FUNCTION), 
     186    type(tConversionOptionType::CONST_OFFSET_REFERENCE_TO_SOURCE_OBJECT), 
    187187    const_offset_reference_to_source_object(const_offset_reference_to_source_object), 
    188188    final_conversion_function(nullptr) 
     
    195195    source_type(source_type), 
    196196    destination_type(destination_type), 
    197     type(tConversionOptionType::STANDARD_CONVERSION_FUNCTION), 
     197    type(tConversionOptionType::VARIABLE_OFFSET_REFERENCE_TO_SOURCE_OBJECT), 
    198198    first_conversion_function(first_conversion_function), 
    199199    destination_reference_function(destination_reference_function) 
Note: See TracChangeset for help on using the changeset viewer.