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

Fix move ctor and assignment ops

parent 80aa8114
No related branches found
No related tags found
2 merge requests!188ArMem Updates,!185Clean up interfaces and unneeded code in memory core classes
......@@ -23,7 +23,7 @@ namespace armarx::armem::ltm
Memory::Memory(Memory&& other) :
Base(other),
Base(std::move(other)),
dbsettings(other.dbsettings),
alwaysTransferSettings(other.alwaysTransferSettings),
periodicTransferSettings(other.periodicTransferSettings),
......@@ -49,7 +49,8 @@ namespace armarx::armem::ltm
Memory& Memory::operator=(Memory&& other)
{
Base::operator=(other);
Base::operator=(std::move(other));
dbsettings = std::move(other.dbsettings);
alwaysTransferSettings = std::move(other.alwaysTransferSettings);
periodicTransferSettings = std::move(other.periodicTransferSettings);
......
......@@ -16,7 +16,8 @@ namespace armarx::armem::wm
}
CoreSegment::CoreSegment(CoreSegment&& other) : CoreSegment::Base(other)
CoreSegment::CoreSegment(CoreSegment&& other) :
CoreSegment::Base(std::move(other))
{
// Do not move _mutex.
}
......@@ -32,7 +33,7 @@ namespace armarx::armem::wm
CoreSegment& CoreSegment::operator=(CoreSegment&& other)
{
Base::operator=(other);
Base::operator=(std::move(other));
// Don't move _mutex.
return *this;
}
......
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