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

rename return functions

Browse source 
Signed-off-by: Karsten Knese <karsten@openrobotics.org>
This commit is contained in:
Karsten Knese 2019-10-21 09:21:52 -07:00 • committed by eboasson
parent 6d907ef583
commit e959e66f08
1 changed files with 3 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -1140,6 +1140,7 @@ extern "C" rmw_publisher_t * rmw_create_publisher(
memcpy(const_cast<char *>(rmw_publisher->topic_name), topic_name, strlen(topic_name) + 1); memcpy(const_cast<char *>(rmw_publisher->topic_name), topic_name, strlen(topic_name) + 1);
#if RMW_VERSION_GTE(0, 8, 1) #if RMW_VERSION_GTE(0, 8, 1)
rmw_publisher->options = *publisher_options; rmw_publisher->options = *publisher_options;
rmw_publisher->can_loan_messages = false;
#endif #endif
return rmw_publisher; return rmw_publisher;
fail_topic_name: fail_topic_name:
@ -1237,16 +1238,6 @@ extern "C" rmw_ret_t rmw_return_loaned_message_from_publisher(
return RMW_RET_UNSUPPORTED; return RMW_RET_UNSUPPORTED;
} }
extern "C" rmw_ret_t rmw_return_loaned_message(
const rmw_publisher_t * publisher,
void * loaned_message)
{
/* https://github.com/ros2/rmw/pull/192 replaces this one with
rmw_return_loaned_message_from_publisher, but until that PR is accepted, this one is
needed to make things build & work */
return rmw_return_loaned_message_from_publisher(publisher, loaned_message);
}
extern "C" rmw_ret_t rmw_destroy_publisher(rmw_node_t * node, rmw_publisher_t * publisher) extern "C" rmw_ret_t rmw_destroy_publisher(rmw_node_t * node, rmw_publisher_t * publisher)
{ {
RET_WRONG_IMPLID(node); RET_WRONG_IMPLID(node);
@ -1381,6 +1372,7 @@ extern "C" rmw_subscription_t * rmw_create_subscription(
memcpy(const_cast<char *>(rmw_subscription->topic_name), topic_name, strlen(topic_name) + 1); memcpy(const_cast<char *>(rmw_subscription->topic_name), topic_name, strlen(topic_name) + 1);
#if RMW_VERSION_GTE(0, 8, 1) #if RMW_VERSION_GTE(0, 8, 1)
rmw_subscription->options = *subscription_options; rmw_subscription->options = *subscription_options;
rmw_subscription->can_loan_messages = false;
#endif #endif
return rmw_subscription; return rmw_subscription;
fail_topic_name: fail_topic_name:
@ -1599,20 +1591,10 @@ extern "C" rmw_ret_t rmw_return_loaned_message_from_subscription(
(void) loaned_message; (void) loaned_message;
RMW_SET_ERROR_MSG( RMW_SET_ERROR_MSG(
"rmw_release_loaned_message_from_subscription not implemented for rmw_cyclonedds_cpp"); "rmw_return_loaned_message_from_subscription not implemented for rmw_cyclonedds_cpp");
return RMW_RET_UNSUPPORTED; return RMW_RET_UNSUPPORTED;
} }
extern "C" rmw_ret_t rmw_release_loaned_message(
const rmw_subscription_t * subscription,
void * loaned_message)
{
/* https://github.com/ros2/rmw/pull/192 replaces this one with
rmw_return_loaned_message_from_subscription, but until that PR is accepted, this one
is needed to make things build & work */
return rmw_return_loaned_message_from_subscription(subscription, loaned_message);
}
extern "C" rmw_ret_t rmw_take_event( extern "C" rmw_ret_t rmw_take_event(
const rmw_event_t * event_handle, void * event_info, const rmw_event_t * event_handle, void * event_info,
bool * taken) bool * taken)