Merge pull request #9405 from awlauria/fortran_logic_master

jsquyres · web-flow · commit 72d30063b432 · 2021-09-23T08:26:44.000-04:00
Fortran logical fix.
diff --git a/ompi/mpi/fortran/mpif-h/improbe_f.c b/ompi/mpi/fortran/mpif-h/improbe_f.c
@@ -95,7 +95,7 @@ void ompi_improbe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
 
     if (MPI_SUCCESS == c_ierr) {
         OMPI_SINGLE_INT_2_LOGICAL(flag);
-        if (OMPI_FORTRAN_VALUE_TRUE == *flag) {
+        if (1 == OMPI_LOGICAL_2_INT(*flag)) {
             OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr)
             *message = PMPI_Message_c2f(c_message);
         }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void ompi_improbe_f(MPI_Fint source, MPI_Fint tag, MPI_Fint *comm,`
`95`	`95`
`96`	`96`	`if (MPI_SUCCESS == c_ierr) {`
`97`	`97`	`OMPI_SINGLE_INT_2_LOGICAL(flag);`
`98`		`- if (OMPI_FORTRAN_VALUE_TRUE == *flag) {`
	`98`	`+ if (1 == OMPI_LOGICAL_2_INT(*flag)) {`
`99`	`99`	`OMPI_FORTRAN_STATUS_RETURN(c_status,c_status2,status,c_ierr)`
`100`	`100`	`*message = PMPI_Message_c2f(c_message);`
`101`	`101`	`}`