T2345: Replace instances of NULL with nullptr

Per guidance from Axel, revert lib/kokkos and lib/colvars
to remove nullptr changes.
This commit is contained in:
Anne Gunn
2020-09-11 08:53:44 -06:00
parent 9a5d8fd18b
commit f524fa758d
31 changed files with 196 additions and 196 deletions

View File

@ -76,7 +76,7 @@ void const *colvarparams::get_param_ptr(std::string const &param_name)
return param_map[param_name];
}
cvm::error("Error: parameter \""+param_name+"\" not found.\n", INPUT_ERROR);
return nullptr;
return NULL;
}
@ -87,7 +87,7 @@ void const *colvarparams::get_param_grad_ptr(std::string const &param_name)
}
cvm::error("Error: gradient of parameter \""+param_name+"\" not found.\n",
INPUT_ERROR);
return nullptr;
return NULL;
}
@ -95,7 +95,7 @@ cvm::real colvarparams::get_param(std::string const &param_name)
{
cvm::real const *ptr =
reinterpret_cast<cvm::real const *>(get_param_ptr(param_name));
return ptr != nullptr ? *ptr : 0.0;
return ptr != NULL ? *ptr : 0.0;
}