Merge pull request #2358 from eagunn/iss2345
Replace instances of NULL with nullptr
This commit is contained in:
@ -47,12 +47,12 @@ CommTiled::CommTiled(LAMMPS *lmp) : Comm(lmp)
|
||||
{
|
||||
style = 1;
|
||||
layout = Comm::LAYOUT_UNIFORM;
|
||||
pbc_flag = NULL;
|
||||
buf_send = NULL;
|
||||
buf_recv = NULL;
|
||||
overlap = NULL;
|
||||
rcbinfo = NULL;
|
||||
cutghostmulti = NULL;
|
||||
pbc_flag = nullptr;
|
||||
buf_send = nullptr;
|
||||
buf_recv = nullptr;
|
||||
overlap = nullptr;
|
||||
rcbinfo = nullptr;
|
||||
cutghostmulti = nullptr;
|
||||
init_buffers();
|
||||
}
|
||||
|
||||
@ -89,16 +89,16 @@ CommTiled::~CommTiled()
|
||||
|
||||
void CommTiled::init_buffers()
|
||||
{
|
||||
buf_send = buf_recv = NULL;
|
||||
buf_send = buf_recv = nullptr;
|
||||
maxsend = maxrecv = BUFMIN;
|
||||
grow_send(maxsend,2);
|
||||
memory->create(buf_recv,maxrecv,"comm:buf_recv");
|
||||
|
||||
maxoverlap = 0;
|
||||
overlap = NULL;
|
||||
rcbinfo = NULL;
|
||||
cutghostmulti = NULL;
|
||||
sendbox_multi = NULL;
|
||||
overlap = nullptr;
|
||||
rcbinfo = nullptr;
|
||||
cutghostmulti = nullptr;
|
||||
sendbox_multi = nullptr;
|
||||
|
||||
maxswap = 6;
|
||||
allocate_swap(maxswap);
|
||||
@ -2085,22 +2085,22 @@ void CommTiled::allocate_swap(int n)
|
||||
sendlist = new int**[n];
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
sendproc[i] = recvproc[i] = NULL;
|
||||
sendnum[i] = recvnum[i] = NULL;
|
||||
size_forward_recv[i] = firstrecv[i] = NULL;
|
||||
size_reverse_send[i] = size_reverse_recv[i] = NULL;
|
||||
forward_recv_offset[i] = reverse_recv_offset[i] = NULL;
|
||||
sendproc[i] = recvproc[i] = nullptr;
|
||||
sendnum[i] = recvnum[i] = nullptr;
|
||||
size_forward_recv[i] = firstrecv[i] = nullptr;
|
||||
size_reverse_send[i] = size_reverse_recv[i] = nullptr;
|
||||
forward_recv_offset[i] = reverse_recv_offset[i] = nullptr;
|
||||
|
||||
pbc_flag[i] = NULL;
|
||||
pbc[i] = NULL;
|
||||
sendbox[i] = NULL;
|
||||
sendbox_multi[i] = NULL;
|
||||
maxsendlist[i] = NULL;
|
||||
sendlist[i] = NULL;
|
||||
pbc_flag[i] = nullptr;
|
||||
pbc[i] = nullptr;
|
||||
sendbox[i] = nullptr;
|
||||
sendbox_multi[i] = nullptr;
|
||||
maxsendlist[i] = nullptr;
|
||||
sendlist[i] = nullptr;
|
||||
}
|
||||
|
||||
maxrequest = 0;
|
||||
requests = NULL;
|
||||
requests = nullptr;
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
nprocmax[i] = DELTA_PROCS;
|
||||
|
||||
Reference in New Issue
Block a user