Merge branch 'master' into symbolic-atom-constants

2020-09-15 17:44:31 -04:00
parent 618b08dcfc cebf6d33ba
commit 0f6a34775c
1186 changed files with 8448 additions and 8360 deletions
--- a/src/fix_read_restart.cpp
+++ b/src/fix_read_restart.cpp
@ -23,7 +23,7 @@ using namespace FixConst;

 FixReadRestart::FixReadRestart(LAMMPS *lmp, int narg, char **arg) :
  Fix(lmp, narg, arg),
-  count(NULL), extra(NULL)
+  count(nullptr), extra(nullptr)
 {
  nextra = utils::inumeric(FLERR,arg[3],false,lmp);
  int nfix = utils::inumeric(FLERR,arg[4],false,lmp);