updated as suggested

Co-authored-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com> Signed-off-by: Chen Lihui <Lihui.Chen@sony.com>
ros2 · Jan 30, 2021 · c213d07 · c213d07
1 parent 0c19587
commit c213d07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp b/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp
@@ -361,8 +361,8 @@ class IntraProcessManager
       if (subscription_it == subscriptions_.end()) {
         throw std::runtime_error("subscription has unexpectedly gone out of scope");
       }
-      auto subscription_base_weak = subscription_it->second.subscription;
-      if (auto subscription_base = subscription_base_weak.lock()) {
+      auto subscription_base = subscription_it->second.subscription.lock();
+      if (subscription_base) {
         auto subscription = std::static_pointer_cast<
           rclcpp::experimental::SubscriptionIntraProcess<MessageT>
           >(subscription_base);
@@ -392,8 +392,8 @@ class IntraProcessManager
       if (subscription_it == subscriptions_.end()) {
         throw std::runtime_error("subscription has unexpectedly gone out of scope");
       }
-      auto subscription_base_weak = subscription_it->second.subscription;
-      if (auto subscription_base = subscription_base_weak.lock()) {
+      auto subscription_base = subscription_it->second.subscription.lock();
+      if (subscription_base) {
         auto subscription = std::static_pointer_cast<
           rclcpp::experimental::SubscriptionIntraProcess<MessageT>
           >(subscription_base);

diff --git a/rclcpp/src/rclcpp/intra_process_manager.cpp b/rclcpp/src/rclcpp/intra_process_manager.cpp
@@ -157,8 +157,8 @@ IntraProcessManager::get_subscription_intra_process(uint64_t intra_process_subsc
   if (subscription_it == subscriptions_.end()) {
     return nullptr;
   } else {
-    auto subscription_weak = subscription_it->second.subscription;
-    if (auto subscription = subscription_weak.lock()) {
+    auto subscription = subscription_it->second.subscription.lock();
+    if (subscription) {
       return subscription;
     } else {
       subscriptions_.erase(subscription_it);