Skip to content

Commit 2ec70eb

Browse files
committedApr 10, 2023
Refactor dynamic type support structs to use allocators and refs
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent 87b5d93 commit 2ec70eb

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed
 

‎rmw_fastrtps_cpp/src/subscription.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ __create_dynamic_subscription(
187187
// Create Topic and Type names
188188
auto dyn_type_ptr = eprosima::fastrtps::types::DynamicType_ptr(
189189
*static_cast<eprosima::fastrtps::types::DynamicType_ptr *>(
190-
ts_impl->dynamic_message_type->impl->handle));
190+
ts_impl->dynamic_message_type->impl.handle));
191191

192192
// Check if we need to split the name into namespace and type name
193193
std::string type_name = dyn_type_ptr->get_name();

‎rmw_fastrtps_shared_cpp/src/rmw_take.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ _take_dynamic_message(
422422

423423
rmw_fastrtps_shared_cpp::SerializedData data;
424424
data.type = FASTRTPS_SERIALIZED_DATA_TYPE_DYNAMIC_MESSAGE;
425-
data.data = dynamic_data->impl->handle;
425+
data.data = dynamic_data->impl.handle;
426426
data.impl = nullptr; // not used when type is FASTRTPS_SERIALIZED_DATA_TYPE_DYNAMIC_MESSAGE
427427

428428
eprosima::fastdds::dds::StackAllocatedSequence<void *, 1> data_values;
@@ -466,9 +466,6 @@ __rmw_take_dynamic_message(
466466
RMW_CHECK_ARGUMENT_FOR_NULL(
467467
dynamic_data, RMW_RET_INVALID_ARGUMENT);
468468

469-
RMW_CHECK_ARGUMENT_FOR_NULL(
470-
dynamic_data->impl, RMW_RET_INVALID_ARGUMENT);
471-
472469
RMW_CHECK_ARGUMENT_FOR_NULL(
473470
taken, RMW_RET_INVALID_ARGUMENT);
474471

@@ -491,9 +488,6 @@ __rmw_take_dynamic_message_with_info(
491488
RMW_CHECK_ARGUMENT_FOR_NULL(
492489
dynamic_data, RMW_RET_INVALID_ARGUMENT);
493490

494-
RMW_CHECK_ARGUMENT_FOR_NULL(
495-
dynamic_data->impl, RMW_RET_INVALID_ARGUMENT);
496-
497491
RMW_CHECK_ARGUMENT_FOR_NULL(
498492
taken, RMW_RET_INVALID_ARGUMENT);
499493

0 commit comments

Comments
 (0)
Please sign in to comment.