Skip to content

Commit 7cb502d

Browse files
committed
Refs #21128: Update types with Gen's PR
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 60b34d6 commit 7cb502d

21 files changed

Lines changed: 826 additions & 46 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
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 \
Lines changed: 318 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,318 @@
1+
// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
/*!
16+
* @file test_completePubSubTypes.hpp
17+
* This header file contains the declaration of the serialization functions.
18+
*
19+
* This file was generated by the tool fastddsgen.
20+
*/
21+
22+
23+
#ifndef FAST_DDS_GENERATED__TEST_COMPLETE_PUBSUBTYPES_HPP
24+
#define FAST_DDS_GENERATED__TEST_COMPLETE_PUBSUBTYPES_HPP
25+
26+
#include <fastdds/dds/core/policy/QosPolicies.hpp>
27+
#include <fastdds/dds/topic/TopicDataType.hpp>
28+
#include <fastdds/rtps/common/InstanceHandle.hpp>
29+
#include <fastdds/rtps/common/SerializedPayload.hpp>
30+
#include <fastdds/utils/md5.hpp>
31+
32+
#include "test_complete.hpp"
33+
34+
#include "test_included_modulesPubSubTypes.hpp"
35+
36+
#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
37+
#error \
38+
Generated test_complete is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
39+
#endif // GEN_API_VER
40+
41+
42+
/*!
43+
* @brief This class represents the TopicDataType of the type StructType defined by the user in the IDL file.
44+
* @ingroup test_complete
45+
*/
46+
class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
47+
{
48+
public:
49+
50+
typedef StructType type;
51+
52+
eProsima_user_DllExport StructTypePubSubType();
53+
54+
eProsima_user_DllExport ~StructTypePubSubType() override;
55+
56+
eProsima_user_DllExport bool serialize(
57+
void* data,
58+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
59+
{
60+
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
61+
}
62+
63+
eProsima_user_DllExport bool serialize(
64+
void* data,
65+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
66+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
67+
68+
eProsima_user_DllExport bool deserialize(
69+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
70+
void* data) override;
71+
72+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
73+
void* data) override
74+
{
75+
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
76+
}
77+
78+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
79+
void* data,
80+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
81+
82+
eProsima_user_DllExport bool getKey(
83+
void* data,
84+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
85+
bool force_md5 = false) override;
86+
87+
eProsima_user_DllExport void* createData() override;
88+
89+
eProsima_user_DllExport void deleteData(
90+
void* data) override;
91+
92+
//Register TypeObject representation in Fast DDS TypeObjectRegistry
93+
eProsima_user_DllExport void register_type_object_representation() override;
94+
95+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
96+
eProsima_user_DllExport inline bool is_bounded() const override
97+
{
98+
return false;
99+
}
100+
101+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
102+
103+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
104+
eProsima_user_DllExport inline bool is_plain() const override
105+
{
106+
return false;
107+
}
108+
109+
eProsima_user_DllExport inline bool is_plain(
110+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
111+
{
112+
static_cast<void>(data_representation);
113+
return false;
114+
}
115+
116+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
117+
118+
#ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
119+
eProsima_user_DllExport inline bool construct_sample(
120+
void* memory) const override
121+
{
122+
static_cast<void>(memory);
123+
return false;
124+
}
125+
126+
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
127+
128+
eprosima::fastdds::MD5 m_md5;
129+
unsigned char* m_keyBuffer;
130+
131+
};
132+
133+
134+
135+
/*!
136+
* @brief This class represents the TopicDataType of the type CompleteTestType defined by the user in the IDL file.
137+
* @ingroup test_complete
138+
*/
139+
class CompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
140+
{
141+
public:
142+
143+
typedef CompleteTestType type;
144+
145+
eProsima_user_DllExport CompleteTestTypePubSubType();
146+
147+
eProsima_user_DllExport ~CompleteTestTypePubSubType() override;
148+
149+
eProsima_user_DllExport bool serialize(
150+
void* data,
151+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
152+
{
153+
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
154+
}
155+
156+
eProsima_user_DllExport bool serialize(
157+
void* data,
158+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
159+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
160+
161+
eProsima_user_DllExport bool deserialize(
162+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
163+
void* data) override;
164+
165+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
166+
void* data) override
167+
{
168+
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
169+
}
170+
171+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
172+
void* data,
173+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
174+
175+
eProsima_user_DllExport bool getKey(
176+
void* data,
177+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
178+
bool force_md5 = false) override;
179+
180+
eProsima_user_DllExport void* createData() override;
181+
182+
eProsima_user_DllExport void deleteData(
183+
void* data) override;
184+
185+
//Register TypeObject representation in Fast DDS TypeObjectRegistry
186+
eProsima_user_DllExport void register_type_object_representation() override;
187+
188+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
189+
eProsima_user_DllExport inline bool is_bounded() const override
190+
{
191+
return false;
192+
}
193+
194+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
195+
196+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
197+
eProsima_user_DllExport inline bool is_plain() const override
198+
{
199+
return false;
200+
}
201+
202+
eProsima_user_DllExport inline bool is_plain(
203+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
204+
{
205+
static_cast<void>(data_representation);
206+
return false;
207+
}
208+
209+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
210+
211+
#ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
212+
eProsima_user_DllExport inline bool construct_sample(
213+
void* memory) const override
214+
{
215+
static_cast<void>(memory);
216+
return false;
217+
}
218+
219+
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
220+
221+
eprosima::fastdds::MD5 m_md5;
222+
unsigned char* m_keyBuffer;
223+
224+
};
225+
226+
/*!
227+
* @brief This class represents the TopicDataType of the type KeyedCompleteTestType defined by the user in the IDL file.
228+
* @ingroup test_complete
229+
*/
230+
class KeyedCompleteTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
231+
{
232+
public:
233+
234+
typedef KeyedCompleteTestType type;
235+
236+
eProsima_user_DllExport KeyedCompleteTestTypePubSubType();
237+
238+
eProsima_user_DllExport ~KeyedCompleteTestTypePubSubType() override;
239+
240+
eProsima_user_DllExport bool serialize(
241+
void* data,
242+
eprosima::fastdds::rtps::SerializedPayload_t* payload) override
243+
{
244+
return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
245+
}
246+
247+
eProsima_user_DllExport bool serialize(
248+
void* data,
249+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
250+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
251+
252+
eProsima_user_DllExport bool deserialize(
253+
eprosima::fastdds::rtps::SerializedPayload_t* payload,
254+
void* data) override;
255+
256+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
257+
void* data) override
258+
{
259+
return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
260+
}
261+
262+
eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
263+
void* data,
264+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
265+
266+
eProsima_user_DllExport bool getKey(
267+
void* data,
268+
eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
269+
bool force_md5 = false) override;
270+
271+
eProsima_user_DllExport void* createData() override;
272+
273+
eProsima_user_DllExport void deleteData(
274+
void* data) override;
275+
276+
//Register TypeObject representation in Fast DDS TypeObjectRegistry
277+
eProsima_user_DllExport void register_type_object_representation() override;
278+
279+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
280+
eProsima_user_DllExport inline bool is_bounded() const override
281+
{
282+
return false;
283+
}
284+
285+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
286+
287+
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
288+
eProsima_user_DllExport inline bool is_plain() const override
289+
{
290+
return false;
291+
}
292+
293+
eProsima_user_DllExport inline bool is_plain(
294+
eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
295+
{
296+
static_cast<void>(data_representation);
297+
return false;
298+
}
299+
300+
#endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
301+
302+
#ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
303+
eProsima_user_DllExport inline bool construct_sample(
304+
void* memory) const override
305+
{
306+
static_cast<void>(memory);
307+
return false;
308+
}
309+
310+
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
311+
312+
eprosima::fastdds::MD5 m_md5;
313+
unsigned char* m_keyBuffer;
314+
315+
};
316+
317+
#endif // FAST_DDS_GENERATED__TEST_COMPLETE_PUBSUBTYPES_HPP
318+

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"

0 commit comments

Comments
 (0)