Skip to content

Commit d2368ff

Browse files
committed
Rename complex_value -> nested_data
Signed-off-by: methylDragon <[email protected]>
1 parent f8c11e9 commit d2368ff

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

rclcpp/include/rclcpp/dynamic_typesupport/dynamic_message.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -360,43 +360,43 @@ class DynamicMessage : public std::enable_shared_from_this<DynamicMessage>
360360
// NESTED MEMBER ACCESS ==========================================================================
361361
RCLCPP_PUBLIC
362362
DynamicMessage
363-
get_complex_value(
363+
get_nested_data(
364364
rosidl_dynamic_typesupport_member_id_t id,
365365
rcl_allocator_t allocator = rcl_get_default_allocator());
366366

367367
RCLCPP_PUBLIC
368368
DynamicMessage
369-
get_complex_value(
369+
get_nested_data(
370370
const std::string & name,
371371
rcl_allocator_t allocator = rcl_get_default_allocator());
372372

373373
RCLCPP_PUBLIC
374374
DynamicMessage::SharedPtr
375-
get_complex_value_shared(
375+
get_nested_data_shared(
376376
rosidl_dynamic_typesupport_member_id_t id,
377377
rcl_allocator_t allocator = rcl_get_default_allocator());
378378

379379
RCLCPP_PUBLIC
380380
DynamicMessage::SharedPtr
381-
get_complex_value_shared(
381+
get_nested_data_shared(
382382
const std::string & name,
383383
rcl_allocator_t allocator = rcl_get_default_allocator());
384384

385385
RCLCPP_PUBLIC
386386
void
387-
set_complex_value(rosidl_dynamic_typesupport_member_id_t id, DynamicMessage & value);
387+
set_nested_data(rosidl_dynamic_typesupport_member_id_t id, DynamicMessage & value);
388388

389389
RCLCPP_PUBLIC
390390
void
391-
set_complex_value(const std::string & name, DynamicMessage & value);
391+
set_nested_data(const std::string & name, DynamicMessage & value);
392392

393393
RCLCPP_PUBLIC
394394
rosidl_dynamic_typesupport_member_id_t
395-
insert_complex_value_copy(const DynamicMessage & value);
395+
insert_nested_data_copy(const DynamicMessage & value);
396396

397397
RCLCPP_PUBLIC
398398
rosidl_dynamic_typesupport_member_id_t
399-
insert_complex_value(DynamicMessage & value);
399+
insert_nested_data(DynamicMessage & value);
400400

401401
protected:
402402
// NOTE(methylDragon):

rclcpp/src/rclcpp/dynamic_typesupport/dynamic_message.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -696,74 +696,74 @@ DynamicMessage::insert_bounded_wstring_value(const std::u16string value, size_t
696696

697697
// NESTED MEMBER ACCESS ============================================================================
698698
DynamicMessage
699-
DynamicMessage::get_complex_value(
699+
DynamicMessage::get_nested_data(
700700
rosidl_dynamic_typesupport_member_id_t id, rcl_allocator_t allocator)
701701
{
702702
rosidl_dynamic_typesupport_dynamic_data_t out =
703703
rosidl_dynamic_typesupport_get_zero_initialized_dynamic_data();
704-
rosidl_dynamic_typesupport_dynamic_data_get_complex_value(
704+
rosidl_dynamic_typesupport_dynamic_data_get_nested_data(
705705
&get_rosidl_dynamic_data(), id, &allocator, &out);
706706
return DynamicMessage(get_shared_dynamic_serialization_support(), std::move(out));
707707
}
708708

709709

710710
DynamicMessage
711-
DynamicMessage::get_complex_value(const std::string & name, rcl_allocator_t allocator)
711+
DynamicMessage::get_nested_data(const std::string & name, rcl_allocator_t allocator)
712712
{
713-
return get_complex_value(get_member_id(name), allocator);
713+
return get_nested_data(get_member_id(name), allocator);
714714
}
715715

716716

717717
DynamicMessage::SharedPtr
718-
DynamicMessage::get_complex_value_shared(
718+
DynamicMessage::get_nested_data_shared(
719719
rosidl_dynamic_typesupport_member_id_t id, rcl_allocator_t allocator)
720720
{
721721
rosidl_dynamic_typesupport_dynamic_data_t out =
722722
rosidl_dynamic_typesupport_get_zero_initialized_dynamic_data();
723-
rosidl_dynamic_typesupport_dynamic_data_get_complex_value(
723+
rosidl_dynamic_typesupport_dynamic_data_get_nested_data(
724724
&get_rosidl_dynamic_data(), id, &allocator, &out);
725725
return DynamicMessage::make_shared(get_shared_dynamic_serialization_support(), std::move(out));
726726
}
727727

728728

729729
DynamicMessage::SharedPtr
730-
DynamicMessage::get_complex_value_shared(const std::string & name, rcl_allocator_t allocator)
730+
DynamicMessage::get_nested_data_shared(const std::string & name, rcl_allocator_t allocator)
731731
{
732-
return get_complex_value_shared(get_member_id(name), allocator);
732+
return get_nested_data_shared(get_member_id(name), allocator);
733733
}
734734

735735

736736
void
737-
DynamicMessage::set_complex_value(
737+
DynamicMessage::set_nested_data(
738738
rosidl_dynamic_typesupport_member_id_t id, DynamicMessage & value)
739739
{
740-
rosidl_dynamic_typesupport_dynamic_data_set_complex_value(
740+
rosidl_dynamic_typesupport_dynamic_data_set_nested_data(
741741
&get_rosidl_dynamic_data(), id, &value.get_rosidl_dynamic_data());
742742
}
743743

744744

745745
void
746-
DynamicMessage::set_complex_value(const std::string & name, DynamicMessage & value)
746+
DynamicMessage::set_nested_data(const std::string & name, DynamicMessage & value)
747747
{
748-
set_complex_value(get_member_id(name), value);
748+
set_nested_data(get_member_id(name), value);
749749
}
750750

751751

752752
rosidl_dynamic_typesupport_member_id_t
753-
DynamicMessage::insert_complex_value_copy(const DynamicMessage & value)
753+
DynamicMessage::insert_nested_data_copy(const DynamicMessage & value)
754754
{
755755
rosidl_dynamic_typesupport_member_id_t out;
756-
rosidl_dynamic_typesupport_dynamic_data_insert_complex_value_copy(
756+
rosidl_dynamic_typesupport_dynamic_data_insert_nested_data_copy(
757757
&get_rosidl_dynamic_data(), &value.get_rosidl_dynamic_data(), &out);
758758
return out;
759759
}
760760

761761

762762
rosidl_dynamic_typesupport_member_id_t
763-
DynamicMessage::insert_complex_value(DynamicMessage & value)
763+
DynamicMessage::insert_nested_data(DynamicMessage & value)
764764
{
765765
rosidl_dynamic_typesupport_member_id_t out;
766-
rosidl_dynamic_typesupport_dynamic_data_insert_complex_value(
766+
rosidl_dynamic_typesupport_dynamic_data_insert_nested_data(
767767
&get_rosidl_dynamic_data(), &value.get_rosidl_dynamic_data(), &out);
768768
return out;
769769
}

0 commit comments

Comments
 (0)