cleanup linter errors

Signed-off-by: Alberto Soragna <[email protected]>

Author: alsora

rclcpp/include/rclcpp/executors/events_executor_entities_collector.hpp

@@ -18,6 +18,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "rclcpp/executors/event_waitable.hpp"

rclcpp/include/rclcpp/executors/timers_manager.hpp

@@ -22,6 +22,7 @@
 #include <memory>
 #include <mutex>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "rclcpp/context.hpp"
@@ -147,7 +148,7 @@ class TimersManager
    */
   class WeakTimersHeap
   {
-  public:
+public:
     /**
      * @brief Try to add a new timer to the heap.
      * After the addition, the heap property is preserved.
@@ -177,12 +178,12 @@ class TimersManager
     {
       TimersHeap locked_heap = this->validate_and_lock();
       bool removed = locked_heap.remove_timer(std::move(timer));
-    
+
       if (removed) {
         // Re-create the weak heap with the timer removed
         this->store(locked_heap);
       }
-      
+
       return removed;
     }
 
@@ -208,7 +209,7 @@ class TimersManager
           it = weak_heap_.erase(it);
           any_timer_destroyed = true;
         }
-      }  
+      }
 
       // If a timer has gone out of scope, then the remaining elements may not represent
       // a valid heap anymore. We need to re heapify the timers heap.
@@ -218,13 +219,13 @@ class TimersManager
         this->store(locked_heap);
       }
 
-      return locked_heap;    
+      return locked_heap;
     }
 
     /**
      * @brief This function allows to recreate the heap of weak pointers
      * from an heap of owned pointers.
-     * @param heap 
+     * @param heap timers heap to store as weak pointers
      */
     void store(const TimersHeap & heap)
     {
@@ -242,7 +243,7 @@ class TimersManager
       weak_heap_.clear();
     }
 
-  private:
+private:
     std::vector<WeakTimerPtr> weak_heap_;
   };
 
@@ -253,7 +254,7 @@ class TimersManager
    */
   class TimersHeap
   {
-  public:
+public:
     /**
      * @brief Try to add a new timer to the heap.
      * After the addition, the heap property is preserved.
@@ -291,7 +292,7 @@ class TimersManager
       owned_heap_.erase(it);
       std::make_heap(owned_heap_.begin(), owned_heap_.end(), timer_greater);
 
-      return true;    
+      return true;
     }
 
     /**
@@ -341,14 +342,14 @@ class TimersManager
      */
     void heapify()
     {
-        std::make_heap(owned_heap_.begin(), owned_heap_.end(), timer_greater);
+      std::make_heap(owned_heap_.begin(), owned_heap_.end(), timer_greater);
     }
 
     /**
      * @brief Convenience function that allows to push an element at the bottom of the heap.
      * It will not perform any check on whether the heap remains valid or not.
      * Those checks are responsibility of the calling code.
-     * 
+     *
      * @param timer timer to push at the back of the data structure representing the heap
      */
     void push_back(TimerPtr timer)
@@ -360,10 +361,9 @@ class TimersManager
      * @brief Friend declaration to allow the store function to access the underlying
      * heap container
      */
-    friend void WeakTimersHeap::store(const TimersHeap& heap);
-
-  private:
+    friend void WeakTimersHeap::store(const TimersHeap & heap);
 
+private:
     /**
      * @brief Comparison function between timers.
      */

rclcpp/src/rclcpp/executors/events_executor.cpp

@@ -274,7 +274,7 @@ EventsExecutor::execute_event(const rmw_listener_event_t & event)
       {
         auto subscription = entities_collector_->get_subscription(event.entity);
 
-        if(subscription) {
+        if (subscription) {
           execute_subscription(subscription);
         }
         break;
@@ -284,7 +284,7 @@ EventsExecutor::execute_event(const rmw_listener_event_t & event)
       {
         auto service = entities_collector_->get_service(event.entity);
 
-        if(service) {
+        if (service) {
           execute_service(service);
         }
         break;
@@ -294,7 +294,7 @@ EventsExecutor::execute_event(const rmw_listener_event_t & event)
       {
         auto client = entities_collector_->get_client(event.entity);
 
-        if(client) {
+        if (client) {
           execute_client(client);
         }
         break;
@@ -304,7 +304,7 @@ EventsExecutor::execute_event(const rmw_listener_event_t & event)
       {
         auto waitable = entities_collector_->get_waitable(event.entity);
 
-        if(waitable) {
+        if (waitable) {
           waitable->execute();
         }
         break;

rclcpp/src/rclcpp/executors/events_executor_entities_collector.cpp

@@ -506,7 +506,7 @@ EventsExecutorEntitiesCollector::get_subscription(const void * subscription_id)
     auto subscription_weak_ptr = it->second;
     auto subscription_shared_ptr = subscription_weak_ptr.lock();
 
-    if(subscription_shared_ptr) {
+    if (subscription_shared_ptr) {
       return subscription_shared_ptr;
     }
 
@@ -525,7 +525,7 @@ EventsExecutorEntitiesCollector::get_client(const void * client_id)
     auto client_weak_ptr = it->second;
     auto client_shared_ptr = client_weak_ptr.lock();
 
-    if(client_shared_ptr) {
+    if (client_shared_ptr) {
       return client_shared_ptr;
     }
 
@@ -544,7 +544,7 @@ EventsExecutorEntitiesCollector::get_service(const void * service_id)
     auto service_weak_ptr = it->second;
     auto service_shared_ptr = service_weak_ptr.lock();
 
-    if(service_shared_ptr) {
+    if (service_shared_ptr) {
       return service_shared_ptr;
     }
 
@@ -563,7 +563,7 @@ EventsExecutorEntitiesCollector::get_waitable(const void * waitable_id)
     auto waitable_weak_ptr = it->second;
     auto waitable_shared_ptr = waitable_weak_ptr.lock();
 
-    if(waitable_shared_ptr) {
+    if (waitable_shared_ptr) {
       return waitable_shared_ptr;
     }