Refs 17138. API update fixes ... part 2

Signed-off-by: Miguel Barro <[email protected]>

include/fastrtps/types/TypesBase.h

@@ -952,7 +952,7 @@ namespace fastrtps {
 namespace types {
 namespace v1_3 {
 
-using DynamicType_ptr = std::shared_ptr<DynamicType>;
+using DynamicType_ptr = std::shared_ptr<const DynamicType>;
 using DynamicTypeBuilder_ptr = std::shared_ptr<DynamicTypeBuilder>;
 using DynamicTypeBuilder_cptr = std::shared_ptr<const DynamicTypeBuilder>;
 

include/fastrtps/types/v1_3/DynamicPubSubType.hpp

@@ -41,7 +41,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType
     RTPS_DllAPI DynamicPubSubType() = default;
 
     RTPS_DllAPI DynamicPubSubType(
-            v1_3::DynamicType& type);
+            const v1_3::DynamicType& type);
 
     RTPS_DllAPI virtual ~DynamicPubSubType();
 
@@ -74,7 +74,7 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType
             const v1_3::DynamicData& data);
 
     RTPS_DllAPI ReturnCode_t SetDynamicType(
-            v1_3::DynamicType& type);
+            const v1_3::DynamicType& type);
 };
 
 } // namespace v1_3

include/fastrtps/types/v1_3/DynamicTypeBuilder.hpp

@@ -45,6 +45,9 @@ class DynamicTypeBuilder final
     static void before_destruction(
             DynamicType* b);
 
+    static ReturnCode_t delete_type(
+            const DynamicType* type) noexcept;
+
     // Only create objects from the associated factory
     struct use_the_create_method
     {
@@ -171,7 +174,7 @@ class DynamicTypeBuilder final
      *            non-const method usage.
      * @return new @ref DynamicType object reference
      */
-    RTPS_DllAPI DynamicType* build() const;
+    RTPS_DllAPI const DynamicType* build() const;
 
     RTPS_DllAPI ReturnCode_t copy_from(
             const DynamicTypeBuilder* other);

include/fastrtps/types/v1_3/DynamicTypeBuilderFactory.hpp

@@ -280,7 +280,7 @@ class DynamicTypeBuilderFactory final
      * @param[in] kind type identifying the primitive type to retrieve
      * @return @ref DynamicType object
      */
-    RTPS_DllAPI DynamicType* get_primitive_type(
+    RTPS_DllAPI const DynamicType* get_primitive_type(
             TypeKind kind) noexcept;
 
     /**
@@ -470,7 +470,7 @@ class DynamicTypeBuilderFactory final
      * Creates a new @ref DynamicTypeBuilder object representing an enum
      * @return new @ref DynamicTypeBuilder object
      */
-    RTPS_DllAPI DynamicTypeBuilder* create_enum_type();
+    RTPS_DllAPI const DynamicTypeBuilder* create_enum_type();
 
     /**
      * Returns a @ref DynamicTypeBuilder associated with a `TypeKind::TK_STRUCTURE`
@@ -499,67 +499,67 @@ class DynamicTypeBuilderFactory final
      * @param[in] name string annotation identifier
      * @return new @ref DynamicTypeBuilder object
      */
-    RTPS_DllAPI DynamicType* create_annotation_primitive(
+    RTPS_DllAPI const DynamicType* create_annotation_primitive(
             const std::string& name);
 
     //! returns type instantiation of the @ref DynamicTypeBuilderFactory::create_alias_type builder
-    RTPS_DllAPI DynamicType* get_alias_type(
+    RTPS_DllAPI const DynamicType* get_alias_type(
             const DynamicType& base_type,
             const std::string& sName);
 
     //! returns the cache type associated to create_int16_type()
-    RTPS_DllAPI DynamicType* get_int16_type();
+    RTPS_DllAPI const DynamicType* get_int16_type();
 
     //! returns the cache type associated to create_uint16_type()
-    RTPS_DllAPI DynamicType* get_uint16_type();
+    RTPS_DllAPI const DynamicType* get_uint16_type();
 
     //! returns the cache type associated to create_int32_type()
-    RTPS_DllAPI DynamicType* get_int32_type();
+    RTPS_DllAPI const DynamicType* get_int32_type();
 
     //! returns the cache type associated to create_uint32_type()
-    RTPS_DllAPI DynamicType* get_uint32_type();
+    RTPS_DllAPI const DynamicType* get_uint32_type();
 
     //! returns the cache type associated to create_int64_type()
-    RTPS_DllAPI DynamicType* get_int64_type();
+    RTPS_DllAPI const DynamicType* get_int64_type();
 
     //! returns the cache type associated to create_uint64_type()
-    RTPS_DllAPI DynamicType* get_uint64_type();
+    RTPS_DllAPI const DynamicType* get_uint64_type();
 
     //! returns the cache type associated to create_float32_type()
-    RTPS_DllAPI DynamicType* get_float32_type();
+    RTPS_DllAPI const DynamicType* get_float32_type();
 
     //! returns the cache type associated to create_float64_type()
-    RTPS_DllAPI DynamicType* get_float64_type();
+    RTPS_DllAPI const DynamicType* get_float64_type();
 
     //! returns the cache type associated to create_float128_type()
-    RTPS_DllAPI DynamicType* get_float128_type();
+    RTPS_DllAPI const DynamicType* get_float128_type();
 
     //! returns the cache type associated to create_char8_type()
-    RTPS_DllAPI DynamicType* get_char8_type();
+    RTPS_DllAPI const DynamicType* get_char8_type();
 
     //! returns the cache type associated to create_char16_type()
-    RTPS_DllAPI DynamicType* get_char16_type();
+    RTPS_DllAPI const DynamicType* get_char16_type();
 
     //! returns the cache type associated to create_bool_type()
-    RTPS_DllAPI DynamicType* get_bool_type();
+    RTPS_DllAPI const DynamicType* get_bool_type();
 
     //! returns the cache type associated to get_byte_type()
-    RTPS_DllAPI DynamicType* get_byte_type();
+    RTPS_DllAPI const DynamicType* get_byte_type();
 
     //! returns the cache type associated to create_string_type()
-    RTPS_DllAPI DynamicType* get_string_type(
+    RTPS_DllAPI const DynamicType* get_string_type(
             uint32_t bound = LENGTH_UNLIMITED) noexcept;
 
     //! returns the cache type associated to create_wstring_type()
-    RTPS_DllAPI DynamicType* get_wstring_type(
+    RTPS_DllAPI const DynamicType* get_wstring_type(
             uint32_t bound = LENGTH_UNLIMITED) noexcept;
 
     /**
      * Creates a new @ref DynamicTypeBuilder object representing a bitset
      * @param[in] bound `uint32_t` representing the maximum number of elements that may be stored.
      * @return new @ref DynamicTypeBuilder object
      */
-    RTPS_DllAPI DynamicType* get_bitset_type(
+    RTPS_DllAPI const DynamicType* get_bitset_type(
             uint32_t bound);
 
     RTPS_DllAPI void build_type_identifier(

include/fastrtps/utils/custom_allocators.hpp

@@ -206,12 +206,12 @@ namespace detail {
 
 template<class T>
 class external_reference_counting
-    : public std::enable_shared_from_this<T>
+    : public std::enable_shared_from_this<const T>
 {
     //! Keeps the object alive is external references are held
-    std::shared_ptr<T> external_lock_;
+    mutable std::shared_ptr<const T> external_lock_;
     //! External references tracker
-    std::atomic_long counter_ = {0l};
+    mutable std::atomic_long counter_ = {0l};
 
 protected:
 
@@ -231,7 +231,7 @@ class external_reference_counting
         return counter_;
     }
 
-    long add_ref()
+    long add_ref() const
     {
         long former = counter_;
 
@@ -248,8 +248,8 @@ class external_reference_counting
             }
 
             // sync with other threads release() operations
-            std::shared_ptr<T> empty;
-            std::shared_ptr<T> inner = this->shared_from_this();
+            std::shared_ptr<const T> empty;
+            std::shared_ptr<const T> inner = this->shared_from_this();
 
             while (!std::atomic_compare_exchange_strong(
                         &external_lock_,
@@ -281,7 +281,7 @@ class external_reference_counting
         }
     }
 
-    long release()
+    long release() const
     {
         long former = counter_;
 
@@ -301,13 +301,13 @@ class external_reference_counting
             }
 
             // sync with other threads add_ref() operations
-            std::shared_ptr<T> inner = this->shared_from_this(),
+            std::shared_ptr<const T> inner = this->shared_from_this(),
                     cmp = inner;
 
             while (!std::atomic_compare_exchange_strong(
                         &external_lock_,
                         &cmp,
-                        std::shared_ptr<T>{}))
+                        std::shared_ptr<const T>{}))
             {
                 if (!cmp)
                 {

src/cpp/dynamic-types/v1_3/DynamicDataFactory.cpp

@@ -88,7 +88,7 @@ DynamicData* DynamicDataFactory::create_data(
 {
     if (pBuilder != nullptr && pBuilder->is_consistent())
     {
-        DynamicType_ptr pType = pBuilder->build();
+        DynamicType_ptr pType{pBuilder->build()};
         return create_data(pType);
     }
     else

src/cpp/dynamic-types/v1_3/DynamicPubSubType.cpp

@@ -25,7 +25,7 @@
 using namespace eprosima::fastrtps::types::v1_3;
 
 DynamicPubSubType::DynamicPubSubType(
-        DynamicType& type)
+        const DynamicType& type)
     : dynamic_type_(&type)
 {
     UpdateDynamicTypeInfo();
@@ -66,7 +66,7 @@ ReturnCode_t DynamicPubSubType::SetDynamicType(
 }
 
 ReturnCode_t DynamicPubSubType::SetDynamicType(
-        DynamicType& type)
+        const DynamicType& type)
 {
     if (!dynamic_type_)
     {

src/cpp/dynamic-types/v1_3/DynamicTypeBuilder.cpp

@@ -224,7 +224,7 @@ ReturnCode_t DynamicTypeBuilder::add_member(
     return ReturnCode_t::RETCODE_OK;
 }
 
-DynamicType* DynamicTypeBuilder::build() const
+const DynamicType* DynamicTypeBuilder::build() const
 {
     // check if an instance is already available
     // and is still valid
@@ -334,3 +334,15 @@ std::function<void(const DynamicTypeBuilder*)> eprosima::fastrtps::types::v1_3::
 
    return nullptr;
 }
+
+ReturnCode_t DynamicTypeBuilder::delete_type(
+        const DynamicType* type) noexcept
+{
+    if (type != nullptr)
+    {
+        type->release();
+        return ReturnCode_t::RETCODE_OK;
+    }
+
+    return ReturnCode_t::RETCODE_PRECONDITION_NOT_MET;
+}