Changeset 3:c3f0aa1ccd48 in rrlib_rtti_conversion

Timestamp:

08.06.2017 02:51:06 (6 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Children:

4:96090466c55f, 13:9904a55fa400

Phase:

public

Message:

Fixes bug in construction of tConversionOptions and serialization of tConversionOperationSequence

Files:

• tConversionOperationSequence.cpp (modified) (1 diff)
• tConversionOperationSequence.h (modified) (1 diff)
• tConversionOption.h (modified) (2 diffs)

tConversionOperationSequence.cpp

@@ -472 +472 @@
     if (operation.second)
     {
-      stream << operation.second;
+      stream << *operation.second;
     }
     else

tConversionOperationSequence.h

@@ -139 +139 @@
    * \param source_type Source Type (can be omitted if first operation has fixed source type)
    * \param destination_type Destination Type (can be omitted if last operation has fixed destination type)
+   * \throw Throws exception if conversion operation sequence erroneous, ambiguous, or cannot be used to convert specified types
    */
   tCompiledConversionOperation Compile(bool allow_reference_to_source, const tType& source_type = tType(), const tType& destination_type = tType()) const;

tConversionOption.h

@@ -184 +184 @@
     source_type(source_type),
     destination_type(destination_type),
-    type(tConversionOptionType::STANDARD_CONVERSION_FUNCTION),
+    type(tConversionOptionType::CONST_OFFSET_REFERENCE_TO_SOURCE_OBJECT),
     const_offset_reference_to_source_object(const_offset_reference_to_source_object),
     final_conversion_function(nullptr)
@@ -195 +195 @@
     source_type(source_type),
     destination_type(destination_type),
-    type(tConversionOptionType::STANDARD_CONVERSION_FUNCTION),
+    type(tConversionOptionType::VARIABLE_OFFSET_REFERENCE_TO_SOURCE_OBJECT),
     first_conversion_function(first_conversion_function),
     destination_reference_function(destination_reference_function)