Skip to content

[21128] Adjust for Fast DDS public headers migration to .hpp #148

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
merged 2 commits into from
Jun 27, 2024
Merged

[21128] Adjust for Fast DDS public headers migration to .hpp #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1595e
Refs #2112: Update headers from .h to .hpp
JesusPoderoso Jun 21, 2024
5f71c62
Refs #21128: Update types with Gen's PR
JesusPoderoso Jun 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
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/fastdds.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
%include "typemaps.i"

%{
#include "fastdds/config.h"
#include "fastdds/config.hpp"

bool has_statistics()
{
Expand Down
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/Endpoint.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 "fastdds/rtps/Endpoint.h"
#include "fastdds/rtps/Endpoint.hpp"
%}

%include "fastdds/rtps/Endpoint.h"
%include "fastdds/rtps/Endpoint.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/RTPSDomain.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 "fastdds/rtps/RTPSDomain.h"
#include "fastdds/rtps/RTPSDomain.hpp"
%}

%include "fastdds/rtps/RTPSDomain.h"
%include "fastdds/rtps/RTPSDomain.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/EndpointAttributes.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 "fastdds/rtps/attributes/EndpointAttributes.h"
#include "fastdds/rtps/attributes/EndpointAttributes.hpp"
%}

%include "fastdds/rtps/attributes/EndpointAttributes.h"
%include "fastdds/rtps/attributes/EndpointAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/HistoryAttributes.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 "fastdds/rtps/attributes/HistoryAttributes.h"
#include "fastdds/rtps/attributes/HistoryAttributes.hpp"
%}

%include "fastdds/rtps/attributes/HistoryAttributes.h"
%include "fastdds/rtps/attributes/HistoryAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/PropertyPolicy.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

%{
#include "fastdds/rtps/attributes/PropertyPolicy.h"
#include "fastdds/rtps/attributes/PropertyPolicy.hpp"
%}

// Ignore overloaded constructor that have no effect on target language
%ignore eprosima::fastdds::rtps::PropertyPolicy::PropertyPolicy(PropertyPolicy &&);
%ignore eprosima::fastdds::rtps::PropertyPolicyHelper;

%include "fastdds/rtps/attributes/PropertyPolicy.h"
%include "fastdds/rtps/attributes/PropertyPolicy.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/RTPSParticipantAttributes.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 "fastdds/rtps/attributes/RTPSParticipantAttributes.h"
#include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
%}

// Ignore deprecated methods
Expand All @@ -22,4 +22,4 @@
%ignore eprosima::fastdds::rtps::RTPSParticipantAttributes;
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const DiscoveryProtocol&);;

%include "fastdds/rtps/attributes/RTPSParticipantAttributes.h"
%include "fastdds/rtps/attributes/RTPSParticipantAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/ReaderAttributes.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// limitations under the License.

%{
#include "fastdds/rtps/attributes/ReaderAttributes.h"
#include "fastdds/rtps/attributes/ReaderAttributes.hpp"
%}

%ignore eprosima::fastdds::rtps::ReaderAttributes;

%include "fastdds/rtps/attributes/ReaderAttributes.h"
%include "fastdds/rtps/attributes/ReaderAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/ServerAttributes.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 "fastdds/rtps/attributes/ServerAttributes.h"
#include "fastdds/rtps/attributes/ServerAttributes.hpp"
%}

// Ignore deprecated methods
Expand All @@ -24,4 +24,4 @@

%template(RemoteServerAttributesList) std::list<eprosima::fastdds::rtps::RemoteServerAttributes>;

%include "fastdds/rtps/attributes/ServerAttributes.h"
%include "fastdds/rtps/attributes/ServerAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/attributes/WriterAttributes.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// limitations under the License.

%{
#include "fastdds/rtps/attributes/WriterAttributes.h"
#include "fastdds/rtps/attributes/WriterAttributes.hpp"
%}

%ignore eprosima::fastdds::rtps::WriterAttributes;

%include "fastdds/rtps/attributes/WriterAttributes.h"
%include "fastdds/rtps/attributes/WriterAttributes.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/builtin/BuiltinProtocols.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 "fastdds/rtps/builtin/BuiltinProtocols.h"
#include "fastdds/rtps/builtin/BuiltinProtocols.hpp"
%}

%include "fastdds/rtps/builtin/BuiltinProtocols.h"
%include "fastdds/rtps/builtin/BuiltinProtocols.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/builtin/data/ParticipantProxyData.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 "fastdds/rtps/builtin/data/ParticipantProxyData.h"
#include "fastdds/rtps/builtin/data/ParticipantProxyData.hpp"
%}

%include "fastdds/rtps/builtin/data/ParticipantProxyData.h"
%include "fastdds/rtps/builtin/data/ParticipantProxyData.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/builtin/data/ReaderProxyData.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 "fastdds/rtps/builtin/data/ReaderProxyData.h"
#include "fastdds/rtps/builtin/data/ReaderProxyData.hpp"
%}

%include "fastdds/rtps/builtin/data/ReaderProxyData.h"
%include "fastdds/rtps/builtin/data/ReaderProxyData.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/builtin/data/WriterProxyData.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 "fastdds/rtps/builtin/data/WriterProxyData.h"
#include "fastdds/rtps/builtin/data/WriterProxyData.hpp"
%}

%include "fastdds/rtps/builtin/data/WriterProxyData.h"
%include "fastdds/rtps/builtin/data/WriterProxyData.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/BinaryProperty.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 "fastdds/rtps/common/BinaryProperty.h"
#include "fastdds/rtps/common/BinaryProperty.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
Expand All @@ -29,4 +29,4 @@
// We must explicitly declare the specializations of the templates
%template(BinaryPropertySeq) std::vector<eprosima::fastdds::rtps::BinaryProperty>;

%include "fastdds/rtps/common/BinaryProperty.h"
%include "fastdds/rtps/common/BinaryProperty.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/CDRMessage_t.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// limitations under the License.

%{
#include "fastdds/rtps/common/CDRMessage_t.h"
#include "fastdds/rtps/common/CDRMessage_t.hpp"
%}

// Overloaded constructor ignored
%ignore eprosima::fastdds::rtps::CDRMessage_t::CDRMessage_t(CDRMessage_t &&);

%include "fastdds/rtps/common/CDRMessage_t.h"
%include "fastdds/rtps/common/CDRMessage_t.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/CacheChange.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

%{
#include "fastdds/rtps/common/CacheChange.h"
#include "fastdds/rtps/common/CacheChange.hpp"
%}

// Ignore problematic classes that are not part of the user API
%ignore eprosima::fastdds::rtps::CacheChangeWriterInfo_t;
%ignore eprosima::fastdds::rtps::CacheChangeReaderInfo_t;

%include "fastdds/rtps/common/CacheChange.h"
%include "fastdds/rtps/common/CacheChange.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/FragmentNumber.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 "fastdds/rtps/common/FragmentNumber.h"
#include "fastdds/rtps/common/FragmentNumber.hpp"
%}

%include "fastdds/rtps/common/FragmentNumber.h"
%include "fastdds/rtps/common/FragmentNumber.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Guid.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 "fastdds/rtps/common/Guid.h"
#include "fastdds/rtps/common/Guid.hpp"

// Define a hash method in global scope for GUID_t types
// This is necessary if we want other classes to hash an internal GUID_t
Expand All @@ -33,7 +33,7 @@ long hash(const eprosima::fastdds::rtps::GUID_t& guid)
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const GUID_t&);
%ignore eprosima::fastdds::rtps::operator >>(std::istream&, GUID_t&);

%include "fastdds/rtps/common/Guid.h"
%include "fastdds/rtps/common/Guid.hpp"

// Declare the comparison operators as internal to the class
%extend eprosima::fastdds::rtps::GUID_t {
Expand Down
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/InstanceHandle.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 "fastdds/rtps/common/InstanceHandle.h"
#include "fastdds/rtps/common/InstanceHandle.hpp"

// Define a hash method in global scope for InstanceHandle_t types
// This is necessary if we want other classes to hash an internal InstanceHandle_t
Expand Down Expand Up @@ -79,7 +79,7 @@ long hash(const eprosima::fastdds::rtps::InstanceHandle_t& handle)
%template(InstanceHandleVector) std::vector<eprosima::fastdds::rtps::InstanceHandle_t>;
%typemap(doctype) std::vector<eprosima::fastdds::rtps::InstanceHandle_t>"InstanceHandleVector";

%include "fastdds/rtps/common/InstanceHandle.h"
%include "fastdds/rtps/common/InstanceHandle.hpp"

// Declare the comparison operators as internal to the class
%extend eprosima::fastdds::rtps::InstanceHandle_t {
Expand Down
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Locator.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 "fastdds/rtps/common/Locator.h"
#include "fastdds/rtps/common/Locator.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
Expand Down Expand Up @@ -58,7 +58,7 @@
$result = python_tuple;
}

%include "fastdds/rtps/common/Locator.h"
%include "fastdds/rtps/common/Locator.hpp"

%extend eprosima::fastdds::rtps::Locator_t
{
Expand Down
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/MatchingInfo.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 "fastdds/rtps/common/MatchingInfo.h"
#include "fastdds/rtps/common/MatchingInfo.hpp"
%}

%include "fastdds/rtps/common/MatchingInfo.h"
%include "fastdds/rtps/common/MatchingInfo.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/PortParameters.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 "fastdds/rtps/common/PortParameters.h"
#include "fastdds/rtps/common/PortParameters.hpp"
%}

%include "fastdds/rtps/common/PortParameters.h"
%include "fastdds/rtps/common/PortParameters.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Property.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 "fastdds/rtps/common/Property.h"
#include "fastdds/rtps/common/Property.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
Expand All @@ -29,4 +29,4 @@
// We must explicitly declare the specializations of the templates
%template(PropertySeq) std::vector<eprosima::fastdds::rtps::Property>;

%include "fastdds/rtps/common/Property.h"
%include "fastdds/rtps/common/Property.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/SampleIdentity.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 "fastdds/rtps/common/SampleIdentity.h"
#include "fastdds/rtps/common/SampleIdentity.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
Expand All @@ -27,4 +27,4 @@
%ignore operator >>(std::istream& input, SampleIdentity& sid);
%ignore operator <<(std::ostream& output, const SampleIdentity& sid);

%include "fastdds/rtps/common/SampleIdentity.h"
%include "fastdds/rtps/common/SampleIdentity.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/SequenceNumber.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 "fastdds/rtps/common/SequenceNumber.h"
#include "fastdds/rtps/common/SequenceNumber.hpp"
%}


Expand All @@ -22,4 +22,4 @@
%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const SequenceNumberSet_t&);
%ignore eprosima::fastdds::rtps::operator >>(std::istream&, SequenceNumber_t&);

%include "fastdds/rtps/common/SequenceNumber.h"
%include "fastdds/rtps/common/SequenceNumber.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/SerializedPayload.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 "fastdds/rtps/common/SerializedPayload.h"
#include "fastdds/rtps/common/SerializedPayload.hpp"
%}

%include "fastdds/rtps/common/SerializedPayload.h"
%include "fastdds/rtps/common/SerializedPayload.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Time_t.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 <fastdds/rtps/common/Time_t.h>
#include <fastdds/rtps/common/Time_t.hpp>
%}

// There are two definitions of Time_t in different namespaces
Expand Down Expand Up @@ -48,7 +48,7 @@
%ignore eprosima::fastdds::operator+(const Time_t&, const Time_t&);
%ignore eprosima::fastdds::operator-(const Time_t&, const Time_t&);

%include <fastdds/rtps/common/Time_t.h>
%include <fastdds/rtps/common/Time_t.hpp>

// Declare the comparison operators as internal to the class
%extend eprosima::fastdds::Time_t {
Expand Down
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Token.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 "fastdds/rtps/common/Token.h"
#include "fastdds/rtps/common/Token.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
Expand All @@ -24,4 +24,4 @@
%ignore eprosima::fastdds::rtps::DataHolderHelper::find_binary_property_value(const DataHolder& data_holder, const std::string& name);
%ignore eprosima::fastdds::rtps::DataHolderHelper::find_binary_property(const DataHolder& data_holder, const std::string& name);

%include "fastdds/rtps/common/Token.h"
%include "fastdds/rtps/common/Token.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/Types.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// limitations under the License.

%{
#include "fastdds/rtps/common/Types.h"
#include "fastdds/rtps/common/Types.hpp"
%}

%ignore eprosima::fastdds::rtps::operator <<(std::ostream&, const ProtocolVersion_t&);

%include "fastdds/rtps/common/Types.h"
%include "fastdds/rtps/common/Types.hpp"
4 changes: 2 additions & 2 deletions fastdds_python/src/swig/fastdds/rtps/common/WriteParams.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
// limitations under the License.

%{
#include "fastdds/rtps/common/WriteParams.h"
#include "fastdds/rtps/common/WriteParams.hpp"
%}

// Ignore overloaded constructor and methods that have no effect on target language
%ignore eprosima::fastdds::rtps::WriteParams::WriteParams(WriteParams &&);
%ignore eprosima::fastdds::rtps::WriteParams::sample_identity(SampleIdentity &&);
%ignore eprosima::fastdds::rtps::WriteParams::related_sample_identity(SampleIdentity &&);

%include "fastdds/rtps/common/WriteParams.h"
%include "fastdds/rtps/common/WriteParams.hpp"
Loading