Skip to content

[20566] Migrate fastrtps/utils/collections to fastdds #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EduPonz merged 3 commits into from
Mar 25, 2024
Merged

[20566] Migrate fastrtps/utils/collections to fastdds #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04fb34
Refs #20566: Migrate fastrtps/utils/collections to fastdds
elianalf Mar 21, 2024
94d5b59
Refs #20566: Change include path of headers in fastrtps moved to fastdds
elianalf Mar 21, 2024
6a97b7a
Refs #20566: Migrate utils/collections
elianalf Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fastdds_python/src/swig/fastdds.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ...lections/ResourceLimitedContainerConfig.i → ...lections/ResourceLimitedContainerConfig.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions ...utils/collections/ResourceLimitedVector.i → ...utils/collections/ResourceLimitedVector.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -61,4 +61,4 @@
}
}

%include "fastrtps/utils/collections/ResourceLimitedVector.hpp"
%include "fastdds/utils/collections/ResourceLimitedVector.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/attributes/TopicAttributes.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/IPFinder.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

%{
#include "fastrtps/utils/IPFinder.h"
#include "fastdds/utils/IPFinder.h"
%}

// Flatten nested classes
Expand All @@ -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");
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/IPLocator.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/TimedConditionVariable.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/TimedMutex.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/fixed_size_bitmap.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastrtps/utils/md5.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_completePubSubTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_included_modulesPubSubTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_modulesPubSubTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion fastdds_python_examples/HelloWorldExample/HelloWorldPubSubTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down