ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 22:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ArrayMem & operator= (ArrayMem && a2)

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-07-11 17:58:23 +02:00
parent 39e4e2bc12
commit 372b0a3089
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsrc/core/array.hpp
View File

@ -1112,19 +1112,15 @@ namespace ngcore
ArrayMem & operator= (ArrayMem && a2) ArrayMem & operator= (ArrayMem && a2)
{ {
if (a2.mem_to_delete) ngcore::Swap (mem_to_delete, a2.mem_to_delete);
{ ngcore::Swap (allocsize, a2.allocsize);
ngcore::Swap (mem_to_delete, a2.mem_to_delete); ngcore::Swap (size, a2.size);
ngcore::Swap (data, a2.data); ngcore::Swap (data, a2.data);
ngcore::Swap (allocsize, a2.allocsize);
ngcore::Swap (size, a2.size); if (mem_to_delete==nullptr)
} for (auto i : Range(size))
else mem[i] = std::move(a2.mem[i]);
{
allocsize = S;
for (size_t i = 0; i < S; i++)
mem[i] = std::move(a2.mem[i]);
}
return *this; return *this;
} }