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

Merge pull request #2358 from eagunn/iss2345

Browse Source 
Replace instances of NULL with nullptr
This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:41:24 -04:00
committed by GitHub
parent f481a403bc baa49984c2
commit cebf6d33ba
1185 changed files with 8417 additions and 8329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/atom_vec_hybrid.cpp
View File

@ -30,13 +30,13 @@ enum{ELLIPSOID,LINE,TRIANGLE,BODY}; // also in WriteData
AtomVecHybrid::AtomVecHybrid(LAMMPS *lmp) : AtomVec(lmp)
{
nstyles = 0;
styles = NULL;
keywords = NULL;
fieldstrings = NULL;
styles = nullptr;
keywords = nullptr;
fieldstrings = nullptr;
bonus_flag = 0;
nstyles_bonus = 0;
styles_bonus = NULL;
styles_bonus = nullptr;
// these strings will be concatenated from sub-style strings
// fields_data_atom & fields_data_vel start with fields common to all styles
@ -187,7 +187,7 @@ void AtomVecHybrid::process_args(int narg, char **arg)
// save concat_grow to check for duplicates of special-case fields
char *concat_grow;;
char *null = NULL;
char *null = nullptr;
fields_grow = merge_fields(0,fields_grow,1,concat_grow);
fields_copy = merge_fields(1,fields_copy,0,null);