niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for message_info on take where appropriate. (#245)

Browse source 
Fix for regression introduced in #241.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
This commit is contained in:
Michel Hidalgo 2020-09-22 10:11:58 -03:00 • committed by Alejandro Hernández Cordero
parent 4682af41c5
commit c65c015682
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -2524,9 +2524,6 @@ static rmw_ret_t rmw_take_int(
RMW_CHECK_ARGUMENT_FOR_NULL( RMW_CHECK_ARGUMENT_FOR_NULL(
subscription, RMW_RET_INVALID_ARGUMENT); subscription, RMW_RET_INVALID_ARGUMENT);
RMW_CHECK_ARGUMENT_FOR_NULL(
message_info, RMW_RET_INVALID_ARGUMENT);
RMW_CHECK_TYPE_IDENTIFIERS_MATCH( RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
subscription handle, subscription handle,
subscription->implementation_identifier, eclipse_cyclonedds_identifier, subscription->implementation_identifier, eclipse_cyclonedds_identifier,
@ -2724,6 +2721,7 @@ extern "C" rmw_ret_t rmw_take_with_info(
rmw_subscription_allocation_t * allocation) rmw_subscription_allocation_t * allocation)
{ {
static_cast<void>(allocation); static_cast<void>(allocation);
RMW_CHECK_ARGUMENT_FOR_NULL(message_info, RMW_RET_INVALID_ARGUMENT);
return rmw_take_int(subscription, ros_message, taken, message_info); return rmw_take_int(subscription, ros_message, taken, message_info);
} }