Skip to content
Snippets Groups Projects
Commit 0b315b5e authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Fix Entity ctors and ops

parent 621e9207
No related branches found
No related tags found
No related merge requests found
......@@ -67,19 +67,11 @@ namespace armarx::armem::base
{
}
/*
EntityBase(const EntityBase& other) :
Base(other)
{
}
EntityBase& operator=(const EntityBase& other)
{
other._copySelf(*this);
return *this;
}
*/
EntityBase(const EntityBase& other) = default;
EntityBase(EntityBase&& other) = default;
EntityBase& operator=(const EntityBase& other) = default;
EntityBase& operator=(EntityBase&& other) = default;
virtual bool equalsDeep(const EntityBase& other) const
......
......@@ -2,19 +2,6 @@
namespace armarx::armem::d_ltm
{
Entity::Entity(const Entity& other) :
Base(other),
path(other.path)
{
}
Entity& Entity::operator=(const Entity& other)
{
other._copySelf(*this);
return *this;
}
std::filesystem::path Entity::_fullPath() const
{
if (path)
......
......@@ -38,9 +38,8 @@ namespace armarx::armem::d_ltm
public:
using Base::EntityBase;
using Base::operator=;
Entity(const Entity& other);
Entity& operator=(const Entity& other);
// Conversion
wm::Entity convert(const aron::typenavigator::NavigatorPtr& expectedStructure) const;
......
......@@ -3,12 +3,6 @@
namespace armarx::armem::ltm
{
Entity& Entity::operator=(const Entity& other)
{
other._copySelf(*this);
return *this;
}
wm::Entity Entity::convert() const
{
wm::Entity m;
......
......@@ -36,9 +36,8 @@ namespace armarx::armem::ltm
public:
using Base::EntityBase;
using Base::operator=;
/// Copy the history from `other` to this.
Entity& operator=(const Entity& other);
// Conversion
wm::Entity convert() const;
......
......@@ -2,15 +2,6 @@
namespace armarx::armem::wm
{
/*
Entity& Entity::operator=(const Entity& other)
{
other._copySelf(*this);
return *this;
}
*/
void Entity::_copySelfWithoutData(Entity& other) const
{
other.id() = _id;
......
......@@ -36,9 +36,13 @@ namespace armarx::armem::wm
public:
using Base::EntityBase;
virtual ~Entity() override = default;
//Entity& operator=(const Entity& other);
Entity(const Entity& other) = default;
Entity(Entity&& other) = default;
Entity& operator=(const Entity& other) = default;
Entity& operator=(Entity&& other) = default;
virtual ~Entity() override = default;
protected:
......
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