Skip to content

Commit 6bed46c

Browse files
elianalfEduPonz
elianalf
authored and
EduPonz
committed
Remove fixed_size_string file in fastrtps (#4269)
* Refs #20392: Remove fastrtps fixed_size_string lib Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Update tests dependencies Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Update namespace fastcdr Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Reorder libraries to follow google style order Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Remove include of unused fixed_size_string Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Remove deprecated tests of fixed_size_string Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20392: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent dc72275 commit 6bed46c

129 files changed

Lines changed: 10255 additions & 11122 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/AdvancedConfiguration.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <string>
3535
#include <vector>
3636

37-
#include <fastcdr/cdr/fixed_size_string.hpp>
3837
#include <fastcdr/xcdr/external.hpp>
3938
#include <fastcdr/xcdr/optional.hpp>
4039

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

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

29-
30-
#include <fastrtps/utils/fixed_size_string.hpp>
31-
3229
#include <array>
3330
#include <bitset>
3431
#include <cstdint>
@@ -37,6 +34,7 @@
3734
#include <string>
3835
#include <vector>
3936

37+
4038
#if defined(_WIN32)
4139
#if defined(EPROSIMA_USER_DLL_EXPORT)
4240
#define eProsima_user_DllExport __declspec( dllexport )
@@ -208,11 +206,11 @@ class AdvancedConfiguration
208206

209207

210208
/*!
211-
* @brief This function returns the maximum serialized size of an object
212-
* depending on the buffer alignment.
213-
* @param current_alignment Buffer alignment.
214-
* @return Maximum serialized size.
215-
*/
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+
*/
216214
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
217215
size_t current_alignment = 0);
218216

@@ -246,18 +244,17 @@ class AdvancedConfiguration
246244

247245

248246
/*!
249-
* @brief This function tells you if the Key has been defined for this type
250-
*/
247+
* @brief This function tells you if the Key has been defined for this type
248+
*/
251249
eProsima_user_DllExport static bool isKeyDefined();
252250

253251
/*!
254-
* @brief This function serializes the key members of an object using CDR serialization.
255-
* @param cdr CDR serialization object.
256-
*/
252+
* @brief This function serializes the key members of an object using CDR serialization.
253+
* @param cdr CDR serialization object.
254+
*/
257255
eProsima_user_DllExport void serializeKey(
258256
eprosima::fastcdr::Cdr& cdr) const;
259257

260-
261258
private:
262259

263260
uint32_t m_index;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <string>
3535
#include <vector>
3636

37-
#include <fastcdr/cdr/fixed_size_string.hpp>
3837
#include <fastcdr/xcdr/external.hpp>
3938
#include <fastcdr/xcdr/optional.hpp>
4039

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

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

2929

30-
#include <fastrtps/utils/fixed_size_string.hpp>
30+
#include <fastcdr/cdr/fixed_size_string.hpp>
3131

3232
#include <array>
3333
#include <bitset>
@@ -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,18 +217,17 @@ 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-
232231
private:
233232

234233
uint32_t m_index;

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

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

2929

30-
#include <fastrtps/utils/fixed_size_string.hpp>
30+
#include <fastcdr/cdr/fixed_size_string.hpp>
3131

3232
#include <array>
3333
#include <bitset>
@@ -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,18 +210,17 @@ 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-
225224
private:
226225

227226
uint8_t m_index;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <string>
3535
#include <vector>
3636

37-
#include <fastcdr/cdr/fixed_size_string.hpp>
3837
#include <fastcdr/xcdr/external.hpp>
3938
#include <fastcdr/xcdr/optional.hpp>
4039

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

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

29-
30-
#include <fastrtps/utils/fixed_size_string.hpp>
29+
#include <fastcdr/cdr/fixed_size_string.hpp>
3130

3231
#include <array>
3332
#include <bitset>
@@ -179,11 +178,11 @@ class HelloWorld
179178

180179

181180
/*!
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-
*/
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+
*/
187186
eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
188187
size_t current_alignment = 0);
189188

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

218217

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

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

231-
232230
private:
233231

234232
uint32_t m_index;

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define _FAST_DDS_GENERATED_TOPIC_H_
2828

2929

30-
#include <fastrtps/utils/fixed_size_string.hpp>
30+
#include <fastcdr/cdr/fixed_size_string.hpp>
3131

3232
#include <array>
3333
#include <bitset>
@@ -179,11 +179,11 @@ class Topic
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,18 +217,17 @@ class Topic
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-
232231
private:
233232

234233
uint32_t m_index;

‎examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolData.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <string>
3535
#include <vector>
3636

37-
#include <fastcdr/cdr/fixed_size_string.hpp>
3837
#include <fastcdr/xcdr/external.hpp>
3938
#include <fastcdr/xcdr/optional.hpp>
4039

‎examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDatav1.h‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define _FAST_DDS_GENERATED_CUSTOMPAYLOADPOOLDATA_H_
2828

2929

30-
#include <fastrtps/utils/fixed_size_string.hpp>
30+
#include <fastcdr/cdr/fixed_size_string.hpp>
3131

3232
#include <array>
3333
#include <bitset>
@@ -179,11 +179,11 @@ class CustomPayloadPoolData
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,18 +217,17 @@ class CustomPayloadPoolData
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-
232231
private:
233232

234233
uint32_t m_index;

0 commit comments

Comments
 (0)