Skip to content
Snippets Groups Projects
Commit 84842f18 authored by armar-user's avatar armar-user
Browse files

Merge branch 'armem/dev' of gitlab.com:ArmarX/RobotAPI into armem/dev

parents 7ee68e8f b02ec1c8
No related branches found
No related tags found
1 merge request!157armem/dev => master
...@@ -231,6 +231,11 @@ namespace armarx::armem::base ...@@ -231,6 +231,11 @@ namespace armarx::armem::base
Base::_copySelf(other); Base::_copySelf(other);
other.aronType() = _aronType; other.aronType() = _aronType;
} }
virtual void _copySelfEmpty(DerivedT& other) const override
{
Base::_copySelfEmpty(other);
other.aronType() = _aronType;
}
}; };
......
...@@ -222,6 +222,11 @@ namespace armarx::armem::base ...@@ -222,6 +222,11 @@ namespace armarx::armem::base
Base::_copySelf(other); Base::_copySelf(other);
other.aronType() = _aronType; other.aronType() = _aronType;
} }
virtual void _copySelfEmpty(DerivedT& other) const override
{
Base::_copySelfEmpty(other);
other.aronType() = _aronType;
}
}; };
......
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