ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 13:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ArrayMem::operator=(ArrayMem&&) (again)

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-07-12 08:52:50 +02:00
parent 1653f56efc
commit da85de4795
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/core/array.hpp
View File

@ -1115,11 +1115,15 @@ namespace ngcore
ngcore::Swap (mem_to_delete, a2.mem_to_delete); ngcore::Swap (mem_to_delete, a2.mem_to_delete);
ngcore::Swap (allocsize, a2.allocsize); ngcore::Swap (allocsize, a2.allocsize);
ngcore::Swap (size, a2.size); ngcore::Swap (size, a2.size);
ngcore::Swap (data, a2.data);
if (mem_to_delete==nullptr) if (mem_to_delete==nullptr)
{
for (auto i : Range(size)) for (auto i : Range(size))
mem[i] = std::move(a2.mem[i]); mem[i] = std::move(a2.mem[i]);
data = mem;
}
else
ngcore::Swap (data, a2.data);
return *this; return *this;
} }