Merge pull request #7 from fmrico/fix_rolling_clear_activations

Fix clear_activation
fmrico · Mar 15, 2024 · bc0371e · bc0371e
2 parents 576542e + 3e59b55
commit bc0371e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/humble-devel.yaml b/.github/workflows/humble-devel.yaml
@@ -17,11 +17,11 @@ jobs:
       fail-fast: false
     steps:
       - name: Setup ROS 2
-        uses: ros-tooling/setup-ros@0.3.3
+        uses: ros-tooling/setup-ros@0.7.1
         with:
           required-ros-distributions: humble
       - name: build and test
-        uses: ros-tooling/action-ros-ci@0.2.5
+        uses: ros-tooling/action-ros-ci@0.3.6
         with:
           package-name: rclcpp_cascade_lifecycle cascade_lifecycle_msgs
           target-ros2-distro: humble

diff --git a/.github/workflows/rolling-devel.yaml b/.github/workflows/rolling-devel.yaml
@@ -20,11 +20,11 @@ jobs:
       fail-fast: false
     steps:
       - name: Setup ROS 2
-        uses: ros-tooling/setup-ros@0.4.1
+        uses: ros-tooling/setup-ros@0.7.1
         with:
-          required-ros-distributions: rolling
+          required-ros-distributions: humble
       - name: build and test
-        uses: ros-tooling/action-ros-ci@0.2.7
+        uses: ros-tooling/action-ros-ci@0.3.6
         with:
           package-name: rclcpp_cascade_lifecycle cascade_lifecycle_msgs
           target-ros2-distro: rolling

diff --git a/.github/workflows/rolling.yaml b/.github/workflows/rolling.yaml
@@ -20,11 +20,11 @@ jobs:
       fail-fast: false
     steps:
       - name: Setup ROS 2
-        uses: ros-tooling/setup-ros@0.4.1
+        uses: ros-tooling/setup-ros@0.7.1
         with:
           required-ros-distributions: rolling
       - name: build and test
-        uses: ros-tooling/action-ros-ci@0.2.7
+        uses: ros-tooling/action-ros-ci@0.3.6
         with:
           package-name: rclcpp_cascade_lifecycle cascade_lifecycle_msgs
           target-ros2-distro: rolling

diff --git a/rclcpp_cascade_lifecycle/src/rclcpp_cascade_lifecycle/rclcpp_cascade_lifecycle.cpp b/rclcpp_cascade_lifecycle/src/rclcpp_cascade_lifecycle/rclcpp_cascade_lifecycle.cpp
@@ -202,8 +202,8 @@ CascadeLifecycleNode::remove_activation(const std::string & node_name)
 void
 CascadeLifecycleNode::clear_activation()
 {
-  for (const auto & activation : activations_) {
-    remove_activation(activation);
+  while (!activations_.empty()) {
+    remove_activation(*activations_.begin());
   }
 }