Changeset 38:ae1ecd302f54 in rrlib_rtti_conversion


Ignore:
Timestamp:
12.12.2020 22:10:54 (3 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
17.03
Children:
39:c7c49c4d850d, 40:3a50f65e594b
Phase:
public
Message:

Fixes bug in for-each conversion operation (when converting from std::vector to std::array) - as well as a few clang compiler warnings (missing 'override')

File:
1 edited

Legend:

Unmodified
Added
Removed

  • defined_conversions.cpp

    r36 r38  
    397397  } 
    398398 
    399   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const 
     399  virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const override 
    400400  { 
    401401    custom_data.ComputationTypes()[0] = conversion_option.source_type; 
    … …  
    565565          for (size_t i = 2; i < copy_elements; i++) 
    566566          { 
    567             tTypedConstPointer source_next = tTypedConstPointer(static_cast<const char*>(source_next.GetRawDataPointer()) + offset_source, source_element_type); 
     567            source_next = tTypedConstPointer(static_cast<const char*>(source_next.GetRawDataPointer()) + offset_source, source_element_type); 
    568568            tTypedPointer destination_next(static_cast<char*>(destination_object.GetRawDataPointer()) + i * destination_element_offset, destination_element_type); 
    569569            operation.Continue(source_next, destination_next); 
    … …  
    648648  } 
    649649 
    650   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const 
     650  virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const override 
    651651  { 
    652652    custom_data.ComputationTypes()[0] = conversion_option.source_type; 
    … …  
    720720  } 
    721721 
    722   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const 
     722  virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const override 
    723723  { 
    724724    custom_data.ComputationTypes()[0] = conversion_option.source_type; 
    … …  
    834834  } 
    835835 
    836   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const 
     836  virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const override 
    837837  { 
    838838    custom_data.ComputationTypes()[0] = conversion_option.source_type; 
    … …  
    10611061  } 
    10621062 
    1063   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const 
     1063  virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const override 
    10641064  { 
    10651065    custom_data.ComputationTypes()[0] = GetSupportedType(conversion_option.source_type, true); 
Note: See TracChangeset for help on using the changeset viewer.