Merge pull request OpenDDS#4320 from jrw972/dynamic-APIs

Implementation of DynamicDataFactory is incomplete
iguessthislldo · Oct 25, 2023 · 2353978 · 2353978
2 parents 06c07cc + 93879ec
commit 2353978
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/dds/DCPS/XTypes/DynamicDataFactory.cpp b/dds/DCPS/XTypes/DynamicDataFactory.cpp
@@ -22,6 +22,11 @@ DynamicDataFactory_ptr DynamicDataFactory::get_instance()
   return ACE_Singleton<DynamicDataFactory, ACE_SYNCH_MUTEX>::instance();
 }
 
+ReturnCode_t DynamicDataFactory::delete_instance()
+{
+  return RETCODE_OK;
+}
+
 DynamicData_ptr DynamicDataFactory::create_data(DynamicType_ptr type)
 {
   return new OpenDDS::XTypes::DynamicDataImpl(type);

diff --git a/dds/DCPS/XTypes/DynamicDataFactory.h b/dds/DCPS/XTypes/DynamicDataFactory.h
@@ -35,6 +35,8 @@ class OpenDDS_Dcps_Export DynamicDataFactory
 
   static DynamicDataFactory_ptr get_instance();
 
+  static ReturnCode_t delete_instance();
+
   DynamicData_ptr create_data(DynamicType_ptr type);
 
   ReturnCode_t delete_data(DynamicData_ptr /*data*/)

diff --git a/dds/DdsDynamicData.idl b/dds/DdsDynamicData.idl
@@ -163,11 +163,10 @@ module DDS {
 
   local interface DynamicDataFactoryInterf {
     // Implemented in C++
-    //static DynamicDataFactory get_instance();
-    // Not Implemented
-    //static DDS::ReturnCode_t delete_instance();
+    // static DynamicDataFactory get_instance();
+    // Implemented in C++
+    // static DDS::ReturnCode_t delete_instance();
     DynamicData create_data(in DynamicType type);
-    /// This is a NOP in OpenDDS
     DDS::ReturnCode_t delete_data(in DynamicData data);
   };
 

diff --git a/docs/news.d/xtypes-dynamic-data.rst b/docs/news.d/xtypes-dynamic-data.rst
@@ -0,0 +1,5 @@
+.. news-prs: 4320
+
+.. news-start-section: Additions
+- Complete interfaces for dealing with DynamicData and DynamicTypes.
+.. news-end-section