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

24
src/min_hftn.cpp
View File

@ -81,11 +81,11 @@ MinHFTN::MinHFTN(LAMMPS *lmp) : Min(lmp)
searchflag = 1;
for (int i = 1; i < NUM_HFTN_ATOM_BASED_VECTORS; i++)
_daExtraGlobal[i] = NULL;
_daExtraGlobal[i] = nullptr;
for (int i = 0; i < NUM_HFTN_ATOM_BASED_VECTORS; i++)
_daExtraAtom[i] = NULL;
_daExtraAtom[i] = nullptr;
_fpPrint = NULL;
_fpPrint = nullptr;
return;
}
@ -97,10 +97,10 @@ MinHFTN::MinHFTN(LAMMPS *lmp) : Min(lmp)
MinHFTN::~MinHFTN (void)
{
for (int i = 1; i < NUM_HFTN_ATOM_BASED_VECTORS; i++)
if (_daExtraGlobal[i] != NULL)
if (_daExtraGlobal[i] != nullptr)
delete [] _daExtraGlobal[i];
for (int i = 0; i < NUM_HFTN_ATOM_BASED_VECTORS; i++)
if (_daExtraAtom[i] != NULL)
if (_daExtraAtom[i] != nullptr)
delete [] _daExtraAtom[i];
return;
@ -118,14 +118,14 @@ void MinHFTN::init()
error->all(FLERR,"Incorrect min_modify option");
for (int i = 1; i < NUM_HFTN_ATOM_BASED_VECTORS; i++) {
if (_daExtraGlobal[i] != NULL)
if (_daExtraGlobal[i] != nullptr)
delete [] _daExtraGlobal[i];
_daExtraGlobal[i] = NULL;
_daExtraGlobal[i] = nullptr;
}
for (int i = 0; i < NUM_HFTN_ATOM_BASED_VECTORS; i++) {
if (_daExtraAtom[i] != NULL)
if (_daExtraAtom[i] != nullptr)
delete [] _daExtraAtom[i];
_daExtraAtom[i] = NULL;
_daExtraAtom[i] = nullptr;
}
return;
@ -1618,7 +1618,7 @@ void MinHFTN::open_hftn_print_file_(void)
char szTmp[50];
sprintf (szTmp, "progress_MinHFTN_%d.txt", nMyRank);
_fpPrint = fopen (szTmp, "w");
if (_fpPrint == NULL) {
if (_fpPrint == nullptr) {
printf ("*** MinHFTN cannot open file '%s'\n", szTmp);
printf ("*** continuing...\n");
return;
@ -1655,7 +1655,7 @@ void MinHFTN::hftn_print_line_(const bool bIsStepAccepted,
const char sFormatR[]
= "r %4d %5d %14.8f %11.5e %3s %9.3e %8.2e %10.3e %10.3e\n";
if (_fpPrint == NULL)
if (_fpPrint == nullptr)
return;
char sStepType[4];
@ -1701,6 +1701,6 @@ void MinHFTN::hftn_print_line_(const bool bIsStepAccepted,
void MinHFTN::close_hftn_print_file_(void)
{
if (_fpPrint != NULL) fclose (_fpPrint);
if (_fpPrint != nullptr) fclose (_fpPrint);
return;
}