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

10
src/reader.cpp
View File

@ -25,7 +25,7 @@ using namespace LAMMPS_NS;
Reader::Reader(LAMMPS *lmp) : Pointers(lmp)
{
fp = NULL;
fp = nullptr;
}
/* ----------------------------------------------------------------------
@ -35,7 +35,7 @@ Reader::Reader(LAMMPS *lmp) : Pointers(lmp)
void Reader::open_file(const char *file)
{
if (fp != NULL) close_file();
if (fp != nullptr) close_file();
compressed = 0;
const char *suffix = file + strlen(file) - 3;
@ -55,7 +55,7 @@ void Reader::open_file(const char *file)
#endif
}
if (fp == NULL)
if (fp == nullptr)
error->one(FLERR,fmt::format("Cannot open file {}: {}",
file, utils::getsyserror()));
}
@ -67,10 +67,10 @@ void Reader::open_file(const char *file)
void Reader::close_file()
{
if (fp == NULL) return;
if (fp == nullptr) return;
if (compressed) pclose(fp);
else fclose(fp);
fp = NULL;
fp = nullptr;
}
/* ----------------------------------------------------------------------