Merge branch 'master' into parse-logical-keyword

# Conflicts:
#	src/H5MD/dump_h5md.cpp
This commit is contained in:
Axel Kohlmeyer
2021-09-29 23:05:59 -04:00
114 changed files with 1399 additions and 450 deletions

View File

@ -560,7 +560,8 @@ void DumpAtom::write_binary(int n, double *mybuf)
void DumpAtom::write_string(int n, double *mybuf)
{
fwrite(mybuf,sizeof(char),n,fp);
if (mybuf)
fwrite(mybuf,sizeof(char),n,fp);
}
/* ---------------------------------------------------------------------- */