Changeset 43:c764871c52fc in rrlib_rtti_conversion

Timestamp:

08.04.2021 06:49:41 (2 weeks ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Tags:

tip

Message:

Makes minor customization to StaticCastOperation for PORT_COMPOSITE_INTERFACE types (now always possible with a common base class)

File:

• tStaticCastOperation.cpp (modified) (2 diffs)

tStaticCastOperation.cpp

@@ -278 +278 @@
   }
   tCommonUnderlyingTypeResult result = GetCommonUnderlyingType(source_type, destination_type);
-  if (result.common_underlying_type == destination_type || (result.cast_from_common_to_destination_type_valid && (result.common_underlying_type == source_type || result.cast_from_common_to_destination_type_implicit || result.cast_from_source_to_common_type_implicit)))
+  if (result.common_underlying_type == destination_type || (result.cast_from_common_to_destination_type_valid && (result.common_underlying_type == source_type || result.cast_from_common_to_destination_type_implicit || result.cast_from_source_to_common_type_implicit)) || result.common_underlying_type.GetTypeClassification() == tTypeClassification::PORT_COMPOSITE_INTERFACE)
   {
     return tConversionOption(source_type, destination_type, 0);
@@ -355 +355 @@
   }
   tCommonUnderlyingTypeResult result = GetCommonUnderlyingType(source_type, destination_type);
-  if ((result.common_underlying_type == destination_type && result.cast_from_source_to_common_type_implicit) || (result.common_underlying_type == source_type && result.cast_from_common_to_destination_type_valid && result.cast_from_common_to_destination_type_implicit))
+  if ((result.common_underlying_type == destination_type && result.cast_from_source_to_common_type_implicit) || (result.common_underlying_type == source_type && result.cast_from_common_to_destination_type_valid && result.cast_from_common_to_destination_type_implicit)
+      || (result.common_underlying_type.GetTypeClassification() == tTypeClassification::PORT_COMPOSITE_INTERFACE && result.cast_from_common_to_destination_type_implicit && result.cast_from_common_to_destination_type_valid && result.cast_from_source_to_common_type_implicit))
   {
     return tConversionOption(source_type, destination_type, 0);