Skip to content
Snippets Groups Projects

Remove laser scanner features memory

All threads resolved!
2 files
+ 9
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -54,15 +54,19 @@ namespace armarx::aron::type
{
memberTypes[key] = FromAronDTO(*t, path.withElement(key));
}
if (o.parent)
{
extends = FromAronObjectDTO(o.parent);
}
}
ObjectPtr Object::FromAronObjectDTO(const type::dto::AronObjectPtr& aron)
ObjectPtr Object::FromAronObjectDTO(const type::dto::AronObjectPtr& aron, const aron::Path& path)
{
if (!aron)
{
return nullptr;
}
return std::make_shared<Object>(*aron);
return std::make_shared<Object>(*aron, path);
}
type::dto::AronObjectPtr Object::ToAronObjectDTO(const ObjectPtr& aron)
@@ -141,6 +145,7 @@ namespace armarx::aron::type
ARMARX_CHECK_NOT_NULL(p);
type::dto::AronObjectPtr ex = p->toAronObjectDTO();
ARMARX_CHECK_NOT_NULL(ex);
aron->parent = ex;
extends = p;
}
Loading