Skip to content

Commit f046d08

Browse files
elianalfEduPonz
elianalf
authored and
EduPonz
committed
Migrate classes from include/fastrtps to fastdds (#4518)
* Refs #20566: Migrate fastrtps/attributes/TopicAttributes.h to fastdds/rtps/attributes Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/IPFinder.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/IPLocator.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/collections to fastdds/utils/collections Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/fixed_size_bitmap.hpp to fastdds/utils/ Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/md5.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/TimedConditionVariable.hpp to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/TimedMutex.hpp to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Reorder header following google style Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Regenerate file with updated headers Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20566: fix rebase error Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
1 parent b1bd8b7 commit f046d08

284 files changed

Lines changed: 13230 additions & 12961 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
2828
#include <fastdds/rtps/common/InstanceHandle.h>
2929
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastrtps/utils/md5.h>
30+
#include <fastdds/utils/md5.h>
3131

3232
#include "AdvancedConfiguration.h"
3333

‎examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@ class AdvancedConfiguration
206206

207207

208208
/*!
209-
* @brief This function returns the maximum serialized size of an object
210-
* depending on the buffer alignment.
211-
* @param current_alignment Buffer alignment.
212-
* @return Maximum serialized size.
213-
*/
209+
* @brief This function returns the maximum serialized size of an object
210+
* depending on the buffer alignment.
211+
* @param current_alignment Buffer alignment.
212+
* @return Maximum serialized size.
213+
*/
214214
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
215215
size_t current_alignment = 0);
216216

@@ -244,17 +244,18 @@ class AdvancedConfiguration
244244

245245

246246
/*!
247-
* @brief This function tells you if the Key has been defined for this type
248-
*/
247+
* @brief This function tells you if the Key has been defined for this type
248+
*/
249249
eProsima_user_DllExport static bool isKeyDefined();
250250

251251
/*!
252-
* @brief This function serializes the key members of an object using CDR serialization.
253-
* @param cdr CDR serialization object.
254-
*/
252+
* @brief This function serializes the key members of an object using CDR serialization.
253+
* @param cdr CDR serialization object.
254+
*/
255255
eProsima_user_DllExport void serializeKey(
256256
eprosima::fastcdr::Cdr& cdr) const;
257257

258+
258259
private:
259260

260261
uint32_t m_index;

‎examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
2828
#include <fastdds/rtps/common/InstanceHandle.h>
2929
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastrtps/utils/md5.h>
30+
#include <fastdds/utils/md5.h>
3131

3232
#include "HelloWorld.h"
3333

‎examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define _FAST_DDS_GENERATED_HELLOWORLD_H_
2828

2929

30-
#include <fastcdr/cdr/fixed_size_string.hpp>
31-
3230
#include <array>
3331
#include <bitset>
3432
#include <cstdint>
@@ -37,6 +35,8 @@
3735
#include <string>
3836
#include <vector>
3937

38+
#include <fastcdr/cdr/fixed_size_string.hpp>
39+
4040
#if defined(_WIN32)
4141
#if defined(EPROSIMA_USER_DLL_EXPORT)
4242
#define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
179179

180180

181181
/*!
182-
* @brief This function returns the maximum serialized size of an object
183-
* depending on the buffer alignment.
184-
* @param current_alignment Buffer alignment.
185-
* @return Maximum serialized size.
186-
*/
182+
* @brief This function returns the maximum serialized size of an object
183+
* depending on the buffer alignment.
184+
* @param current_alignment Buffer alignment.
185+
* @return Maximum serialized size.
186+
*/
187187
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
188188
size_t current_alignment = 0);
189189

@@ -217,17 +217,18 @@ class HelloWorld
217217

218218

219219
/*!
220-
* @brief This function tells you if the Key has been defined for this type
221-
*/
220+
* @brief This function tells you if the Key has been defined for this type
221+
*/
222222
eProsima_user_DllExport static bool isKeyDefined();
223223

224224
/*!
225-
* @brief This function serializes the key members of an object using CDR serialization.
226-
* @param cdr CDR serialization object.
227-
*/
225+
* @brief This function serializes the key members of an object using CDR serialization.
226+
* @param cdr CDR serialization object.
227+
*/
228228
eProsima_user_DllExport void serializeKey(
229229
eprosima::fastcdr::Cdr& cdr) const;
230230

231+
231232
private:
232233

233234
uint32_t m_index;

‎examples/cpp/dds/Configurability/samplePubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
2828
#include <fastdds/rtps/common/InstanceHandle.h>
2929
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastrtps/utils/md5.h>
30+
#include <fastdds/utils/md5.h>
3131

3232
#include "sample.h"
3333

‎examples/cpp/dds/Configurability/samplev1.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define _FAST_DDS_GENERATED_SAMPLE_H_
2828

2929

30-
#include <fastcdr/cdr/fixed_size_string.hpp>
31-
3230
#include <array>
3331
#include <bitset>
3432
#include <cstdint>
@@ -37,6 +35,8 @@
3735
#include <string>
3836
#include <vector>
3937

38+
#include <fastcdr/cdr/fixed_size_string.hpp>
39+
4040
#if defined(_WIN32)
4141
#if defined(EPROSIMA_USER_DLL_EXPORT)
4242
#define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
172172

173173

174174
/*!
175-
* @brief This function returns the maximum serialized size of an object
176-
* depending on the buffer alignment.
177-
* @param current_alignment Buffer alignment.
178-
* @return Maximum serialized size.
179-
*/
175+
* @brief This function returns the maximum serialized size of an object
176+
* depending on the buffer alignment.
177+
* @param current_alignment Buffer alignment.
178+
* @return Maximum serialized size.
179+
*/
180180
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
181181
size_t current_alignment = 0);
182182

@@ -210,17 +210,18 @@ class sample
210210

211211

212212
/*!
213-
* @brief This function tells you if the Key has been defined for this type
214-
*/
213+
* @brief This function tells you if the Key has been defined for this type
214+
*/
215215
eProsima_user_DllExport static bool isKeyDefined();
216216

217217
/*!
218-
* @brief This function serializes the key members of an object using CDR serialization.
219-
* @param cdr CDR serialization object.
220-
*/
218+
* @brief This function serializes the key members of an object using CDR serialization.
219+
* @param cdr CDR serialization object.
220+
*/
221221
eProsima_user_DllExport void serializeKey(
222222
eprosima::fastcdr::Cdr& cdr) const;
223223

224+
224225
private:
225226

226227
uint8_t m_index;

‎examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
2828
#include <fastdds/rtps/common/InstanceHandle.h>
2929
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastrtps/utils/md5.h>
30+
#include <fastdds/utils/md5.h>
3131

3232
#include "HelloWorld.h"
3333

‎examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ namespace { char dummy; }
2626

2727
#include "HelloWorld.h"
2828
#include "HelloWorldTypeObject.h"
29+
2930
#include <mutex>
3031
#include <utility>
3132
#include <sstream>
33+
3234
#include <fastdds/rtps/common/CdrSerialization.hpp>
33-
#include <fastrtps/rtps/common/SerializedPayload.h>
34-
#include <fastrtps/utils/md5.h>
35+
#include <fastdds/rtps/common/SerializedPayload.h>
36+
#include <fastdds/utils/md5.h>
3537
#include <fastrtps/types/TypeObjectFactory.h>
3638
#include <fastrtps/types/TypeNamesGenerator.h>
3739
#include <fastrtps/types/AnnotationParameterValue.h>

‎examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_
2727
#define _FAST_DDS_GENERATED_HELLOWORLD_H_
2828

29-
#include <fastcdr/cdr/fixed_size_string.hpp>
3029

3130
#include <array>
3231
#include <bitset>
@@ -36,6 +35,8 @@
3635
#include <string>
3736
#include <vector>
3837

38+
#include <fastcdr/cdr/fixed_size_string.hpp>
39+
3940
#if defined(_WIN32)
4041
#if defined(EPROSIMA_USER_DLL_EXPORT)
4142
#define eProsima_user_DllExport __declspec( dllexport )
@@ -178,11 +179,11 @@ class HelloWorld
178179

179180

180181
/*!
181-
* @brief This function returns the maximum serialized size of an object
182-
* depending on the buffer alignment.
183-
* @param current_alignment Buffer alignment.
184-
* @return Maximum serialized size.
185-
*/
182+
* @brief This function returns the maximum serialized size of an object
183+
* depending on the buffer alignment.
184+
* @param current_alignment Buffer alignment.
185+
* @return Maximum serialized size.
186+
*/
186187
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
187188
size_t current_alignment = 0);
188189

@@ -216,17 +217,18 @@ class HelloWorld
216217

217218

218219
/*!
219-
* @brief This function tells you if the Key has been defined for this type
220-
*/
220+
* @brief This function tells you if the Key has been defined for this type
221+
*/
221222
eProsima_user_DllExport static bool isKeyDefined();
222223

223224
/*!
224-
* @brief This function serializes the key members of an object using CDR serialization.
225-
* @param cdr CDR serialization object.
226-
*/
225+
* @brief This function serializes the key members of an object using CDR serialization.
226+
* @param cdr CDR serialization object.
227+
*/
227228
eProsima_user_DllExport void serializeKey(
228229
eprosima::fastcdr::Cdr& cdr) const;
229230

231+
230232
private:
231233

232234
uint32_t m_index;

‎examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
2828
#include <fastdds/rtps/common/InstanceHandle.h>
2929
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastrtps/utils/md5.h>
30+
#include <fastdds/utils/md5.h>
3131

3232
#include "Topic.h"
3333

0 commit comments

Comments
 (0)