Merge pull request #2358 from eagunn/iss2345

Replace instances of NULL with nullptr
This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:41:24 -04:00
committed by GitHub
1185 changed files with 8417 additions and 8329 deletions

View File

@ -42,7 +42,7 @@ using namespace LAMMPS_NS;
/* ---------------------------------------------------------------------- */
VerletSplit::VerletSplit(LAMMPS *lmp, int narg, char **arg) :
Verlet(lmp, narg, arg), qsize(NULL), qdisp(NULL), xsize(NULL), xdisp(NULL), f_kspace(NULL)
Verlet(lmp, narg, arg), qsize(nullptr), qdisp(nullptr), xsize(nullptr), xdisp(nullptr), f_kspace(nullptr)
{
// error checks on partitions
@ -194,7 +194,7 @@ VerletSplit::VerletSplit(LAMMPS *lmp, int narg, char **arg) :
// allocate dummy version for Kspace partition
maxatom = 0;
f_kspace = NULL;
f_kspace = nullptr;
if (!master) memory->create(f_kspace,1,1,"verlet/split:f_kspace");
}
@ -289,7 +289,7 @@ void VerletSplit::run(int n)
Fix *fix_omp;
int ifix = modify->find_fix("package_omp");
if (ifix < 0) fix_omp = NULL;
if (ifix < 0) fix_omp = nullptr;
else fix_omp = modify->fix[ifix];
// flags for timestepping iterations