Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
6da41d93
Commit
6da41d93
authored
1 year ago
by
Julian Tusch
Browse files
Options
Downloads
Patches
Plain Diff
replaced use of vector with list, small fixes
parent
831e1461
No related branches found
Branches containing commit
No related tags found
3 merge requests
!460
Draft: fluxio/dev-skill-timeout
,
!449
Fluxio preliminary release
,
!446
Draft: Fluxio related changes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+3
-2
3 additions, 2 deletions
.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
with
3 additions
and
2 deletions
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+
3
−
2
View file @
6da41d93
...
...
@@ -2,6 +2,7 @@
#include
<optional>
#include
<string>
#include
<list>
#include
<IceUtil/UUID.h>
...
...
@@ -696,7 +697,7 @@ namespace armarx::plugins
std
::
optional
<
skills
::
FluxioSkill
>
SkillManagerComponentPlugin
::
getSkill
(
const
std
::
string
&
id
)
{
auto
skillsEntry
=
fluxioDC
.
skills
.
find
(
id
);
const
auto
&
skillsEntry
=
fluxioDC
.
skills
.
find
(
id
);
if
(
skillsEntry
!=
fluxioDC
.
skills
.
end
())
{
return
skillsEntry
->
second
;
...
...
@@ -721,7 +722,7 @@ namespace armarx::plugins
// oldSkill->native = skill.native; Not changeable
// ---update the parameters lists entirelys
std
::
vector
<
std
::
string
>
toRemoveIds
;
std
::
list
<
std
::
string
>
toRemoveIds
;
// fill the toRemoveIds vector with all old skills parameters
for
(
const
auto
&
parameter
:
oldSkill
.
parameters
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment