From dfb5769b0d24d5f7374dfd4ada7200b94f2522a3 Mon Sep 17 00:00:00 2001 From: JafarAbdi Date: Tue, 5 Apr 2022 15:58:19 +0000 Subject: [PATCH] Fix rolling compatibility with jammy Fix compile warning Update clang-format version to 12 --- .github/workflows/format.yaml | 4 ++-- .pre-commit-config.yaml | 2 +- core/src/cost_terms.cpp | 4 ++-- core/src/stages/compute_ik.cpp | 2 +- core/src/stages/simple_grasp.cpp | 2 +- visualization/motion_planning_tasks/src/task_panel.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 39ea7866..f6d56b2e 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -15,8 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - - name: Install clang-format-10 - run: sudo apt-get install clang-format-10 + - name: Install clang-format-12 + run: sudo apt-get install clang-format-12 - uses: pre-commit/action@v2.0.0 id: precommit - name: Upload pre-commit changes diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e4e33057..60e63f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: - id: clang-format name: clang-format description: Format files with ClangFormat. - entry: clang-format-10 + entry: clang-format-12 language: system files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$ args: ['-fallback-style=none', '-i'] diff --git a/core/src/cost_terms.cpp b/core/src/cost_terms.cpp index 363bbb09..4ddcecfc 100644 --- a/core/src/cost_terms.cpp +++ b/core/src/cost_terms.cpp @@ -185,8 +185,8 @@ double Clearance::operator()(const SubTrajectory& s, std::string& comment) const auto& state_properties{ state->properties() }; auto& stage_properties{ s.creator()->properties() }; request.group_name = state_properties.hasProperty(group_property) ? - state_properties.get(group_property) : - stage_properties.get(group_property); + state_properties.get(group_property) : + stage_properties.get(group_property); // look at all forbidden collisions involving group_name request.enableGroup(state->scene()->getRobotModel()); diff --git a/core/src/stages/compute_ik.cpp b/core/src/stages/compute_ik.cpp index b1699000..70233068 100644 --- a/core/src/stages/compute_ik.cpp +++ b/core/src/stages/compute_ik.cpp @@ -282,7 +282,7 @@ void ComputeIK::compute() { if (value.empty()) { // property undefined // determine IK link from eef/group if (!(link = eef_jmg ? robot_model->getLinkModel(eef_jmg->getEndEffectorParentGroup().second) : - jmg->getOnlyOneEndEffectorTip())) { + jmg->getOnlyOneEndEffectorTip())) { RCLCPP_WARN_STREAM(LOGGER, "Failed to derive IK target link"); return; } diff --git a/core/src/stages/simple_grasp.cpp b/core/src/stages/simple_grasp.cpp index 303718ca..aeaee065 100644 --- a/core/src/stages/simple_grasp.cpp +++ b/core/src/stages/simple_grasp.cpp @@ -132,7 +132,7 @@ void SimpleGraspBase::setup(std::unique_ptr&& generator, bool forward) { const std::string& eef = p.get("eef"); moveit_msgs::msg::AttachedCollisionObject obj; obj.object.operation = forward ? (int8_t)moveit_msgs::msg::CollisionObject::ADD : - (int8_t)moveit_msgs::msg::CollisionObject::REMOVE; + (int8_t)moveit_msgs::msg::CollisionObject::REMOVE; obj.link_name = scene->getRobotModel()->getEndEffector(eef)->getEndEffectorParentGroup().second; obj.object.id = p.get("object"); scene->processAttachedCollisionObjectMsg(obj); diff --git a/visualization/motion_planning_tasks/src/task_panel.cpp b/visualization/motion_planning_tasks/src/task_panel.cpp index 3c829f4f..34910a82 100644 --- a/visualization/motion_planning_tasks/src/task_panel.cpp +++ b/visualization/motion_planning_tasks/src/task_panel.cpp @@ -91,8 +91,8 @@ TaskPanel::TaskPanel(QWidget* parent) : rviz_common::Panel(parent), d_ptr(new Ta Q_D(TaskPanel); // sync checked tool button with displayed widget - connect(d->tool_buttons_group, static_cast(&QButtonGroup::buttonClicked), - d->stackedWidget, [d](int index) { d->stackedWidget->setCurrentIndex(index); }); + connect(d->tool_buttons_group, static_cast(&QButtonGroup::idClicked), d->stackedWidget, + [d](int index) { d->stackedWidget->setCurrentIndex(index); }); connect(d->stackedWidget, &QStackedWidget::currentChanged, d->tool_buttons_group, [d](int index) { d->tool_buttons_group->button(index)->setChecked(true); });