Skip to content
Snippets Groups Projects
Verified Commit f473e0ff authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-move-entity' into f-async-execute

parents 25095679 d535de96
No related branches found
No related tags found
2 merge requests!42Release 0.2.0,!28F async execute
Pipeline #14019 passed
Pipeline: caosdb-cppinttest

#14021

    ......@@ -677,9 +677,7 @@ public:
    /**
    * Move constructor.
    */
    explicit inline Entity(Entity &&original)
    : wrapped(std::move(original.wrapped)), value(Value(std::move(original.value.wrapped))),
    data_type(DataType(std::move(original.data_type.wrapped))) {
    explicit inline Entity(Entity &&original) : Entity(std::move(original.wrapped)) {
    this->properties.wrapped = std::move(original.properties.wrapped);
    this->parents.wrapped = std::move(original.parents.wrapped);
    this->errors.wrapped = std::move(original.errors.wrapped);
    ......@@ -692,14 +690,14 @@ public:
    */
    auto operator=(Entity &&other) -> Entity & {
    this->wrapped = std::move(other.wrapped);
    this->data_type.wrapped = std::move(other.data_type.wrapped);
    this->value.wrapped = std::move(other.value.wrapped);
    this->properties.wrapped = std::move(other.properties.wrapped);
    this->parents.wrapped = std::move(other.parents.wrapped);
    this->data_type = std::move(other.data_type);
    this->value = std::move(other.value);
    this->properties = std::move(other.properties);
    this->parents = std::move(other.parents);
    this->file_descriptor = std::move(other.file_descriptor);
    this->errors.wrapped = std::move(other.errors.wrapped);
    this->warnings.wrapped = std::move(other.warnings.wrapped);
    this->infos.wrapped = std::move(other.infos.wrapped);
    this->errors = std::move(other.errors);
    this->warnings = std::move(other.warnings);
    this->infos = std::move(other.infos);
    return *this;
    }
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment