From 4d8afc8fb00a0581bc5e7cb9501bdb8b597c897c Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Thu, 20 Aug 2009 02:57:34 +0000 Subject: [PATCH] Make testsome similar to waitsome. This commit was SVN r21846. --- ompi/mpi/f77/testsome_f.c | 9 +-------- ompi/mpi/f77/waitsome_f.c | 8 ++++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ompi/mpi/f77/testsome_f.c b/ompi/mpi/f77/testsome_f.c index e816b64174..db461fca39 100644 --- a/ompi/mpi/f77/testsome_f.c +++ b/ompi/mpi/f77/testsome_f.c @@ -71,9 +71,6 @@ void mpi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, MPI_Request *c_req; MPI_Status *c_status; int i; -#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT - int int_c; -#endif OMPI_SINGLE_NAME_DECL(outcount); OMPI_ARRAY_NAME_DECL(array_of_indices); @@ -97,12 +94,8 @@ void mpi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, OMPI_ARRAY_NAME_CONVERT(array_of_indices), c_status)); -#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT OMPI_SINGLE_INT_2_FINT(outcount); - int_c = OMPI_FINT_2_INT(*incount); - OMPI_ARRAY_INT_2_FINT(array_of_indices, int_c); - *incount = OMPI_INT_2_FINT(int_c); -#endif + OMPI_ARRAY_INT_2_FINT(array_of_indices, *incount); if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { if (MPI_UNDEFINED != OMPI_FINT_2_INT(*outcount)) { diff --git a/ompi/mpi/f77/waitsome_f.c b/ompi/mpi/f77/waitsome_f.c index 0bb4e0b8e1..a203f4c701 100644 --- a/ompi/mpi/f77/waitsome_f.c +++ b/ompi/mpi/f77/waitsome_f.c @@ -65,8 +65,8 @@ static const char FUNC_NAME[] = "MPI_WAITSOME"; void mpi_waitsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, - MPI_Fint *outcount, MPI_Fint *array_of_indices, - MPI_Fint *array_of_statuses, MPI_Fint *ierr) + MPI_Fint *outcount, MPI_Fint *array_of_indices, + MPI_Fint *array_of_statuses, MPI_Fint *ierr) { MPI_Request *c_req; MPI_Status *c_status; @@ -95,8 +95,8 @@ void mpi_waitsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests, c_status)); if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { - OMPI_SINGLE_INT_2_FINT(outcount); - OMPI_ARRAY_INT_2_FINT(array_of_indices, *incount); + OMPI_SINGLE_INT_2_FINT(outcount); + OMPI_ARRAY_INT_2_FINT(array_of_indices, *incount); /* Increment indexes by one for fortran conventions */