Fix ci-testing build issues (#1998)

moveit · Mar 10, 2023 · 0e1c973 · 0e1c973
2 parents b68db4e + 31e07d3
commit 0e1c973
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/moveit_core/planning_request_adapter/src/planning_request_adapter.cpp b/moveit_core/planning_request_adapter/src/planning_request_adapter.cpp
@@ -42,7 +42,7 @@
 
 namespace planning_request_adapter
 {
-rclcpp::Logger LOGGER = rclcpp::get_logger("moveit").get_child("planning_request_adapter");
+static const rclcpp::Logger LOGGER = rclcpp::get_logger("moveit.planning_request_adapter");
 
 namespace
 {

diff --git a/moveit_core/robot_trajectory/include/moveit/robot_trajectory/robot_trajectory.h b/moveit_core/robot_trajectory/include/moveit/robot_trajectory/robot_trajectory.h
@@ -315,19 +315,19 @@ class RobotTrajectory
 
   class Iterator
   {
-    std::deque<moveit::core::RobotStatePtr>::iterator waypoint_iterator;
-    std::deque<double>::iterator duration_iterator;
+    std::deque<moveit::core::RobotStatePtr>::iterator waypoint_iterator_;
+    std::deque<double>::iterator duration_iterator_;
 
   public:
-    explicit Iterator(const std::deque<moveit::core::RobotStatePtr>::iterator& _waypoint_iterator,
-                      const std::deque<double>::iterator& _duration_iterator)
-      : waypoint_iterator(_waypoint_iterator), duration_iterator(_duration_iterator)
+    explicit Iterator(const std::deque<moveit::core::RobotStatePtr>::iterator& waypoint_iterator,
+                      const std::deque<double>::iterator& duration_iterator)
+      : waypoint_iterator_(waypoint_iterator), duration_iterator_(duration_iterator)
     {
     }
     Iterator& operator++()
     {
-      waypoint_iterator++;
-      duration_iterator++;
+      waypoint_iterator_++;
+      duration_iterator_++;
       return *this;
     }
     Iterator operator++(int)
@@ -338,15 +338,15 @@ class RobotTrajectory
     }
     bool operator==(const Iterator& other) const
     {
-      return ((waypoint_iterator == other.waypoint_iterator) && (duration_iterator == other.duration_iterator));
+      return ((waypoint_iterator_ == other.waypoint_iterator_) && (duration_iterator_ == other.duration_iterator_));
     }
     bool operator!=(const Iterator& other) const
     {
       return !(*this == other);
     }
     std::pair<moveit::core::RobotStatePtr, double> operator*() const
     {
-      return std::pair{ *waypoint_iterator, *duration_iterator };
+      return std::pair{ *waypoint_iterator_, *duration_iterator_ };
     }
 
     // iterator traits