ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-14 10:08:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

DynamicTable: char-alloc if not trivially constructable

Browse Source
This commit is contained in:
Joachim Schöberl 2020-08-29 12:36:45 +02:00
parent c8b8b3ddd3
commit 020dd4373d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/core/table.hpp
View File

@ -391,7 +391,7 @@ namespace ngcore
: data(entrysizes.Size()) : data(entrysizes.Size())
{ {
size_t cnt = 0; size_t cnt = 0;
size_t n = entrysizes.Size(); // size_t n = entrysizes.Size();
for (auto es : entrysizes) for (auto es : entrysizes)
cnt += es; cnt += es;
@ -478,7 +478,11 @@ namespace ngcore
if (line.size == line.maxsize) if (line.size == line.maxsize)
{ {
T * p = new T[(2*line.maxsize+5)]; T * p;
if constexpr (std::is_default_constructible<T>::value)
p = new T[(2*line.maxsize+5)];
else
p = reinterpret_cast<T*>(new char[(2*line.maxsize+5)*sizeof(T)]);
for (size_t i = 0; i < line.maxsize; i++) for (size_t i = 0; i < line.maxsize; i++)
p[i] = std::move(line.col[i]); p[i] = std::move(line.col[i]);
// memcpy (p, line.col, line.maxsize * sizeof(T)); // memcpy (p, line.col, line.maxsize * sizeof(T));