chore: style and warning fixes

Signed-off-by: Janosch Machowinski <[email protected]>

Author: Janosch Machowinski

rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp

@@ -216,7 +216,7 @@ class DynamicStorage : public rclcpp::wait_set_policies::detail::StoragePolicyCo
       shared_waitables_
     );
 
-    if(this->needs_pruning_) {
+    if (this->needs_pruning_) {
       this->storage_prune_deleted_entities();
       this->needs_pruning_ = false;
     }

rclcpp/include/rclcpp/wait_set_policies/static_storage.hpp

@@ -166,8 +166,8 @@ class StaticStorage : public rclcpp::wait_set_policies::detail::StoragePolicyCom
       // in case of invalid entries
 
       throw std::runtime_error(
-            "StaticStorage : storage_rebuild_rcl_wait_set: Detected"
-            " invalid entity in static entity storage");
+            "StaticStorage::storage_rebuild_rcl_wait_set(): entity weak_ptr "
+            "unexpectedly expired in static entity storage");
     }
   }
 

rclcpp/test/rclcpp/executors/test_executors.cpp

@@ -917,9 +917,6 @@ TYPED_TEST(TestExecutors, dropSomeTimer)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   // delete timer 2. Note, the executor uses an unordered map internally, to order
@@ -937,9 +934,6 @@ TYPED_TEST(TestExecutors, dropSomeTimer)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   ASSERT_TRUE(timer1_works || timer2_works);
@@ -974,9 +968,6 @@ TYPED_TEST(TestExecutors, dropSomeNodeWithTimer)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   // delete node 1.
@@ -990,9 +981,6 @@ TYPED_TEST(TestExecutors, dropSomeNodeWithTimer)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   ASSERT_TRUE(timer2_works);
@@ -1009,11 +997,11 @@ TYPED_TEST(TestExecutors, dropSomeSubscription)
   bool sub2_works = false;
 
   auto sub1 = node->create_subscription<test_msgs::msg::Empty>("/test_drop", 10,
-      [&sub1_works](const test_msgs::msg::Empty & msg) {
+      [&sub1_works](const test_msgs::msg::Empty &) {
         sub1_works = true;
   });
   auto sub2 = node->create_subscription<test_msgs::msg::Empty>("/test_drop", 10,
-      [&sub2_works](const test_msgs::msg::Empty & msg) {
+      [&sub2_works](const test_msgs::msg::Empty &) {
         sub2_works = true;
   });
 
@@ -1031,9 +1019,6 @@ TYPED_TEST(TestExecutors, dropSomeSubscription)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   // delete subscription 2. Note, the executor uses an unordered map internally, to order
@@ -1053,9 +1038,6 @@ TYPED_TEST(TestExecutors, dropSomeSubscription)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   ASSERT_TRUE(sub1_works || sub2_works);
@@ -1074,11 +1056,11 @@ TYPED_TEST(TestExecutors, dropSomeNodesWithSubscription)
   bool sub2_works = false;
 
   auto sub1 = node1->create_subscription<test_msgs::msg::Empty>("/test_drop", 10,
-      [&sub1_works](const test_msgs::msg::Empty & msg) {
+      [&sub1_works](const test_msgs::msg::Empty &) {
         sub1_works = true;
   });
   auto sub2 = node2->create_subscription<test_msgs::msg::Empty>("/test_drop", 10,
-      [&sub2_works](const test_msgs::msg::Empty & msg) {
+      [&sub2_works](const test_msgs::msg::Empty &) {
         sub2_works = true;
   });
 
@@ -1098,9 +1080,6 @@ TYPED_TEST(TestExecutors, dropSomeNodesWithSubscription)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   // delete node 2.
@@ -1116,9 +1095,6 @@ TYPED_TEST(TestExecutors, dropSomeNodesWithSubscription)
 
     const auto cur_time = std::chrono::steady_clock::now();
     ASSERT_LT(cur_time, max_end_time);
-    if(cur_time > max_end_time) {
-      return;
-    }
   }
 
   ASSERT_TRUE(sub1_works);