Re-generate xt typeinfo/lookup/map with correct ops-count

and dds_alignof for top-level type aligment

Signed-off-by: Dennis Potman <[email protected]>

Author: dpotman

src/core/ddsi/src/ddsi_xt_typeinfo.c

@@ -101,12 +101,12 @@ static const uint32_t DDS_XTypes_TypeIdentifier_ops [] =
 const dds_topic_descriptor_t DDS_XTypes_TypeIdentifier_desc =
 {
   .m_size = sizeof (DDS_XTypes_TypeIdentifier),
-  .m_align = sizeof (char *),
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_XTypes_TypeIdentifier),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::XTypes::TypeIdentifier",
   .m_keys = NULL,
-  .m_nops = 52,
+  .m_nops = 63,
   .m_ops = DDS_XTypes_TypeIdentifier_ops,
   .m_meta = ""
 };
@@ -711,12 +711,12 @@ static const uint32_t DDS_XTypes_TypeObject_ops [] =
 const dds_topic_descriptor_t DDS_XTypes_TypeObject_desc =
 {
   .m_size = sizeof (DDS_XTypes_TypeObject),
-  .m_align = 8u,
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_XTypes_TypeObject),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::XTypes::TypeObject",
   .m_keys = NULL,
-  .m_nops = 368,
+  .m_nops = 404,
   .m_ops = DDS_XTypes_TypeObject_ops,
   .m_meta = ""
 };
@@ -837,12 +837,12 @@ static const uint32_t DDS_XTypes_TypeInformation_ops [] =
 const dds_topic_descriptor_t DDS_XTypes_TypeInformation_desc =
 {
   .m_size = sizeof (DDS_XTypes_TypeInformation),
-  .m_align = sizeof (char *),
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_XTypes_TypeInformation),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::XTypes::TypeInformation",
   .m_keys = NULL,
-  .m_nops = 67,
+  .m_nops = 78,
   .m_ops = DDS_XTypes_TypeInformation_ops,
   .m_meta = ""
 };

src/core/ddsi/src/ddsi_xt_typelookup.c

@@ -156,12 +156,12 @@ static const uint32_t DDS_Builtin_TypeLookup_Request_ops [] =
 const dds_topic_descriptor_t DDS_Builtin_TypeLookup_Request_desc =
 {
   .m_size = sizeof (DDS_Builtin_TypeLookup_Request),
-  .m_align = sizeof (char *),
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_Builtin_TypeLookup_Request),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::Builtin::TypeLookup_Request",
   .m_keys = NULL,
-  .m_nops = 83,
+  .m_nops = 96,
   .m_ops = DDS_Builtin_TypeLookup_Request_ops,
   .m_meta = ""
 };
@@ -851,12 +851,12 @@ static const uint32_t DDS_Builtin_TypeLookup_Reply_ops [] =
 const dds_topic_descriptor_t DDS_Builtin_TypeLookup_Reply_desc =
 {
   .m_size = sizeof (DDS_Builtin_TypeLookup_Reply),
-  .m_align = 8u,
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_Builtin_TypeLookup_Reply),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::Builtin::TypeLookup_Reply",
   .m_keys = NULL,
-  .m_nops = 417,
+  .m_nops = 457,
   .m_ops = DDS_Builtin_TypeLookup_Reply_ops,
   .m_meta = ""
 };

src/core/ddsi/src/ddsi_xt_typemap.c

@@ -624,12 +624,12 @@ static const uint32_t DDS_XTypes_TypeMapping_ops [] =
 const dds_topic_descriptor_t DDS_XTypes_TypeMapping_desc =
 {
   .m_size = sizeof (DDS_XTypes_TypeMapping),
-  .m_align = 8u,
-  .m_flagset = DDS_TOPIC_NO_OPTIMIZE | DDS_TOPIC_CONTAINS_UNION,
+  .m_align = dds_alignof (DDS_XTypes_TypeMapping),
+  .m_flagset = DDS_TOPIC_CONTAINS_UNION,
   .m_nkeys = 0u,
   .m_typename = "DDS::XTypes::TypeMapping",
   .m_keys = NULL,
-  .m_nops = 378,
+  .m_nops = 414,
   .m_ops = DDS_XTypes_TypeMapping_ops,
   .m_meta = ""
 };