ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

T2345: Replace instances of NULL with nullptr

Browse Source 
The following changes have been applied to src and lib folders:
regex replace: ([^"_])NULL ⇒ \1nullptr (8968 chgs in src, 1153 in lib)
Manually find/change: (void \*) nullptr ⇒ nullptr (1 case)
regex find: ".*?nullptr.*?"
  Manually ~14 cases back to "NULL" in src, ~2 in lib
  regex finds a few false positive where nullptr appears between two
  strings in a function call
This commit is contained in:
Anne Gunn
2020-09-11 07:39:46 -06:00
parent 101d39142e
commit f1ef7d85a8
1217 changed files with 8531 additions and 8531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/fix_ave_time.cpp
View File

@ -43,11 +43,11 @@ enum{SCALAR,VECTOR};
FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg),
nvalues(0), which(NULL), argindex(NULL), value2index(NULL),
offcol(NULL), varlen(NULL), ids(NULL),
fp(NULL), offlist(NULL), format(NULL), format_user(NULL),
vector(NULL), vector_total(NULL), vector_list(NULL),
column(NULL), array(NULL), array_total(NULL), array_list(NULL)
nvalues(0), which(nullptr), argindex(nullptr), value2index(nullptr),
offcol(nullptr), varlen(nullptr), ids(nullptr),
fp(nullptr), offlist(nullptr), format(nullptr), format_user(nullptr),
vector(nullptr), vector_total(nullptr), vector_list(nullptr),
column(nullptr), array(nullptr), array_total(nullptr), array_list(nullptr)
{
if (narg < 7) error->all(FLERR,"Illegal fix ave/time command");
@ -243,7 +243,7 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
// nrows = # of rows in output array
// if all columns are variable length, just set nrows = 1 for now
column = NULL;
column = nullptr;
if (mode == VECTOR) {
if (all_variable_length == 0) nrows = column_length(0);
else nrows = 1;
@ -304,10 +304,10 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
// allocate memory for averaging
vector = vector_total = NULL;
vector_list = NULL;
array = array_total = NULL;
array_list = NULL;
vector = vector_total = nullptr;
vector_list = nullptr;
array = array_total = nullptr;
array_list = nullptr;
if (mode == SCALAR) {
vector = new double[nvalues];
@ -321,7 +321,7 @@ FixAveTime::FixAveTime(LAMMPS *lmp, int narg, char **arg) :
// VECTOR mode produces either a vector or array
// intensive/extensive flags set by compute,fix,variable that produces value
extlist = NULL;
extlist = nullptr;
if (mode == SCALAR) {
if (nvalues == 1) {
@ -1022,18 +1022,18 @@ void FixAveTime::options(int iarg, int narg, char **arg)
{
// option defaults
fp = NULL;
fp = nullptr;
ave = ONE;
startstep = 0;
mode = SCALAR;
noff = 0;
offlist = NULL;
offlist = nullptr;
overwrite = 0;
format_user = NULL;
format_user = nullptr;
format = (char *) " %g";
title1 = NULL;
title2 = NULL;
title3 = NULL;
title1 = nullptr;
title2 = nullptr;
title3 = nullptr;
// optional args
@ -1042,7 +1042,7 @@ void FixAveTime::options(int iarg, int narg, char **arg)
if (iarg+2 > narg) error->all(FLERR,"Illegal fix ave/time command");
if (me == 0) {
fp = fopen(arg[iarg+1],"w");
if (fp == NULL)
if (fp == nullptr)
error->one(FLERR,fmt::format("Cannot open fix ave/time file {}: {}",
arg[iarg+1], utils::getsyserror()));
}