Lint

Signed-off-by: Michael Carroll <[email protected]>

Author: mjcarroll

rclcpp/include/rclcpp/executors/executor_entities_collection.hpp

@@ -15,7 +15,6 @@
 #ifndef RCLCPP__EXECUTORS__EXECUTOR_ENTITIES_COLLECTION_HPP_
 #define RCLCPP__EXECUTORS__EXECUTOR_ENTITIES_COLLECTION_HPP_
 
-#include "rclcpp/subscription_base.hpp"
 #include <deque>
 #include <unordered_map>
 #include <vector>
@@ -33,18 +32,19 @@ namespace rclcpp
 namespace executors
 {
 
-template <typename EntityValueType>
-struct CollectionEntry {
+template<typename EntityValueType>
+struct CollectionEntry
+{
   typename EntityValueType::WeakPtr entity;
   rclcpp::CallbackGroup::WeakPtr callback_group;
 };
 
-template <typename CollectionType>
+template<typename CollectionType>
 void update_entities(
   const CollectionType & update_from,
   CollectionType update_to,
-  std::function<void (typename CollectionType::mapped_type::EntitySharedPtr) > on_added,
-  std::function<void (typename CollectionType::mapped_type::EntitySharedPtr) > on_removed
+  std::function<void(typename CollectionType::mapped_type::EntitySharedPtr)> on_added,
+  std::function<void(typename CollectionType::mapped_type::EntitySharedPtr)> on_removed
 )
 {
   for (auto it = update_to.begin(); it != update_to.end(); ) {
@@ -68,18 +68,19 @@ void update_entities(
     }
   }
 }
-template <typename EntityKeyType, typename EntityValueType>
-class EntityCollection:
-  public std::unordered_map<const EntityKeyType *, CollectionEntry<EntityValueType>>
+template<typename EntityKeyType, typename EntityValueType>
+class EntityCollection
+  : public std::unordered_map<const EntityKeyType *, CollectionEntry<EntityValueType>>
 {
 public:
   using Key = const EntityKeyType *;
   using EntityWeakPtr = typename EntityValueType::WeakPtr;
   using EntitySharedPtr = typename EntityValueType::SharedPtr;
 
-  void update(const EntityCollection<EntityKeyType, EntityValueType> & other,
-              std::function<void (EntitySharedPtr)> on_added,
-              std::function<void (EntitySharedPtr)> on_removed)
+  void update(
+    const EntityCollection<EntityKeyType, EntityValueType> & other,
+    std::function<void(EntitySharedPtr)> on_added,
+    std::function<void(EntitySharedPtr)> on_removed)
   {
     update_entities(*this, other, on_added, on_removed);
   }

rclcpp/include/rclcpp/executors/executor_entities_collector.hpp

@@ -63,7 +63,7 @@ class ExecutorEntitiesCollector
    */
   RCLCPP_PUBLIC
   explicit ExecutorEntitiesCollector(
-      std::function<void(void)> on_notify_waitable_callback = {});
+    std::function<void(void)> on_notify_waitable_callback = {});
 
   /// Destructor
   RCLCPP_PUBLIC
@@ -172,7 +172,8 @@ class ExecutorEntitiesCollector
   RCLCPP_PUBLIC
   void
   add_automatically_associated_callback_groups(
-    std::list<rclcpp::node_interfaces::NodeBaseInterface::WeakPtr> nodes_to_check) RCPPUTILS_TSA_REQUIRES(mutex_);
+    std::list<rclcpp::node_interfaces::NodeBaseInterface::WeakPtr> nodes_to_check)
+  RCPPUTILS_TSA_REQUIRES(mutex_);
 
   RCLCPP_PUBLIC
   void

rclcpp/src/rclcpp/executors/executor_entities_collection.cpp

@@ -82,13 +82,14 @@ build_entities_collection(
   }
 }
 
-template <typename EntityCollectionType>
+template<typename EntityCollectionType>
 void check_ready(
   EntityCollectionType & collection,
   std::deque<rclcpp::AnyExecutable> & executables,
   size_t size_of_waited_entities,
   typename EntityCollectionType::Key * waited_entities,
-  std::function<bool(rclcpp::AnyExecutable, typename EntityCollectionType::EntitySharedPtr)> fill_executable)
+  std::function<bool(rclcpp::AnyExecutable,
+  typename EntityCollectionType::EntitySharedPtr)> fill_executable)
 {
   for (size_t ii = 0; ii < size_of_waited_entities; ++ii) {
     if (waited_entities[ii]) {
@@ -130,7 +131,7 @@ ready_executables(
     ret,
     rcl_wait_set.size_of_timers,
     rcl_wait_set.timers,
-    [](auto exec, auto timer){
+    [](auto exec, auto timer) {
       if (!timer->call()) {
         return false;
       }
@@ -143,7 +144,7 @@ ready_executables(
     ret,
     rcl_wait_set.size_of_subscriptions,
     rcl_wait_set.subscriptions,
-    [](auto exec, auto subscription){
+    [](auto exec, auto subscription) {
       exec.subscription = subscription;
       return true;
     });
@@ -153,7 +154,7 @@ ready_executables(
     ret,
     rcl_wait_set.size_of_services,
     rcl_wait_set.services,
-    [](auto exec, auto service){
+    [](auto exec, auto service) {
       exec.service = service;
       return true;
     });
@@ -163,7 +164,7 @@ ready_executables(
     ret,
     rcl_wait_set.size_of_clients,
     rcl_wait_set.clients,
-    [](auto exec, auto client){
+    [](auto exec, auto client) {
       exec.client = client;
       return true;
     });

rclcpp/src/rclcpp/executors/executor_entities_collector.cpp

@@ -24,10 +24,9 @@ namespace executors
 {
 
 ExecutorEntitiesCollector::ExecutorEntitiesCollector(
-    std::function<void(void)> on_notify_waitable_callback) {
-  notify_waitable_ = std::make_shared<ExecutorNotifyWaitable>(
-    [on_notify_waitable_callback](){on_notify_waitable_callback();});
-
+  std::function<void(void)> on_notify_waitable_callback)
+: notify_waitable_(std::make_shared<ExecutorNotifyWaitable>(on_notify_waitable_callback))
+{
 }
 
 ExecutorEntitiesCollector::~ExecutorEntitiesCollector()