Changeset 36:fc2bc404fdb5 in rrlib_rtti_conversion

Timestamp:

04.05.2020 23:27:27 (4 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Children:

37:5bfa1458cd2c, 38:ae1ecd302f54

Phase:

public

Message:

Fixes compiler warning with gcc 9.3 (initialization with memset)

Files:

• defined_conversions.cpp (modified) (13 diffs)
• tRegisteredConversionOperation.h (modified) (1 diff)

defined_conversions.cpp

@@ -377 +377 @@
     auto index_parameter = operation.GetParameterValue();
     unsigned int index = index_parameter ? (*index_parameter.Get<unsigned int>()) : 0;
-    auto result = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().computation_types[0]).GetVectorElement(index);
+    auto result = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().ComputationTypes()[0]).GetVectorElement(index);
     if (!result)
     {
@@ -389 +389 @@
     auto index_parameter = operation.GetParameterValue();
     unsigned int index = index_parameter ? (*index_parameter.Get<unsigned int>()) : 0;
-    auto intermediate = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().computation_types[0]).GetVectorElement(index);
+    auto intermediate = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().ComputationTypes()[0]).GetVectorElement(index);
     if (!intermediate)
     {
@@ -399 +399 @@
   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const
   {
-    custom_data.computation_types[0] = conversion_option.source_type;
-    while (!(custom_data.computation_types[0].IsListType() || custom_data.computation_types[0].IsArray()))
-    {
-      custom_data.computation_types[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.computation_types[0]);
-      if (!custom_data.computation_types[0])
+    custom_data.ComputationTypes()[0] = conversion_option.source_type;
+    while (!(custom_data.ComputationTypes()[0].IsListType() || custom_data.ComputationTypes()[0].IsArray()))
+    {
+      custom_data.ComputationTypes()[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.ComputationTypes()[0]);
+      if (!custom_data.ComputationTypes()[0])
       {
         throw std::runtime_error("Source type must be list or array");
@@ -434 +434 @@
   static void FirstConversionFunction(const tTypedConstPointer& source_object_original, const tTypedPointer& destination_object_original, const tCurrentConversionOperation& operation)
   {
-    tTypedConstPointer source_object = tTypedConstPointer(source_object_original.GetRawDataPointer(), operation.GetCustomData().computation_types[0]);
+    tTypedConstPointer source_object = tTypedConstPointer(source_object_original.GetRawDataPointer(), operation.GetCustomData().ComputationTypes()[0]);
     const tType& source_type = source_object.GetType();
     tType destination_type = destination_object_original.GetType();
@@ -650 +650 @@
   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const
   {
-    custom_data.computation_types[0] = conversion_option.source_type;
-    while (!(custom_data.computation_types[0].IsListType() || custom_data.computation_types[0].IsArray()))
-    {
-      custom_data.computation_types[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.computation_types[0]);
-      if (!custom_data.computation_types[0])
+    custom_data.ComputationTypes()[0] = conversion_option.source_type;
+    while (!(custom_data.ComputationTypes()[0].IsListType() || custom_data.ComputationTypes()[0].IsArray()))
+    {
+      custom_data.ComputationTypes()[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.ComputationTypes()[0]);
+      if (!custom_data.ComputationTypes()[0])
       {
         throw std::runtime_error("Source type must be list or array");
@@ -694 +694 @@
   static void FinalConversionFunction(const tTypedConstPointer& source_object, const tTypedPointer& destination_object, const tCurrentConversionOperation& operation)
   {
-    const tType& source_type = operation.GetCustomData().computation_types[0];
+    const tType& source_type = operation.GetCustomData().ComputationTypes()[0];
     const tType source_element_type = source_type.GetElementType();
     size_t size = source_type.GetArraySize();
@@ -722 +722 @@
   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const
   {
-    custom_data.computation_types[0] = conversion_option.source_type;
-    while (!custom_data.computation_types[0].IsArray())
-    {
-      custom_data.computation_types[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.computation_types[0]);
-      if (!custom_data.computation_types[0])
+    custom_data.ComputationTypes()[0] = conversion_option.source_type;
+    while (!custom_data.ComputationTypes()[0].IsArray())
+    {
+      custom_data.ComputationTypes()[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.ComputationTypes()[0]);
+      if (!custom_data.ComputationTypes()[0])
       {
         throw std::runtime_error("Source type must be array");
@@ -825 +825 @@
   static void FirstConversionFunction(const tTypedConstPointer& source_object, const tTypedPointer& destination_object, const tCurrentConversionOperation& operation)
   {
-    size_t size = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().computation_types[0]).GetVectorSize();
+    size_t size = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().ComputationTypes()[0]).GetVectorSize();
     operation.Continue(tTypedConstPointer(&size), destination_object);
   }
@@ -831 +831 @@
   static void FinalConversionFunction(const tTypedConstPointer& source_object, const tTypedPointer& destination_object, const tCurrentConversionOperation& operation)
   {
-    (*destination_object.Get<size_t>()) = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().computation_types[0]).GetVectorSize();
+    (*destination_object.Get<size_t>()) = tTypedConstPointer(source_object.GetRawDataPointer(), operation.GetCustomData().ComputationTypes()[0]).GetVectorSize();
   }
 
   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const
   {
-    custom_data.computation_types[0] = conversion_option.source_type;
-    while (!custom_data.computation_types[0].IsListType())
-    {
-      custom_data.computation_types[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.computation_types[0]);
-      if (!custom_data.computation_types[0])
+    custom_data.ComputationTypes()[0] = conversion_option.source_type;
+    while (!custom_data.ComputationTypes()[0].IsListType())
+    {
+      custom_data.ComputationTypes()[0] = GetUnderlyingTypeOperationsAreInheritedFrom(custom_data.ComputationTypes()[0]);
+      if (!custom_data.ComputationTypes()[0])
       {
         throw std::runtime_error("Source type must be list");
@@ -952 +952 @@
   {
     auto& custom_data = operation.GetCustomData();
-    const tType source_type = custom_data.computation_types[0];
-    const tType destination_type = custom_data.computation_types[1];
+    const tType source_type = custom_data.ComputationTypes()[0];
+    const tType destination_type = custom_data.ComputationTypes()[1];
     const tType element_type = source_type.GetElementType();
     size_t element_size = element_type.GetSize();
@@ -978 +978 @@
   {
     const std::vector<bool>* source = source_object.GetUnchecked<std::vector<bool>>();
-    const tType destination_type = operation.GetCustomData().computation_types[1];
+    const tType destination_type = operation.GetCustomData().ComputationTypes()[1];
     size_t destination_elements = destination_type.GetArraySize();
 
@@ -995 +995 @@
   {
     auto& custom_data = operation.GetCustomData();
-    const tType destination_type = custom_data.computation_types[1];
+    const tType destination_type = custom_data.ComputationTypes()[1];
     const tType element_type = destination_type.GetElementType();
-    tTypedConstPointer source_object(source_object_original.GetRawDataPointer(), custom_data.computation_types[0]);
+    tTypedConstPointer source_object(source_object_original.GetRawDataPointer(), custom_data.ComputationTypes()[0]);
 
     size_t copy_elements = std::min(source_object.GetVectorSize(), destination_type.GetArraySize());
@@ -1063 +1063 @@
   virtual void OnCompile(const tConversionOption& conversion_option, tCustomOperationData& custom_data) const
   {
-    custom_data.computation_types[0] = GetSupportedType(conversion_option.source_type, true);
-    custom_data.computation_types[1] = GetSupportedType(conversion_option.destination_type, true);
+    custom_data.ComputationTypes()[0] = GetSupportedType(conversion_option.source_type, true);
+    custom_data.ComputationTypes()[1] = GetSupportedType(conversion_option.destination_type, true);
   }
 

tRegisteredConversionOperation.h

@@ -99 +99 @@
 {
   typedef void (*tConversionFunction)(const tTypedConstPointer& source_object, const tTypedPointer& destination_object, const tCurrentConversionOperation& operation);
+  typedef tType tTypeArray[2];
+  typedef const tType tConstTypeArray[2];
 
   union
   {
     tConversionFunction conversion_function;
-    rrlib::rtti::tType computation_types[2];
+    void* raw_pointers[2] = { nullptr, nullptr };
   };
 
-  tCustomOperationData()
-  {
-    memset(this, 0, sizeof(tCustomOperationData));
+  /*!
+   * \return Array of two non-initialized types
+   */
+  tTypeArray& ComputationTypes()
+  {
+    return reinterpret_cast<tTypeArray&>(raw_pointers);
+  }
+  tConstTypeArray& ComputationTypes() const
+  {
+    return reinterpret_cast<tConstTypeArray&>(raw_pointers);
   }
 };