Skip to content

Commit 053e56e

Browse files
elianalfelianalf
authored
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>
1 parent 42a7aae commit 053e56e

14 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎fastdds_python/src/swig/fastdds.i‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,9 @@ namespace builtin {
136136
%include "fastdds/rtps/common/Guid.i"
137137
%include "fastdds/rtps/common/PortParameters.i"
138138
%include "fastdds/rtps/common/InstanceHandle.i"
139-
%include "fastrtps/types/TypesBase.i"
140139
%include "fastdds/rtps/resources/ResourceManagement.i"
141-
%include "fastrtps/utils/collections/ResourceLimitedContainerConfig.i"
142-
%include "fastrtps/utils/collections/ResourceLimitedVector.i"
140+
%include "fastdds/utils/collections/ResourceLimitedContainerConfig.i"
141+
%include "fastdds/utils/collections/ResourceLimitedVector.i"
143142
%include "fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.i"
144143
%include "fastdds/rtps/attributes/ThreadSettings.i"
145144
%include "fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.i"
@@ -152,6 +151,7 @@ namespace builtin {
152151
%include "fastdds/rtps/common/SequenceNumber.i"
153152
%include "fastdds/rtps/common/SampleIdentity.i"
154153
%include "fastdds/rtps/common/WriteParams.i"
154+
%include "fastrtps/types/TypesBase.i"
155155

156156
/*
157157
%include "fastdds/rtps/common/SerializedPayload.i"

fastdds_python/src/swig/fastrtps/utils/collections/ResourceLimitedContainerConfig.i renamed to fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedContainerConfig.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp"
16+
#include "fastdds/utils/collections/ResourceLimitedContainerConfig.hpp"
1717
%}
1818

19-
%include "fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp"
19+
%include "fastdds/utils/collections/ResourceLimitedContainerConfig.hpp"

fastdds_python/src/swig/fastrtps/utils/collections/ResourceLimitedVector.i renamed to fastdds_python/src/swig/fastdds/utils/collections/ResourceLimitedVector.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/collections/ResourceLimitedVector.hpp"
16+
#include "fastdds/utils/collections/ResourceLimitedVector.hpp"
1717
%}
1818

1919
// Operator[] is ignored by SWIG because it does not map correctly to target languages
@@ -61,4 +61,4 @@
6161
}
6262
}
6363

64-
%include "fastrtps/utils/collections/ResourceLimitedVector.hpp"
64+
%include "fastdds/utils/collections/ResourceLimitedVector.hpp"

‎fastdds_python/src/swig/fastrtps/attributes/TopicAttributes.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/attributes/TopicAttributes.h"
16+
#include "fastdds/rtps/attributes/TopicAttributes.h"
1717
%}
1818

19-
%include "fastrtps/attributes/TopicAttributes.h"
19+
%include "fastdds/rtps/attributes/TopicAttributes.h"

‎fastdds_python/src/swig/fastrtps/utils/IPFinder.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/IPFinder.h"
16+
#include "fastdds/utils/IPFinder.h"
1717
%}
1818

1919
// Flatten nested classes
@@ -25,7 +25,7 @@
2525
%rename (IPFinder_info_IP) eprosima::fastrtps::rtps::IPFinder::info_IP;
2626
%rename (IPFinder_info_MAC) eprosima::fastrtps::rtps::IPFinder::info_MAC;
2727

28-
%include "fastrtps/utils/IPFinder.h"
28+
%include "fastdds/utils/IPFinder.h"
2929

3030
// Deactivate class flattening
3131
%feature("flatnested", "0");

‎fastdds_python/src/swig/fastrtps/utils/IPLocator.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/IPLocator.h"
16+
#include "fastdds/utils/IPLocator.h"
1717
%}
1818

19-
%include "fastrtps/utils/IPLocator.h"
19+
%include "fastdds/utils/IPLocator.h"

‎fastdds_python/src/swig/fastrtps/utils/TimedConditionVariable.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/TimedConditionVariable.hpp"
16+
#include "fastdds/utils/TimedConditionVariable.hpp"
1717
%}
1818

19-
%include "fastrtps/utils/TimedConditionVariable.hpp"
19+
%include "fastdds/utils/TimedConditionVariable.hpp"

‎fastdds_python/src/swig/fastrtps/utils/TimedMutex.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/TimedMutex.hpp"
16+
#include "fastdds/utils/TimedMutex.hpp"
1717
%}
1818

19-
%include "fastrtps/utils/TimedMutex.hpp"
19+
%include "fastdds/utils/TimedMutex.hpp"

‎fastdds_python/src/swig/fastrtps/utils/fixed_size_bitmap.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
%{
16-
#include "fastrtps/utils/fixed_size_bitmap.hpp"
16+
#include "fastdds/utils/fixed_size_bitmap.hpp"
1717
%}
1818

19-
%include "fastrtps/utils/fixed_size_bitmap.hpp"
19+
%include "fastdds/utils/fixed_size_bitmap.hpp"

‎fastdds_python/src/swig/fastrtps/utils/md5.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
%include "std_string.i"
1717

1818
%{
19-
#include "fastrtps/utils/md5.h"
19+
#include "fastdds/utils/md5.h"
2020
%}
2121

2222
%ignore md5(const std::string);
2323

24-
%include "fastrtps/utils/md5.h"
24+
%include "fastdds/utils/md5.h"

0 commit comments

Comments
 (0)