Refs #24261: Last update

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

Author: cferreiragonz

examples/cpp/delivery_mechanisms/DeliveryMechanismsCdrAux.hpp

@@ -24,7 +24,7 @@
 
 #include "DeliveryMechanisms.hpp"
 
-constexpr uint32_t DeliveryMechanisms_max_cdr_typesize {40UL};
+constexpr uint32_t DeliveryMechanisms_max_cdr_typesize {36UL};
 constexpr uint32_t DeliveryMechanisms_max_key_cdr_typesize {0UL};
 
 

examples/cpp/delivery_mechanisms/DeliveryMechanismsCdrAux.ipp

@@ -45,7 +45,7 @@ eProsima_user_DllExport size_t calculate_serialized_size(
     eprosima::fastcdr::EncodingAlgorithmFlag previous_encoding = calculator.get_encoding();
     size_t calculated_size {calculator.begin_calculate_type_serialized_size(
                                 eprosima::fastcdr::CdrVersion::XCDRv2 == calculator.get_cdr_version() ?
-                                eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2 :
+                                eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2 :
                                 eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR,
                                 current_alignment)};
 
@@ -70,7 +70,7 @@ eProsima_user_DllExport void serialize(
     eprosima::fastcdr::Cdr::state current_state(scdr);
     scdr.begin_serialize_type(current_state,
             eprosima::fastcdr::CdrVersion::XCDRv2 == scdr.get_cdr_version() ?
-            eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2 :
+            eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2 :
             eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR);
 
     scdr
@@ -91,7 +91,7 @@ eProsima_user_DllExport void deserialize(
 
 
     cdr.deserialize_type(eprosima::fastcdr::CdrVersion::XCDRv2 == cdr.get_cdr_version() ?
-            eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2 :
+            eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2 :
             eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR,
             [&data](eprosima::fastcdr::Cdr& dcdr, const eprosima::fastcdr::MemberId& mid) -> bool
             {

examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.cxx

@@ -65,7 +65,7 @@ bool DeliveryMechanismsPubSubType::serialize(
     ser.set_encoding_flag(
         data_representation == DataRepresentationId_t::XCDR_DATA_REPRESENTATION ?
         eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR  :
-        eprosima::fastcdr::EncodingAlgorithmFlag::DELIMIT_CDR2);
+        eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
 
     try
     {

examples/cpp/delivery_mechanisms/DeliveryMechanismsPubSubTypes.hpp

@@ -40,6 +40,39 @@
 #endif  // FASTDDS_GEN_API_VER
 
 
+#ifndef SWIG
+namespace detail {
+
+template<typename Tag, typename Tag::type M>
+struct DeliveryMechanisms_rob
+{
+    friend constexpr typename Tag::type get(
+            Tag)
+    {
+        return M;
+    }
+
+};
+
+struct DeliveryMechanisms_f
+{
+    typedef std::array<char, 32> DeliveryMechanisms::* type;
+    friend constexpr type get(
+            DeliveryMechanisms_f);
+};
+
+template struct DeliveryMechanisms_rob<DeliveryMechanisms_f, &DeliveryMechanisms::m_message>;
+
+template <typename T, typename Tag>
+inline size_t constexpr DeliveryMechanisms_offset_of()
+{
+    return ((::size_t) &reinterpret_cast<char const volatile&>((((T*)0)->*get(Tag()))));
+}
+
+} // namespace detail
+#endif // ifndef SWIG
+
+
 /*!
  * @brief This class represents the TopicDataType of the type DeliveryMechanisms defined by the user in the IDL file.
  * @ingroup DeliveryMechanisms
@@ -98,8 +131,14 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     eProsima_user_DllExport inline bool is_plain(
             eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
-        static_cast<void>(data_representation);
-        return false;
+        if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
+        {
+            return is_plain_xcdrv2_impl();
+        }
+        else
+        {
+            return is_plain_xcdrv1_impl();
+        }
     }
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
@@ -108,14 +147,29 @@ class DeliveryMechanismsPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     eProsima_user_DllExport inline bool construct_sample(
             void* memory) const override
     {
-        static_cast<void>(memory);
-        return false;
+        new (memory) DeliveryMechanisms();
+        return true;
     }
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
 private:
 
+
+    static constexpr bool is_plain_xcdrv1_impl()
+    {
+        return 36ULL ==
+               (detail::DeliveryMechanisms_offset_of<DeliveryMechanisms, detail::DeliveryMechanisms_f>() +
+               sizeof(std::array<char, 32>));
+    }
+
+    static constexpr bool is_plain_xcdrv2_impl()
+    {
+        return 36ULL ==
+               (detail::DeliveryMechanisms_offset_of<DeliveryMechanisms, detail::DeliveryMechanisms_f>() +
+               sizeof(std::array<char, 32>));
+    }
+
 };
 
 

examples/cpp/delivery_mechanisms/DeliveryMechanismsTypeObjectSupport.cxx

@@ -49,7 +49,7 @@ void register_DeliveryMechanisms_type_identifier(
         "DeliveryMechanisms", type_ids_DeliveryMechanisms);
     if (eprosima::fastdds::dds::RETCODE_OK != return_code_DeliveryMechanisms)
     {
-        StructTypeFlag struct_flags_DeliveryMechanisms = TypeObjectUtils::build_struct_type_flag(eprosima::fastdds::dds::xtypes::ExtensibilityKind::APPENDABLE,
+        StructTypeFlag struct_flags_DeliveryMechanisms = TypeObjectUtils::build_struct_type_flag(eprosima::fastdds::dds::xtypes::ExtensibilityKind::FINAL,
                 false, false);
         QualifiedTypeName type_name_DeliveryMechanisms = "DeliveryMechanisms";
         eprosima::fastcdr::optional<AppliedBuiltinTypeAnnotations> type_ann_builtin_DeliveryMechanisms;