ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-04-09 23:07:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pickling_arm' into 'master'

Browse Source 
fix pickling on arm, store long type platform independent

See merge request jschoeberl/netgen!376
This commit is contained in:
Matthias Hochsteger 2021-04-01 10:34:11 +00:00
commit f8ca545455
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/core/archive.hpp
View File

@ -688,7 +688,11 @@ namespace ngcore
Archive & operator & (short & i) override Archive & operator & (short & i) override
{ return Write(i); } { return Write(i); }
Archive & operator & (long & i) override Archive & operator & (long & i) override
{ return Write(i); } {
// for platform independence
int64_t tmp = i;
return Write(tmp);
}
Archive & operator & (size_t & i) override Archive & operator & (size_t & i) override
{ return Write(i); } { return Write(i); }
Archive & operator & (unsigned char & i) override Archive & operator & (unsigned char & i) override
@ -726,14 +730,13 @@ namespace ngcore
template <typename T> template <typename T>
Archive & Write (T x) Archive & Write (T x)
{ {
static_assert(sizeof(T) < BUFFERSIZE, "Cannot write large types with this function!");
if (unlikely(ptr > BUFFERSIZE-sizeof(T))) if (unlikely(ptr > BUFFERSIZE-sizeof(T)))
{ {
stream->write(&buffer[0], ptr); stream->write(&buffer[0], ptr);
*reinterpret_cast<T*>(&buffer[0]) = x; // NOLINT ptr = 0;
ptr = sizeof(T);
return *this;
} }
*reinterpret_cast<T*>(&buffer[ptr]) = x; // NOLINT memcpy(&buffer[ptr], &x, sizeof(T));
ptr += sizeof(T); ptr += sizeof(T);
return *this; return *this;
} }
@ -761,7 +764,12 @@ namespace ngcore
Archive & operator & (short & i) override Archive & operator & (short & i) override
{ Read(i); return *this; } { Read(i); return *this; }
Archive & operator & (long & i) override Archive & operator & (long & i) override
{ Read(i); return *this; } {
int64_t tmp;
Read(tmp);
i = tmp;
return *this;
}
Archive & operator & (size_t & i) override Archive & operator & (size_t & i) override
{ Read(i); return *this; } { Read(i); return *this; }
Archive & operator & (unsigned char & i) override Archive & operator & (unsigned char & i) override