Skip to content

Commit e2b24df

Browse files
JesusPoderosoJesusPoderoso
authored
Adjust for Fast DDS public headers migration to .hpp (#825)
* Refs #21128: Regenerate types Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21128: Set all .h includes as .hpp Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21128: Fix build Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 6e7f076 commit e2b24df

10 files changed

Lines changed: 43 additions & 43 deletions

‎code/CodeTester.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
#include <fastdds/dds/log/Log.hpp>
55
#include <fastdds/dds/subscriber/SampleInfo.hpp>
66
#include <fastdds/dds/topic/TopicDataType.hpp>
7-
#include <fastdds/rtps/history/ReaderHistory.h>
8-
#include <fastdds/rtps/history/WriterHistory.h>
9-
#include <fastdds/rtps/participant/RTPSParticipant.h>
10-
#include <fastdds/rtps/reader/ReaderListener.h>
11-
#include <fastdds/rtps/reader/RTPSReader.h>
12-
#include <fastdds/rtps/RTPSDomain.h>
13-
#include <fastdds/rtps/writer/RTPSWriter.h>
14-
#include <fastdds/utils/IPLocator.h>
7+
#include <fastdds/rtps/history/ReaderHistory.hpp>
8+
#include <fastdds/rtps/history/WriterHistory.hpp>
9+
#include <fastdds/rtps/participant/RTPSParticipant.hpp>
10+
#include <fastdds/rtps/reader/ReaderListener.hpp>
11+
#include <fastdds/rtps/reader/RTPSReader.hpp>
12+
#include <fastdds/rtps/RTPSDomain.hpp>
13+
#include <fastdds/rtps/writer/RTPSWriter.hpp>
14+
#include <fastdds/utils/IPLocator.hpp>
1515

1616
using namespace eprosima::fastdds::dds;
1717
using namespace eprosima::fastdds;

‎code/DDSCodeTester.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@
3838
#include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
3939
#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
4040
#include <fastdds/rtps/attributes/ThreadSettings.hpp>
41-
#include <fastdds/rtps/common/WriteParams.h>
42-
#include <fastdds/rtps/history/IPayloadPool.h>
43-
#include <fastdds/rtps/transport/ChainingTransport.h>
44-
#include <fastdds/rtps/transport/ChainingTransportDescriptor.h>
41+
#include <fastdds/rtps/common/WriteParams.hpp>
42+
#include <fastdds/rtps/history/IPayloadPool.hpp>
43+
#include <fastdds/rtps/transport/ChainingTransport.hpp>
44+
#include <fastdds/rtps/transport/ChainingTransportDescriptor.hpp>
4545
#include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
4646
#include <fastdds/rtps/transport/network/BlockedNetworkInterface.hpp>
4747
#include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
48-
#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
49-
#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
50-
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
51-
#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
52-
#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
53-
#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
48+
#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
49+
#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
50+
#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
51+
#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
52+
#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
53+
#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
5454
#include <fastdds/rtps/transport/NetworkBuffer.hpp>
5555
#include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
5656
#include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
5757
#include <fastdds/statistics/topic_names.hpp>
58-
#include <fastdds/utils/IPLocator.h>
58+
#include <fastdds/utils/IPLocator.hpp>
5959

6060
using namespace eprosima::fastdds::dds;
6161

@@ -6975,7 +6975,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
69756975
return true;
69766976
}
69776977

6978-
MD5 m_md5;
6978+
eprosima::fastdds::MD5 m_md5;
69796979
unsigned char* m_keyBuffer;
69806980
};
69816981

‎code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

22-
#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
23-
#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
22+
#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
23+
#define FAST_DDS_GENERATED__HELLOWORLD_HPP
2424

2525
#include <cstdint>
2626
#include <string>

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

22-
#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
23-
#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
22+
#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
23+
#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
2424

2525
#include "HelloWorld.hpp"
2626

@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
4242
} // namespace fastcdr
4343
} // namespace eprosima
4444

45-
#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
45+
#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
4646

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

22-
#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
23-
#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
22+
#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
23+
#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
2424

2525
#include "HelloWorldCdrAux.hpp"
2626

@@ -122,5 +122,5 @@ void serialize_key(
122122
} // namespace fastcdr
123123
} // namespace eprosima
124124

125-
#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
125+
#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
126126

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

22-
#include "HelloWorldPubSubTypes.h"
22+
#include "HelloWorldPubSubTypes.hpp"
2323

2424
#include <fastdds/dds/log/Log.hpp>
2525
#include <fastdds/rtps/common/CdrSerialization.hpp>

code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h renamed to code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.hpp

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

1515
/*!
16-
* @file HelloWorldPubSubTypes.h
16+
* @file HelloWorldPubSubTypes.hpp
1717
* This header file contains the declaration of the serialization functions.
1818
*
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

2222

23-
#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
24-
#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
23+
#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
24+
#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
2525

2626
#include <fastdds/dds/core/policy/QosPolicies.hpp>
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
28-
#include <fastdds/rtps/common/InstanceHandle.h>
29-
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastdds/utils/md5.h>
28+
#include <fastdds/rtps/common/InstanceHandle.hpp>
29+
#include <fastdds/rtps/common/SerializedPayload.hpp>
30+
#include <fastdds/utils/md5.hpp>
3131

3232
#include "HelloWorld.hpp"
3333

@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
106106
}
107107

108108
eProsima_user_DllExport inline bool is_plain(
109-
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
109+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
110110
{
111111
static_cast<void>(data_representation);
112112
return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
124124

125125
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
126126

127-
MD5 m_md5;
127+
eprosima::fastdds::MD5 m_md5;
128128
unsigned char* m_keyBuffer;
129129

130130
};
131131

132-
#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
132+
#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
133133

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldPublisher.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919

20-
#include "HelloWorldPubSubTypes.h"
20+
#include "HelloWorldPubSubTypes.hpp"
2121

2222
#include <chrono>
2323
#include <thread>

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldSubscriber.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919

20-
#include "HelloWorldPubSubTypes.h"
20+
#include "HelloWorldPubSubTypes.hpp"
2121

2222
#include <chrono>
2323
#include <thread>

‎code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
* This file was generated by the tool fastddsgen.
2020
*/
2121

22-
#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
23-
#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
22+
#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
23+
#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
2424

2525
#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
2626

@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
5353

5454
#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
5555

56-
#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
56+
#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP

0 commit comments

Comments
 (0)