Skip to content

Commit 5420960

Browse files
budrusKarsten1987
authored andcommitted
adaptation for new chunk header in iceoryx (#7)
* adaptation for new chunk header in iceoryx Signed-off-by: Poehnl Michael (CC-AD/ESW1) <michael.poehnl@de.bosch.com> * fixed linter warning Signed-off-by: Poehnl Michael (CC-AD/ESW1) <michael.poehnl@de.bosch.com>
1 parent 6447034 commit 5420960

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rmw_iceoryx_cpp/src/internal/iceoryx_topic_names_and_types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void fill_topic_containers(
6868
if (latest_chunk_header) {
6969
const iox::roudi::PortIntrospectionFieldTopic * port_sample =
7070
static_cast<const iox::roudi::PortIntrospectionFieldTopic *>(latest_chunk_header->
71-
m_payload);
71+
payload());
7272

7373
names_n_types.clear();
7474
subscribers_topics.clear();

rmw_iceoryx_cpp/src/rmw_node_names.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ rmw_get_node_names(
7373
if (latest_chunk_header) {
7474
const iox::roudi::ProcessIntrospectionFieldTopic * process_sample =
7575
static_cast<const iox::roudi::ProcessIntrospectionFieldTopic *>(latest_chunk_header->
76-
m_payload);
76+
payload());
7777

7878
node_names_set.clear();
7979
for (auto & process : process_sample->m_processList) {

rmw_iceoryx_cpp/src/rmw_take.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ rmw_take(
8383

8484
// if fixed size, we fetch the data via memcpy
8585
if (iceoryx_subscription->is_fixed_size_) {
86-
memcpy(ros_message, chunk_header->m_payload, chunk_header->m_info.m_payloadSize);
86+
memcpy(ros_message, chunk_header->payload(), chunk_header->m_info.m_payloadSize);
8787
iceoryx_receiver->releaseChunk(chunk_header);
8888
*taken = true;
8989
return RMW_RET_OK;
@@ -97,7 +97,7 @@ rmw_take(
9797
auto members =
9898
static_cast<const rosidl_typesupport_introspection_cpp::MessageMembers *>(ts_cpp->data);
9999
rmw_iceoryx_cpp::deserialize(
100-
static_cast<const char *>(chunk_header->m_payload), members, ros_message);
100+
static_cast<const char *>(chunk_header->payload()), members, ros_message);
101101
iceoryx_receiver->releaseChunk(chunk_header);
102102
*taken = true;
103103
}
@@ -110,7 +110,7 @@ rmw_take(
110110
auto members =
111111
static_cast<const rosidl_typesupport_introspection_c__MessageMembers *>(ts_c->data);
112112
rmw_iceoryx_cpp::deserialize(
113-
static_cast<const char *>(chunk_header->m_payload), members, ros_message);
113+
static_cast<const char *>(chunk_header->payload()), members, ros_message);
114114
iceoryx_receiver->releaseChunk(chunk_header);
115115
*taken = true;
116116
}

0 commit comments

Comments
 (0)