Merge branch 'master' of https://github.com/lammps/lammps into lammps-master2

2021-08-20 10:53:04 -04:00
parent bf223a92b1 3404920e98
commit 2a06484511
4453 changed files with 106551 additions and 73942 deletions
--- a/src/write_restart.cpp
+++ b/src/write_restart.cpp
@ -615,8 +615,8 @@ void WriteRestart::file_layout(int send_size)

 void WriteRestart::magic_string()
 {
-  std::string magic = MAGIC_STRING;
-  fwrite(magic.c_str(),sizeof(char),magic.size()+1,fp);
+  const char magic[] = MAGIC_STRING;
+  fwrite(magic,sizeof(char),strlen(magic)+1,fp);
 }

 /* ---------------------------------------------------------------------- */