fix a missed conflict from merging

jefferyyjhsu · jefferyyjhsu · commit 9429585f6ca7 · 2022-09-12T14:56:15.000-05:00
diff --git a/irobot_events_executor/src/rclcpp/timers_manager.cpp b/irobot_events_executor/src/rclcpp/timers_manager.cpp
@@ -43,7 +43,7 @@ void TimersManager::add_timer(rclcpp::TimerBase::SharedPtr timer)
 
   timer->set_on_reset_callback([this](){
     {
-      std::unique_lock<std::mutex> lock(timers_mutex_);
+      rclcpp::Lock lock(timers_mutex_);
       timers_updated_ = true;
     }
     timers_cv_.notify_one();

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void TimersManager::add_timer(rclcpp::TimerBase::SharedPtr timer)`
`43`	`43`
`44`	`44`	`timer->set_on_reset_callback([this](){`
`45`	`45`	`{`
`46`		`- std::unique_lock<std::mutex> lock(timers_mutex_);`
	`46`	`+ rclcpp::Lock lock(timers_mutex_);`
`47`	`47`	`timers_updated_ = true;`
`48`	`48`	`}`
`49`	`49`	`timers_cv_.notify_one();`