From bddf372ac1b3d832f601dc9c66d9fe975e502bc3 Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Wed, 4 Aug 2004 17:08:29 +0000 Subject: [PATCH] removing two warnings. This commit was SVN r1871. --- src/mca/coll/basic/src/coll_basic_allgatherv.c | 6 +++--- src/mca/coll/basic/src/coll_basic_reduce_scatter.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mca/coll/basic/src/coll_basic_allgatherv.c b/src/mca/coll/basic/src/coll_basic_allgatherv.c index c68f6228ec..113239627f 100644 --- a/src/mca/coll/basic/src/coll_basic_allgatherv.c +++ b/src/mca/coll/basic/src/coll_basic_allgatherv.c @@ -61,13 +61,13 @@ int mca_coll_basic_allgatherv_inter(void *sbuf, int scount, int size, rsize; int err; int *scounts=NULL; - MPI_Aint *sdisps=NULL; + int *sdisps=NULL; rsize = ompi_comm_remote_size (comm); size = ompi_comm_size (comm); - scounts = (int *) calloc(rsize, sizeof(int) ); - sdisps = (MPI_Aint *) calloc (rsize, sizeof(MPI_Aint)); + scounts = (int *) calloc (rsize, sizeof(int) ); + sdisps = (int *) calloc (rsize, sizeof(int)); if ( NULL == scounts || NULL == sdisps ) { return err; } diff --git a/src/mca/coll/basic/src/coll_basic_reduce_scatter.c b/src/mca/coll/basic/src/coll_basic_reduce_scatter.c index 6b822625b8..860c84109d 100644 --- a/src/mca/coll/basic/src/coll_basic_reduce_scatter.c +++ b/src/mca/coll/basic/src/coll_basic_reduce_scatter.c @@ -171,7 +171,7 @@ int mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, goto exit; } - err = mca_pml.pml_wait(1, &req, NULL, MPI_STATUS_IGNORE); + err = mca_pml.pml_wait_all (1, &req, MPI_STATUS_IGNORE); if (OMPI_SUCCESS != err ) { goto exit; } @@ -226,7 +226,7 @@ int mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, goto exit; } - err = mca_pml.pml_wait (1, &req, NULL, MPI_STATUS_IGNORE); + err = mca_pml.pml_wait_all (1, &req, MPI_STATUS_IGNORE); if ( OMPI_SUCCESS != err ) { goto exit; } @@ -269,4 +269,5 @@ int mca_coll_basic_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, free ( tmpbuf2 ); } + return err; }