Skip to content

Commit db41de2

Browse files
lgulichclaude
andcommitted
Avoid C++20-only constructs in actuator parameter handling
The package builds as C++17 in some environments (e.g. pixi), where a defaulted operator== and std::erase_if are unavailable. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 25d8628 commit db41de2

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

‎mujoco_ros2_control/include/mujoco_ros2_control/actuator_parameters.hpp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ struct ActuatorAffineParameters
1616
double bias_position{ 0.0 };
1717
double bias_velocity{ 0.0 };
1818

19-
bool operator==(const ActuatorAffineParameters&) const = default;
19+
bool operator==(const ActuatorAffineParameters& other) const
20+
{
21+
return gain == other.gain && bias_constant == other.bias_constant && bias_position == other.bias_position &&
22+
bias_velocity == other.bias_velocity;
23+
}
24+
25+
bool operator!=(const ActuatorAffineParameters& other) const
26+
{
27+
return !(*this == other);
28+
}
2029
};
2130

2231
/** A complete affine-parameter update for one MuJoCo actuator. */

‎mujoco_ros2_control/src/mujoco_simulation.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "mujoco_ros2_control/sim_display_text.hpp"
2323

2424
#include <unistd.h>
25+
#include <algorithm>
2526
#include <cerrno>
2627
#include <chrono>
2728
#include <cmath>
@@ -1485,8 +1486,10 @@ void MujocoSimulation::set_actuator_parameters(const ActuatorParameterUpdate& up
14851486
validate_actuator_id(mj_model_, update.actuator_id);
14861487
const std::lock_guard<std::recursive_mutex> sim_lock(*sim_mutex_);
14871488
const std::lock_guard<std::mutex> staging_lock(control_staging_mutex_);
1488-
std::erase_if(actuator_parameter_updates_staged_,
1489-
[&update](const auto& pending) { return pending.actuator_id == update.actuator_id; });
1489+
auto& staged = actuator_parameter_updates_staged_;
1490+
staged.erase(std::remove_if(staged.begin(), staged.end(),
1491+
[&update](const auto& pending) { return pending.actuator_id == update.actuator_id; }),
1492+
staged.end());
14901493
apply_actuator_parameters(mj_model_, update);
14911494
}
14921495

0 commit comments

Comments
 (0)