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

12
src/memory.cpp
View File

@ -45,7 +45,7 @@ Memory::Memory(LAMMPS *lmp) : Pointers(lmp) {}
void *Memory::smalloc(bigint nbytes, const char *name)
{
if (nbytes == 0) return NULL;
if (nbytes == 0) return nullptr;
#if defined(LAMMPS_MEMALIGN)
void *ptr;
@ -54,13 +54,13 @@ void *Memory::smalloc(bigint nbytes, const char *name)
ptr = scalable_aligned_malloc(nbytes, LAMMPS_MEMALIGN);
#else
int retval = posix_memalign(&ptr, LAMMPS_MEMALIGN, nbytes);
if (retval) ptr = NULL;
if (retval) ptr = nullptr;
#endif
#else
void *ptr = malloc(nbytes);
#endif
if (ptr == NULL)
if (ptr == nullptr)
error->one(FLERR,fmt::format("Failed to allocate {} bytes for array {}",
nbytes,name));
return ptr;
@ -74,7 +74,7 @@ void *Memory::srealloc(void *ptr, bigint nbytes, const char *name)
{
if (nbytes == 0) {
destroy(ptr);
return NULL;
return nullptr;
}
#if defined(LMP_USE_TBB_ALLOCATOR)
@ -99,7 +99,7 @@ void *Memory::srealloc(void *ptr, bigint nbytes, const char *name)
#else
ptr = realloc(ptr,nbytes);
#endif
if (ptr == NULL)
if (ptr == nullptr)
error->one(FLERR,fmt::format("Failed to reallocate {} bytes for array {}",
nbytes,name));
return ptr;
@ -111,7 +111,7 @@ void *Memory::srealloc(void *ptr, bigint nbytes, const char *name)
void Memory::sfree(void *ptr)
{
if (ptr == NULL) return;
if (ptr == nullptr) return;
#if defined(LMP_USE_TBB_ALLOCATOR)
scalable_aligned_free(ptr);
#else