Skip to content
Snippets Groups Projects
Commit aedd6fda authored by Patrick Dormanns's avatar Patrick Dormanns
Browse files

fix template ambiguities

parent 8045da91
No related branches found
No related tags found
1 merge request!439Fix template ambiguities in aron_conversions
Pipeline #18255 passed
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment