From ea36d736a680ce2e2cd54b64268666332001c936 Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Thu, 21 Dec 2023 21:47:50 +0100
Subject: [PATCH] fix: removed cpp 20+ features usage to make building possible
on bionic
---
.../skills_gui/executions/SkillExecutionTreeWidget.cpp | 4 ++--
.../skills_gui/skill_details/SkillDetailsTreeWidget.cpp | 4 ++--
.../RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
index 4f7400c2f..a8c58b4ae 100644
--- a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
@@ -21,7 +21,7 @@ namespace armarx::skills::gui
// Stop skill
QAction* stopSkillAction = new QAction("Stop execution", this);
const auto& executions = memory->fetchExecutions();
- if (!executions.contains(selectedExecution.skillExecutionId))
+ if (executions.count(selectedExecution.skillExecutionId) == 0)
return;
skills::SkillStatus currentStatus =
memory->fetchExecutions().at(selectedExecution.skillExecutionId).status;
@@ -64,7 +64,7 @@ namespace armarx::skills::gui
if (executions.empty())
return;
- if (!executions.contains(currentExecutionId))
+ if (executions.count(currentExecutionId) == 0)
{
// we didn't find an entry for the execution id
ARMARX_IMPORTANT << "The selected execution was not found in memory. The GUI is unable "
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
index a38eeb979..f6c9c04b0 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
@@ -93,8 +93,8 @@ namespace armarx::skills::gui
// maybe the search is empty?
auto skillsMap = memory->fetchSkills();
- if (!skillsMap.contains(sid.providerId.value()) ||
- !skillsMap.at(sid.providerId.value()).contains(sid))
+ if (skillsMap.count(sid.providerId.value()) == 0 ||
+ skillsMap.at(sid.providerId.value()).count(sid) == 0)
{
this->resetWidget();
return;
diff --git a/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
index 29b9fb180..16655613a 100644
--- a/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
@@ -54,7 +54,7 @@ namespace armarx::skills::gui
++i;
// sanity check
- ARMARX_CHECK(skills.contains(providerId));
+ ARMARX_CHECK(skills.count(providerId) > 0);
auto& providedSkills = skills.at(providerId);
int j = 0;
--
GitLab