Migrate fastrtps/utils/collections to fastdds (#109)

elianalf · EduPonz · commit 947776376130 · 2024-03-25T12:56:22.000+01:00
* Refs #20566: Migrate fastrtps/utils/collections to fastdds

Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;

* Refs #20566: Change include path of headers in fastrtps moved to fastdds

Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;

* Refs #20566: Migrate utils/collections

Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;

---------

Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;
diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i
@@ -136,10 +136,9 @@ namespace builtin {
 %include "fastdds/rtps/common/Guid.i"
 %include "fastdds/rtps/common/PortParameters.i"
 %include "fastdds/rtps/common/InstanceHandle.i"
-%include "fastrtps/types/TypesBase.i"
 %include "fastdds/rtps/resources/ResourceManagement.i"
-%include "fastrtps/utils/collections/ResourceLimitedContainerConfig.i"
-%include "fastrtps/utils/collections/ResourceLimitedVector.i"
+%include "fastdds/utils/collections/ResourceLimitedContainerConfig.i"
+%include "fastdds/utils/collections/ResourceLimitedVector.i"
 %include "fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.i"
 %include "fastdds/rtps/attributes/ThreadSettings.i"
 %include "fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.i"
@@ -152,6 +151,7 @@ namespace builtin {
 %include "fastdds/rtps/common/SequenceNumber.i"
 %include "fastdds/rtps/common/SampleIdentity.i"
 %include "fastdds/rtps/common/WriteParams.i"
+%include "fastrtps/types/TypesBase.i"
 
 /*
 %include "fastdds/rtps/common/SerializedPayload.i"
diff --git a/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedContainerConfig.i b/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedContainerConfig.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp"
+#include "fastdds/utils/collections/ResourceLimitedContainerConfig.hpp"
 %}
 
-%include "fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp"
+%include "fastdds/utils/collections/ResourceLimitedContainerConfig.hpp"
diff --git a/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedVector.i b/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedVector.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/collections/ResourceLimitedVector.hpp"
+#include "fastdds/utils/collections/ResourceLimitedVector.hpp"
 %}
 
 // Operator[] is ignored by SWIG because it does not map correctly to target languages
@@ -61,4 +61,4 @@
     }
 }
 
-%include "fastrtps/utils/collections/ResourceLimitedVector.hpp"
+%include "fastdds/utils/collections/ResourceLimitedVector.hpp"
diff --git a/fastdds_python/src/swig/fastrtps/attributes/TopicAttributes.i b/fastdds_python/src/swig/fastrtps/attributes/TopicAttributes.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/attributes/TopicAttributes.h"
+#include "fastdds/rtps/attributes/TopicAttributes.h"
 %}
 
-%include "fastrtps/attributes/TopicAttributes.h"
+%include "fastdds/rtps/attributes/TopicAttributes.h"
diff --git a/fastdds_python/src/swig/fastrtps/utils/IPFinder.i b/fastdds_python/src/swig/fastrtps/utils/IPFinder.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/IPFinder.h"
+#include "fastdds/utils/IPFinder.h"
 %}
 
 // Flatten nested classes
@@ -25,7 +25,7 @@
 %rename (IPFinder_info_IP) eprosima::fastrtps::rtps::IPFinder::info_IP;
 %rename (IPFinder_info_MAC) eprosima::fastrtps::rtps::IPFinder::info_MAC;
 
-%include "fastrtps/utils/IPFinder.h"
+%include "fastdds/utils/IPFinder.h"
 
 // Deactivate class flattening
 %feature("flatnested", "0");
diff --git a/fastdds_python/src/swig/fastrtps/utils/IPLocator.i b/fastdds_python/src/swig/fastrtps/utils/IPLocator.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/IPLocator.h"
+#include "fastdds/utils/IPLocator.h"
 %}
 
-%include "fastrtps/utils/IPLocator.h"
+%include "fastdds/utils/IPLocator.h"
diff --git a/fastdds_python/src/swig/fastrtps/utils/TimedConditionVariable.i b/fastdds_python/src/swig/fastrtps/utils/TimedConditionVariable.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/TimedConditionVariable.hpp"
+#include "fastdds/utils/TimedConditionVariable.hpp"
 %}
 
-%include "fastrtps/utils/TimedConditionVariable.hpp"
+%include "fastdds/utils/TimedConditionVariable.hpp"
diff --git a/fastdds_python/src/swig/fastrtps/utils/TimedMutex.i b/fastdds_python/src/swig/fastrtps/utils/TimedMutex.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/TimedMutex.hpp"
+#include "fastdds/utils/TimedMutex.hpp"
 %}
 
-%include "fastrtps/utils/TimedMutex.hpp"
+%include "fastdds/utils/TimedMutex.hpp"
diff --git a/fastdds_python/src/swig/fastrtps/utils/fixed_size_bitmap.i b/fastdds_python/src/swig/fastrtps/utils/fixed_size_bitmap.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastrtps/utils/fixed_size_bitmap.hpp"
+#include "fastdds/utils/fixed_size_bitmap.hpp"
 %}
 
-%include "fastrtps/utils/fixed_size_bitmap.hpp"
+%include "fastdds/utils/fixed_size_bitmap.hpp"
diff --git a/fastdds_python/src/swig/fastrtps/utils/md5.i b/fastdds_python/src/swig/fastrtps/utils/md5.i
@@ -16,9 +16,9 @@
 %include "std_string.i"
 
 %{
-#include "fastrtps/utils/md5.h"
+#include "fastdds/utils/md5.h"
 %}
 
 %ignore md5(const std::string);
 
-%include "fastrtps/utils/md5.h"
+%include "fastdds/utils/md5.h"
diff --git a/fastdds_python/test/types/test_completePubSubTypes.h b/fastdds_python/test/types/test_completePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "test_complete.h"
 
diff --git a/fastdds_python/test/types/test_included_modulesPubSubTypes.h b/fastdds_python/test/types/test_included_modulesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "test_included_modules.h"
 
diff --git a/fastdds_python/test/types/test_modulesPubSubTypes.h b/fastdds_python/test/types/test_modulesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "test_modules.h"
 
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h b/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`// limitations under the License.`
`14`	`14`
`15`	`15`	`%{`
`16`		`-#include "fastrtps/utils/collections/ResourceLimitedVector.hpp"`
	`16`	`+#include "fastdds/utils/collections/ResourceLimitedVector.hpp"`
`17`	`17`	`%}`
`18`	`18`
`19`	`19`	`// Operator[] is ignored by SWIG because it does not map correctly to target languages`
`@@ -61,4 +61,4 @@`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-%include "fastrtps/utils/collections/ResourceLimitedVector.hpp"`
	`64`	`+%include "fastdds/utils/collections/ResourceLimitedVector.hpp"`