Skip to content

Commit 5f71c62

Browse files
JesusPoderosoJesusPoderoso
committed
Refs #21128: Update types with Gen's PR
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 6d1595e commit 5f71c62

28 files changed

Lines changed: 107 additions & 107 deletions

‎fastdds_python/test/types/test_complete.hpp‎

Lines changed: 4 additions & 4 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_TEST_COMPLETE_HPP_
23-
#define _FAST_DDS_GENERATED_TEST_COMPLETE_HPP_
22+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETE_HPP
23+
#define FAST_DDS_GENERATED__TEST_COMPLETE_HPP
2424

2525
#include <array>
2626
#include <cstdint>
@@ -60,7 +60,7 @@
6060
* @brief This class represents the enumeration Color defined by the user in the IDL file.
6161
* @ingroup test_complete
6262
*/
63-
enum class Color : uint32_t
63+
enum class Color : int32_t
6464
{
6565
RED,
6666
GREEN,
@@ -72,7 +72,7 @@ enum class Color : uint32_t
7272
* @brief This class represents the enumeration Material defined by the user in the IDL file.
7373
* @ingroup test_complete
7474
*/
75-
enum class Material : uint32_t
75+
enum class Material : int32_t
7676
{
7777
WOOD,
7878
PLASTIC,

‎fastdds_python/test/types/test_completeCdrAux.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_TEST_COMPLETECDRAUX_HPP_
23-
#define _FAST_DDS_GENERATED_TEST_COMPLETECDRAUX_HPP_
22+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_HPP
23+
#define FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_HPP
2424

2525
#include "test_complete.hpp"
2626

@@ -63,5 +63,5 @@ eProsima_user_DllExport void serialize_key(
6363
} // namespace fastcdr
6464
} // namespace eprosima
6565

66-
#endif // _FAST_DDS_GENERATED_TEST_COMPLETECDRAUX_HPP_
66+
#endif // FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_HPP
6767

‎fastdds_python/test/types/test_completeCdrAux.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_TEST_COMPLETECDRAUX_IPP_
23-
#define _FAST_DDS_GENERATED_TEST_COMPLETECDRAUX_IPP_
22+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_IPP
23+
#define FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_IPP
2424

2525
#include "test_completeCdrAux.hpp"
2626

@@ -1598,5 +1598,5 @@ void serialize_key(
15981598
} // namespace fastcdr
15991599
} // namespace eprosima
16001600

1601-
#endif // _FAST_DDS_GENERATED_TEST_COMPLETECDRAUX_IPP_
1601+
#endif // FAST_DDS_GENERATED__TEST_COMPLETECDRAUX_IPP
16021602

‎fastdds_python/test/types/test_completePubSubTypes.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 "test_completePubSubTypes.h"
22+
#include "test_completePubSubTypes.hpp"
2323

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

fastdds_python/test/types/test_completePubSubTypes.h renamed to fastdds_python/test/types/test_completePubSubTypes.hpp

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

1515
/*!
16-
* @file test_completePubSubTypes.h
16+
* @file test_completePubSubTypes.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_TEST_COMPLETE_PUBSUBTYPES_H_
24-
#define _FAST_DDS_GENERATED_TEST_COMPLETE_PUBSUBTYPES_H_
23+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETE_PUBSUBTYPES_HPP
24+
#define FAST_DDS_GENERATED__TEST_COMPLETE_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 "test_complete.hpp"
3333

34-
#include "test_included_modulesPubSubTypes.h"
34+
#include "test_included_modulesPubSubTypes.hpp"
3535

3636
#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
3737
#error \
@@ -107,7 +107,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
107107
}
108108

109109
eProsima_user_DllExport inline bool is_plain(
110-
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
110+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
111111
{
112112
static_cast<void>(data_representation);
113113
return false;
@@ -125,7 +125,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
125125

126126
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
127127

128-
MD5 m_md5;
128+
eprosima::fastdds::MD5 m_md5;
129129
unsigned char* m_keyBuffer;
130130

131131
};
@@ -200,7 +200,7 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
200200
}
201201

202202
eProsima_user_DllExport inline bool is_plain(
203-
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
203+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
204204
{
205205
static_cast<void>(data_representation);
206206
return false;
@@ -218,7 +218,7 @@ class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
218218

219219
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
220220

221-
MD5 m_md5;
221+
eprosima::fastdds::MD5 m_md5;
222222
unsigned char* m_keyBuffer;
223223

224224
};
@@ -291,7 +291,7 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
291291
}
292292

293293
eProsima_user_DllExport inline bool is_plain(
294-
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
294+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
295295
{
296296
static_cast<void>(data_representation);
297297
return false;
@@ -309,10 +309,10 @@ class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicData
309309

310310
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
311311

312-
MD5 m_md5;
312+
eprosima::fastdds::MD5 m_md5;
313313
unsigned char* m_keyBuffer;
314314

315315
};
316316

317-
#endif // _FAST_DDS_GENERATED_TEST_COMPLETE_PUBSUBTYPES_H_
317+
#endif // FAST_DDS_GENERATED__TEST_COMPLETE_PUBSUBTYPES_HPP
318318

‎fastdds_python/test/types/test_completePubSubTypes.i‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
%import(module="fastdds") "fastdds/dds/topic/TopicDataType.hpp";
2323

2424
%{
25-
#include "test_completePubSubTypes.h"
25+
#include "test_completePubSubTypes.hpp"
2626
%}
2727

2828
#define GEN_API_VER 2
2929

30-
%include "test_completePubSubTypes.h"
30+
%include "test_completePubSubTypes.hpp"

‎fastdds_python/test/types/test_completeTypeObjectSupport.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_TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP_
23-
#define _FAST_DDS_GENERATED_TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP_
22+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP
23+
#define FAST_DDS_GENERATED__TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP
2424

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

@@ -102,4 +102,4 @@ eProsima_user_DllExport void register_KeyedCompleteTestType_type_identifier(
102102

103103
#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
104104

105-
#endif // _FAST_DDS_GENERATED_TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP_
105+
#endif // FAST_DDS_GENERATED__TEST_COMPLETE_TYPE_OBJECT_SUPPORT_HPP

‎fastdds_python/test/types/test_included_modules.hpp‎

Lines changed: 4 additions & 4 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_EPROSIMA_TEST2_TEST_INCLUDED_MODULES_HPP_
23-
#define _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULES_HPP_
22+
#ifndef FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULES_HPP
23+
#define FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULES_HPP
2424

2525
#include <cstdint>
2626
#include <string>
@@ -59,7 +59,7 @@ namespace test2 {
5959
* @brief This class represents the enumeration Color2 defined by the user in the IDL file.
6060
* @ingroup test_included_modules
6161
*/
62-
enum class Color2 : uint32_t
62+
enum class Color2 : int32_t
6363
{
6464
RED2,
6565
GREEN2,
@@ -71,7 +71,7 @@ enum class Color2 : uint32_t
7171
* @brief This class represents the enumeration Material2 defined by the user in the IDL file.
7272
* @ingroup test_included_modules
7373
*/
74-
enum class Material2 : uint32_t
74+
enum class Material2 : int32_t
7575
{
7676
WOOD2,
7777
PLASTIC2,

‎fastdds_python/test/types/test_included_modulesCdrAux.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_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP_
23-
#define _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP_
22+
#ifndef FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP
23+
#define FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP
2424

2525
#include "test_included_modules.hpp"
2626

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

46-
#endif // _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP_
46+
#endif // FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_HPP
4747

‎fastdds_python/test/types/test_included_modulesCdrAux.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_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP_
23-
#define _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP_
22+
#ifndef FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP
23+
#define FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP
2424

2525
#include "test_included_modulesCdrAux.hpp"
2626

@@ -226,5 +226,5 @@ void serialize_key(
226226
} // namespace fastcdr
227227
} // namespace eprosima
228228

229-
#endif // _FAST_DDS_GENERATED_EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP_
229+
#endif // FAST_DDS_GENERATED__EPROSIMA_TEST2_TEST_INCLUDED_MODULESCDRAUX_IPP
230230

0 commit comments

Comments
 (0)