Skip to content

Commit 8933e83

Browse files
methylDragonmethylDragon
committed
Remove dynamic data/type aliases
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent b213cf5 commit 8933e83

15 files changed

Lines changed: 944 additions & 1044 deletions

‎rclcpp/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ set(${PROJECT_NAME}_SRCS
4949
src/rclcpp/detail/rmw_implementation_specific_subscription_payload.cpp
5050
src/rclcpp/detail/utilities.cpp
5151
src/rclcpp/duration.cpp
52-
src/rclcpp/dynamic_typesupport/dynamic_data.cpp
52+
src/rclcpp/dynamic_typesupport/dynamic_message.cpp
53+
src/rclcpp/dynamic_typesupport/dynamic_message_type.cpp
54+
src/rclcpp/dynamic_typesupport/dynamic_message_type_builder.cpp
5355
src/rclcpp/dynamic_typesupport/dynamic_message_type_support.cpp
5456
src/rclcpp/dynamic_typesupport/dynamic_serialization_support.cpp
55-
src/rclcpp/dynamic_typesupport/dynamic_type.cpp
56-
src/rclcpp/dynamic_typesupport/dynamic_type_builder.cpp
5757
src/rclcpp/event.cpp
5858
src/rclcpp/exceptions/exceptions.cpp
5959
src/rclcpp/executable_list.cpp

rclcpp/include/rclcpp/dynamic_typesupport/detail/dynamic_data_impl.hpp renamed to rclcpp/include/rclcpp/dynamic_typesupport/detail/dynamic_message_impl.hpp

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_DATA_IMPL_HPP_
16-
#define RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_DATA_IMPL_HPP_
15+
#ifndef RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_MESSAGE_IMPL_HPP_
16+
#define RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_MESSAGE_IMPL_HPP_
1717

1818
#include <cstdint>
1919
#include <cstddef>
@@ -24,64 +24,64 @@
2424
#include <rosidl_dynamic_typesupport/api/dynamic_data.h>
2525
#include "rclcpp/exceptions.hpp"
2626

27-
#ifndef RCLCPP__DYNAMIC_TYPESUPPORT__DYNAMIC_DATA_HPP_
28-
#include "rclcpp/dynamic_typesupport/dynamic_data.hpp"
27+
#ifndef RCLCPP__DYNAMIC_TYPESUPPORT__DYNAMIC_MESSAGE_HPP_
28+
#include "rclcpp/dynamic_typesupport/dynamic_message.hpp"
2929
#endif
3030

3131

32-
#define __DYNAMIC_DATA_GET_VALUE_BY_ID_FN(ValueT, FunctionT) \
32+
#define __DYNAMIC_MESSAGE_GET_VALUE_BY_ID_FN(ValueT, FunctionT) \
3333
template<> \
3434
ValueT \
35-
DynamicData::get_value<ValueT>(rosidl_dynamic_typesupport_member_id_t id) \
35+
DynamicMessage::get_value<ValueT>(rosidl_dynamic_typesupport_member_id_t id) \
3636
{ \
3737
ValueT out; \
3838
rosidl_dynamic_typesupport_dynamic_data_get_ ## FunctionT ## _value( \
3939
rosidl_dynamic_data_.get(), id, &out); \
4040
return out; \
4141
}
4242

43-
#define __DYNAMIC_DATA_GET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
43+
#define __DYNAMIC_MESSAGE_GET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
4444
template<> \
4545
ValueT \
46-
DynamicData::get_value<ValueT>(const std::string & name) \
46+
DynamicMessage::get_value<ValueT>(const std::string & name) \
4747
{ \
4848
return get_value<ValueT>(get_member_id(name)); \
4949
}
5050

51-
#define __DYNAMIC_DATA_SET_VALUE_BY_ID_FN(ValueT, FunctionT) \
51+
#define __DYNAMIC_MESSAGE_SET_VALUE_BY_ID_FN(ValueT, FunctionT) \
5252
template<> \
5353
void \
54-
DynamicData::set_value<ValueT>(rosidl_dynamic_typesupport_member_id_t id, ValueT value) \
54+
DynamicMessage::set_value<ValueT>(rosidl_dynamic_typesupport_member_id_t id, ValueT value) \
5555
{ \
5656
rosidl_dynamic_typesupport_dynamic_data_set_ ## FunctionT ## _value( \
5757
rosidl_dynamic_data_.get(), id, value); \
5858
}
5959

60-
#define __DYNAMIC_DATA_SET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
60+
#define __DYNAMIC_MESSAGE_SET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
6161
template<> \
6262
void \
63-
DynamicData::set_value<ValueT>(const std::string & name, ValueT value) \
63+
DynamicMessage::set_value<ValueT>(const std::string & name, ValueT value) \
6464
{ \
6565
set_value<ValueT>(get_member_id(name), value); \
6666
}
6767

68-
#define __DYNAMIC_DATA_INSERT_VALUE(ValueT, FunctionT) \
68+
#define __DYNAMIC_MESSAGE_INSERT_VALUE(ValueT, FunctionT) \
6969
template<> \
7070
rosidl_dynamic_typesupport_member_id_t \
71-
DynamicData::insert_value<ValueT>(ValueT value) \
71+
DynamicMessage::insert_value<ValueT>(ValueT value) \
7272
{ \
7373
rosidl_dynamic_typesupport_member_id_t out; \
7474
rosidl_dynamic_typesupport_dynamic_data_insert_ ## FunctionT ## _value( \
7575
rosidl_dynamic_data_.get(), value, &out); \
7676
return out; \
7777
}
7878

79-
#define DYNAMIC_DATA_DEFINITIONS(ValueT, FunctionT) \
80-
__DYNAMIC_DATA_GET_VALUE_BY_ID_FN(ValueT, FunctionT) \
81-
__DYNAMIC_DATA_GET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
82-
__DYNAMIC_DATA_SET_VALUE_BY_ID_FN(ValueT, FunctionT) \
83-
__DYNAMIC_DATA_SET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
84-
__DYNAMIC_DATA_INSERT_VALUE(ValueT, FunctionT)
79+
#define DYNAMIC_MESSAGE_DEFINITIONS(ValueT, FunctionT) \
80+
__DYNAMIC_MESSAGE_GET_VALUE_BY_ID_FN(ValueT, FunctionT) \
81+
__DYNAMIC_MESSAGE_GET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
82+
__DYNAMIC_MESSAGE_SET_VALUE_BY_ID_FN(ValueT, FunctionT) \
83+
__DYNAMIC_MESSAGE_SET_VALUE_BY_NAME_FN(ValueT, FunctionT) \
84+
__DYNAMIC_MESSAGE_INSERT_VALUE(ValueT, FunctionT)
8585

8686

8787
namespace rclcpp
@@ -101,29 +101,29 @@ namespace dynamic_typesupport
101101
* - String types: std::string, std::u16string
102102
*/
103103

104-
DYNAMIC_DATA_DEFINITIONS(bool, bool);
105-
// DYNAMIC_DATA_DEFINITIONS(std::byte, byte);
106-
DYNAMIC_DATA_DEFINITIONS(char, char);
107-
DYNAMIC_DATA_DEFINITIONS(float, float32);
108-
DYNAMIC_DATA_DEFINITIONS(double, float64);
109-
DYNAMIC_DATA_DEFINITIONS(int8_t, int8);
110-
DYNAMIC_DATA_DEFINITIONS(int16_t, int16);
111-
DYNAMIC_DATA_DEFINITIONS(int32_t, int32);
112-
DYNAMIC_DATA_DEFINITIONS(int64_t, int64);
113-
DYNAMIC_DATA_DEFINITIONS(uint8_t, uint8);
114-
DYNAMIC_DATA_DEFINITIONS(uint16_t, uint16);
115-
DYNAMIC_DATA_DEFINITIONS(uint32_t, uint32);
116-
DYNAMIC_DATA_DEFINITIONS(uint64_t, uint64);
117-
// DYNAMIC_DATA_DEFINITIONS(std::string, std::string);
118-
// DYNAMIC_DATA_DEFINITIONS(std::u16string, std::u16string);
104+
DYNAMIC_MESSAGE_DEFINITIONS(bool, bool);
105+
// DYNAMIC_MESSAGE_DEFINITIONS(std::byte, byte);
106+
DYNAMIC_MESSAGE_DEFINITIONS(char, char);
107+
DYNAMIC_MESSAGE_DEFINITIONS(float, float32);
108+
DYNAMIC_MESSAGE_DEFINITIONS(double, float64);
109+
DYNAMIC_MESSAGE_DEFINITIONS(int8_t, int8);
110+
DYNAMIC_MESSAGE_DEFINITIONS(int16_t, int16);
111+
DYNAMIC_MESSAGE_DEFINITIONS(int32_t, int32);
112+
DYNAMIC_MESSAGE_DEFINITIONS(int64_t, int64);
113+
DYNAMIC_MESSAGE_DEFINITIONS(uint8_t, uint8);
114+
DYNAMIC_MESSAGE_DEFINITIONS(uint16_t, uint16);
115+
DYNAMIC_MESSAGE_DEFINITIONS(uint32_t, uint32);
116+
DYNAMIC_MESSAGE_DEFINITIONS(uint64_t, uint64);
117+
// DYNAMIC_MESSAGE_DEFINITIONS(std::string, std::string);
118+
// DYNAMIC_MESSAGE_DEFINITIONS(std::u16string, std::u16string);
119119

120120
// Byte and String getters have a different implementation and are defined below
121121

122122

123123
// BYTE ============================================================================================
124124
template<>
125125
std::byte
126-
DynamicData::get_value<std::byte>(rosidl_dynamic_typesupport_member_id_t id)
126+
DynamicMessage::get_value<std::byte>(rosidl_dynamic_typesupport_member_id_t id)
127127
{
128128
unsigned char out;
129129
rosidl_dynamic_typesupport_dynamic_data_get_byte_value(get_rosidl_dynamic_data(), id, &out);
@@ -133,15 +133,15 @@ DynamicData::get_value<std::byte>(rosidl_dynamic_typesupport_member_id_t id)
133133

134134
template<>
135135
std::byte
136-
DynamicData::get_value<std::byte>(const std::string & name)
136+
DynamicMessage::get_value<std::byte>(const std::string & name)
137137
{
138138
return get_value<std::byte>(get_member_id(name));
139139
}
140140

141141

142142
template<>
143143
void
144-
DynamicData::set_value<std::byte>(
144+
DynamicMessage::set_value<std::byte>(
145145
rosidl_dynamic_typesupport_member_id_t id, const std::byte value)
146146
{
147147
rosidl_dynamic_typesupport_dynamic_data_set_byte_value(
@@ -151,15 +151,15 @@ DynamicData::set_value<std::byte>(
151151

152152
template<>
153153
void
154-
DynamicData::set_value<std::byte>(const std::string & name, const std::byte value)
154+
DynamicMessage::set_value<std::byte>(const std::string & name, const std::byte value)
155155
{
156156
set_value<std::byte>(get_member_id(name), value);
157157
}
158158

159159

160160
template<>
161161
rosidl_dynamic_typesupport_member_id_t
162-
DynamicData::insert_value<std::byte>(const std::byte value)
162+
DynamicMessage::insert_value<std::byte>(const std::byte value)
163163
{
164164
rosidl_dynamic_typesupport_member_id_t out;
165165
rosidl_dynamic_typesupport_dynamic_data_insert_byte_value(
@@ -171,7 +171,7 @@ DynamicData::insert_value<std::byte>(const std::byte value)
171171
// STRINGS =========================================================================================
172172
template<>
173173
std::string
174-
DynamicData::get_value<std::string>(rosidl_dynamic_typesupport_member_id_t id)
174+
DynamicMessage::get_value<std::string>(rosidl_dynamic_typesupport_member_id_t id)
175175
{
176176
size_t buf_length;
177177
char * buf = nullptr;
@@ -185,7 +185,7 @@ DynamicData::get_value<std::string>(rosidl_dynamic_typesupport_member_id_t id)
185185

186186
template<>
187187
std::u16string
188-
DynamicData::get_value<std::u16string>(rosidl_dynamic_typesupport_member_id_t id)
188+
DynamicMessage::get_value<std::u16string>(rosidl_dynamic_typesupport_member_id_t id)
189189
{
190190
size_t buf_length;
191191
char16_t * buf = nullptr;
@@ -199,23 +199,23 @@ DynamicData::get_value<std::u16string>(rosidl_dynamic_typesupport_member_id_t id
199199

200200
template<>
201201
std::string
202-
DynamicData::get_value<std::string>(const std::string & name)
202+
DynamicMessage::get_value<std::string>(const std::string & name)
203203
{
204204
return get_value<std::string>(get_member_id(name));
205205
}
206206

207207

208208
template<>
209209
std::u16string
210-
DynamicData::get_value<std::u16string>(const std::string & name)
210+
DynamicMessage::get_value<std::u16string>(const std::string & name)
211211
{
212212
return get_value<std::u16string>(get_member_id(name));
213213
}
214214

215215

216216
template<>
217217
void
218-
DynamicData::set_value<std::string>(
218+
DynamicMessage::set_value<std::string>(
219219
rosidl_dynamic_typesupport_member_id_t id, const std::string value)
220220
{
221221
rosidl_dynamic_typesupport_dynamic_data_set_string_value(
@@ -225,7 +225,7 @@ DynamicData::set_value<std::string>(
225225

226226
template<>
227227
void
228-
DynamicData::set_value<std::u16string>(
228+
DynamicMessage::set_value<std::u16string>(
229229
rosidl_dynamic_typesupport_member_id_t id, const std::u16string value)
230230
{
231231
rosidl_dynamic_typesupport_dynamic_data_set_wstring_value(
@@ -235,23 +235,23 @@ DynamicData::set_value<std::u16string>(
235235

236236
template<>
237237
void
238-
DynamicData::set_value<std::string>(const std::string & name, const std::string value)
238+
DynamicMessage::set_value<std::string>(const std::string & name, const std::string value)
239239
{
240240
set_value<std::string>(get_member_id(name), value);
241241
}
242242

243243

244244
template<>
245245
void
246-
DynamicData::set_value<std::u16string>(const std::string & name, const std::u16string value)
246+
DynamicMessage::set_value<std::u16string>(const std::string & name, const std::u16string value)
247247
{
248248
set_value<std::u16string>(get_member_id(name), value);
249249
}
250250

251251

252252
template<>
253253
rosidl_dynamic_typesupport_member_id_t
254-
DynamicData::insert_value<std::string>(const std::string value)
254+
DynamicMessage::insert_value<std::string>(const std::string value)
255255
{
256256
rosidl_dynamic_typesupport_member_id_t out;
257257
rosidl_dynamic_typesupport_dynamic_data_insert_string_value(
@@ -262,7 +262,7 @@ DynamicData::insert_value<std::string>(const std::string value)
262262

263263
template<>
264264
rosidl_dynamic_typesupport_member_id_t
265-
DynamicData::insert_value<std::u16string>(const std::u16string value)
265+
DynamicMessage::insert_value<std::u16string>(const std::u16string value)
266266
{
267267
rosidl_dynamic_typesupport_member_id_t out;
268268
rosidl_dynamic_typesupport_dynamic_data_insert_wstring_value(
@@ -274,23 +274,23 @@ DynamicData::insert_value<std::u16string>(const std::u16string value)
274274
// THROW FOR UNSUPPORTED TYPES =====================================================================
275275
template<typename ValueT>
276276
ValueT
277-
DynamicData::get_value(rosidl_dynamic_typesupport_member_id_t id)
277+
DynamicMessage::get_value(rosidl_dynamic_typesupport_member_id_t id)
278278
{
279279
throw rclcpp::exceptions::UnimplementedError("get_value is not implemented for input type");
280280
}
281281

282282

283283
template<typename ValueT>
284284
ValueT
285-
DynamicData::get_value(const std::string & name)
285+
DynamicMessage::get_value(const std::string & name)
286286
{
287287
throw rclcpp::exceptions::UnimplementedError("get_value is not implemented for input type");
288288
}
289289

290290

291291
template<typename ValueT>
292292
void
293-
DynamicData::set_value(
293+
DynamicMessage::set_value(
294294
rosidl_dynamic_typesupport_member_id_t id, ValueT value)
295295
{
296296
throw rclcpp::exceptions::UnimplementedError("set_value is not implemented for input type");
@@ -299,15 +299,15 @@ DynamicData::set_value(
299299

300300
template<typename ValueT>
301301
void
302-
DynamicData::set_value(const std::string & name, ValueT value)
302+
DynamicMessage::set_value(const std::string & name, ValueT value)
303303
{
304304
throw rclcpp::exceptions::UnimplementedError("set_value is not implemented for input type");
305305
}
306306

307307

308308
template<typename ValueT>
309309
rosidl_dynamic_typesupport_member_id_t
310-
DynamicData::insert_value(ValueT value)
310+
DynamicMessage::insert_value(ValueT value)
311311
{
312312
throw rclcpp::exceptions::UnimplementedError("insert_value is not implemented for input type");
313313
}
@@ -316,11 +316,11 @@ DynamicData::insert_value(ValueT value)
316316
} // namespace dynamic_typesupport
317317
} // namespace rclcpp
318318

319-
#undef __DYNAMIC_DATA_GET_VALUE_BY_ID_FN
320-
#undef __DYNAMIC_DATA_GET_VALUE_BY_NAME_FN
321-
#undef __DYNAMIC_DATA_SET_VALUE_BY_ID_FN
322-
#undef __DYNAMIC_DATA_SET_VALUE_BY_NAME_FN
323-
#undef __DYNAMIC_DATA_INSERT_VALUE
324-
#undef DYNAMIC_DATA_DEFINITIONS
319+
#undef __DYNAMIC_MESSAGE_GET_VALUE_BY_ID_FN
320+
#undef __DYNAMIC_MESSAGE_GET_VALUE_BY_NAME_FN
321+
#undef __DYNAMIC_MESSAGE_SET_VALUE_BY_ID_FN
322+
#undef __DYNAMIC_MESSAGE_SET_VALUE_BY_NAME_FN
323+
#undef __DYNAMIC_MESSAGE_INSERT_VALUE
324+
#undef DYNAMIC_MESSAGE_DEFINITIONS
325325

326-
#endif // RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_DATA_IMPL_HPP_
326+
#endif // RCLCPP__DYNAMIC_TYPESUPPORT__DETAIL__DYNAMIC_MESSAGE_IMPL_HPP_

0 commit comments

Comments
 (0)