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

Merge pull request #162 from ros2/plain_shared_ptr

Browse source 
use std::shared_ptr type directly instead of using message specific type
This commit is contained in:
Dirk Thomas 2015-11-24 17:32:49 -08:00
commit 7f35c72064
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rclcpp/include/rclcpp/any_subscription_callback.hpp
View file

@ -183,16 +183,16 @@ public:
{ {
(void)message_info; (void)message_info;
if (shared_ptr_callback_) { if (shared_ptr_callback_) {
typename MessageT::SharedPtr shared_message = std::move(message); typename std::shared_ptr<MessageT> shared_message = std::move(message);
shared_ptr_callback_(shared_message); shared_ptr_callback_(shared_message);
} else if (shared_ptr_with_info_callback_) { } else if (shared_ptr_with_info_callback_) {
typename MessageT::SharedPtr shared_message = std::move(message); typename std::shared_ptr<MessageT> shared_message = std::move(message);
shared_ptr_with_info_callback_(shared_message, message_info); shared_ptr_with_info_callback_(shared_message, message_info);
} else if (const_shared_ptr_callback_) { } else if (const_shared_ptr_callback_) {
typename MessageT::ConstSharedPtr const_shared_message = std::move(message); typename std::shared_ptr<MessageT const> const_shared_message = std::move(message);
const_shared_ptr_callback_(const_shared_message); const_shared_ptr_callback_(const_shared_message);
} else if (const_shared_ptr_with_info_callback_) { } else if (const_shared_ptr_with_info_callback_) {
typename MessageT::ConstSharedPtr const_shared_message = std::move(message); typename std::shared_ptr<MessageT const> const_shared_message = std::move(message);
const_shared_ptr_with_info_callback_(const_shared_message, message_info); const_shared_ptr_with_info_callback_(const_shared_message, message_info);
} else if (unique_ptr_callback_) { } else if (unique_ptr_callback_) {
unique_ptr_callback_(std::move(message)); unique_ptr_callback_(std::move(message));