use return_loaned_message_from

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
ros2 · Oct 19, 2019 · 7ea2e78 · 7ea2e78
1 parent e6e9e74
commit 7ea2e78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rclcpp/include/rclcpp/loaned_message.hpp b/rclcpp/include/rclcpp/loaned_message.hpp
@@ -136,7 +136,7 @@ class LoanedMessage
     if (pub_.can_loan_messages()) {
       // return allocated memory to the middleware
       auto ret =
-        rcl_return_loaned_message(pub_.get_publisher_handle(), message_);
+        rcl_return_loaned_message_from_publisher(pub_.get_publisher_handle(), message_);
       if (ret != RCL_RET_OK) {
         RCLCPP_ERROR(
           error_logger, "rcl_deallocate_loaned_message failed: %s", rcl_get_error_string().str);

diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
@@ -347,13 +347,13 @@ Executor::execute_subscription(
         subscription->get_topic_name(), rcl_get_error_string().str);
       rcl_reset_error();
     }
-    ret = rcl_release_loaned_message(
+    ret = rcl_return_loaned_message_from_subscription(
       subscription->get_subscription_handle().get(),
       loaned_msg);
     if (RCL_RET_OK != ret) {
       RCUTILS_LOG_ERROR_NAMED(
         "rclcpp",
-        "release_loaned failed for subscription on topic '%s': %s",
+        "return_loaned_message failed for subscription on topic '%s': %s",
         subscription->get_topic_name(), rcl_get_error_string().str);
     }
     loaned_msg = nullptr;