From 053e56e04abae6bc75894e8cde03aec93c56889c Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:27:43 +0100 Subject: [PATCH] Migrate fastrtps/utils/collections to fastdds (#109) * Refs #20566: Migrate fastrtps/utils/collections to fastdds Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20566: Change include path of headers in fastrtps moved to fastdds Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20566: Migrate utils/collections Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- fastdds_python/src/swig/fastdds.i | 6 +++--- .../utils/collections/ResourceLimitedContainerConfig.i | 4 ++-- .../utils/collections/ResourceLimitedVector.i | 4 ++-- .../src/swig/fastrtps/attributes/TopicAttributes.i | 4 ++-- fastdds_python/src/swig/fastrtps/utils/IPFinder.i | 4 ++-- fastdds_python/src/swig/fastrtps/utils/IPLocator.i | 4 ++-- .../src/swig/fastrtps/utils/TimedConditionVariable.i | 4 ++-- fastdds_python/src/swig/fastrtps/utils/TimedMutex.i | 4 ++-- fastdds_python/src/swig/fastrtps/utils/fixed_size_bitmap.i | 4 ++-- fastdds_python/src/swig/fastrtps/utils/md5.i | 4 ++-- fastdds_python/test/types/test_completePubSubTypes.h | 2 +- .../test/types/test_included_modulesPubSubTypes.h | 2 +- fastdds_python/test/types/test_modulesPubSubTypes.h | 2 +- .../HelloWorldExample/HelloWorldPubSubTypes.h | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) rename fastdds_python/src/swig/{fastrtps => fastdds}/utils/collections/ResourceLimitedContainerConfig.i (81%) rename fastdds_python/src/swig/{fastrtps => fastdds}/utils/collections/ResourceLimitedVector.i (94%) diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i index e6a00101..9400e0f9 100644 --- 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/fastrtps/utils/collections/ResourceLimitedContainerConfig.i b/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedContainerConfig.i similarity index 81% rename from fastdds_python/src/swig/fastrtps/utils/collections/ResourceLimitedContainerConfig.i rename to fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedContainerConfig.i index 8a485797..50cd26d0 100644 --- a/fastdds_python/src/swig/fastrtps/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/fastrtps/utils/collections/ResourceLimitedVector.i b/fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedVector.i similarity index 94% rename from fastdds_python/src/swig/fastrtps/utils/collections/ResourceLimitedVector.i rename to fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedVector.i index 2b9c48df..30a53b5a 100644 --- a/fastdds_python/src/swig/fastrtps/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 index e70f9a59..465b5ac1 100644 --- 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 index b0f8dd18..d5515ae2 100644 --- 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 index 00731c78..8ec7bb23 100644 --- 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 index 650e9788..ce9c5875 100644 --- 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 index 795ecf31..5f2e21fe 100644 --- 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 index 85fb92f8..f92aec8e 100644 --- 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 index 8e0f65c3..2df8f894 100644 --- 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 index d77cf3d3..623058d9 100644 --- a/fastdds_python/test/types/test_completePubSubTypes.h +++ b/fastdds_python/test/types/test_completePubSubTypes.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "test_complete.h" diff --git a/fastdds_python/test/types/test_included_modulesPubSubTypes.h b/fastdds_python/test/types/test_included_modulesPubSubTypes.h index a9962d68..83b199b6 100644 --- a/fastdds_python/test/types/test_included_modulesPubSubTypes.h +++ b/fastdds_python/test/types/test_included_modulesPubSubTypes.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "test_included_modules.h" diff --git a/fastdds_python/test/types/test_modulesPubSubTypes.h b/fastdds_python/test/types/test_modulesPubSubTypes.h index 50415835..febfc9d8 100644 --- a/fastdds_python/test/types/test_modulesPubSubTypes.h +++ b/fastdds_python/test/types/test_modulesPubSubTypes.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "test_modules.h" diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h b/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h index cb61cd6b..545c68b1 100644 --- a/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h +++ b/fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "HelloWorld.h"