From dbd2f6ac6a39b81b4d82e07233a21b466342426b Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 24 Nov 2015 17:07:38 -0800 Subject: [PATCH] use std::shared_ptr type directly instead of using message specific type --- rclcpp/include/rclcpp/any_subscription_callback.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rclcpp/include/rclcpp/any_subscription_callback.hpp b/rclcpp/include/rclcpp/any_subscription_callback.hpp index 0e657ee..5557e0d 100644 --- a/rclcpp/include/rclcpp/any_subscription_callback.hpp +++ b/rclcpp/include/rclcpp/any_subscription_callback.hpp @@ -183,16 +183,16 @@ public: { (void)message_info; if (shared_ptr_callback_) { - typename MessageT::SharedPtr shared_message = std::move(message); + typename std::shared_ptr shared_message = std::move(message); shared_ptr_callback_(shared_message); } else if (shared_ptr_with_info_callback_) { - typename MessageT::SharedPtr shared_message = std::move(message); + typename std::shared_ptr shared_message = std::move(message); shared_ptr_with_info_callback_(shared_message, message_info); } else if (const_shared_ptr_callback_) { - typename MessageT::ConstSharedPtr const_shared_message = std::move(message); + typename std::shared_ptr const_shared_message = std::move(message); const_shared_ptr_callback_(const_shared_message); } else if (const_shared_ptr_with_info_callback_) { - typename MessageT::ConstSharedPtr const_shared_message = std::move(message); + typename std::shared_ptr const_shared_message = std::move(message); const_shared_ptr_with_info_callback_(const_shared_message, message_info); } else if (unique_ptr_callback_) { unique_ptr_callback_(std::move(message));