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
aedd6fda
Commit
aedd6fda
authored
1 year ago
by
Patrick Dormanns
Browse files
Options
Downloads
Patches
Plain Diff
fix template ambiguities
parent
8045da91
No related branches found
Branches containing commit
No related tags found
1 merge request
!439
Fix template ambiguities in aron_conversions
Pipeline
#18255
passed
1 year ago
Stage: build-and-test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/aron/core/aron_conversions.h
+6
-0
6 additions, 0 deletions
source/RobotAPI/libraries/aron/core/aron_conversions.h
with
6 additions
and
0 deletions
source/RobotAPI/libraries/aron/core/aron_conversions.h
+
6
−
0
View file @
aedd6fda
...
...
@@ -124,6 +124,7 @@ namespace detail
// std::optional
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
toAron
(
std
::
optional
<
DtoT
>&
dto
,
const
std
::
optional
<
BoT
>&
bo
)
{
if
(
bo
.
has_value
())
...
...
@@ -138,6 +139,7 @@ namespace detail
}
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
fromAron
(
const
std
::
optional
<
DtoT
>&
dto
,
std
::
optional
<
BoT
>&
bo
)
{
if
(
dto
.
has_value
())
...
...
@@ -230,6 +232,7 @@ namespace detail
// std::vector
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
toAron
(
std
::
vector
<
DtoT
>&
dtos
,
const
std
::
vector
<
BoT
>&
bos
)
{
dtos
.
clear
();
...
...
@@ -240,6 +243,7 @@ namespace detail
}
}
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
fromAron
(
const
std
::
vector
<
DtoT
>&
dtos
,
std
::
vector
<
BoT
>&
bos
)
{
bos
.
clear
();
...
...
@@ -339,11 +343,13 @@ namespace armarx
// std::optional
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
toAron
(
std
::
optional
<
DtoT
>&
dto
,
const
std
::
optional
<
BoT
>&
bo
)
{
armarx
::
aron
::
toAron
(
dto
,
bo
);
}
template
<
class
DtoT
,
class
BoT
>
requires
(
!
aron
::
detail
::
DtoAndBoAreSame
<
DtoT
,
BoT
>
)
void
fromAron
(
const
std
::
optional
<
DtoT
>&
dto
,
std
::
optional
<
BoT
>&
bo
)
{
armarx
::
aron
::
fromAron
(
dto
,
bo
);
...
...
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