C interface templates - return MPI_Fint for c2f

hppritcha · hppritcha · commit 7f5fba917398 · 2025-04-07T10:28:22.000-06:00
A bug was found with the c templates for the handle conversion routines comm_c2f and win_c2f while working on open-mpi#13168 Signed-off-by: Howard Pritchard <howardp@lanl.gov>
diff --git a/ompi/mpi/c/comm_c2f.c.in b/ompi/mpi/c/comm_c2f.c.in
@@ -30,7 +30,7 @@
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS comm_c2f(COMM comm)
+PROTOTYPE FINT comm_c2f(COMM comm)
 {
     MEMCHECKER(
         memchecker_comm(comm);
diff --git a/ompi/mpi/c/win_c2f.c.in b/ompi/mpi/c/win_c2f.c.in
@@ -31,7 +31,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/mpi/fortran/base/fint_2_int.h"
 
-PROTOTYPE ERROR_CLASS win_c2f(WIN win)
+PROTOTYPE FINT win_c2f(WIN win)
 {
     if ( MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include "ompi/mpi/fortran/base/fint_2_int.h"`
`31`	`31`	`#include "ompi/memchecker.h"`
`32`	`32`
`33`		`-PROTOTYPE ERROR_CLASS comm_c2f(COMM comm)`
	`33`	`+PROTOTYPE FINT comm_c2f(COMM comm)`
`34`	`34`	`{`
`35`	`35`	`MEMCHECKER(`
`36`	`36`	`memchecker_comm(comm);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include "ompi/errhandler/errhandler.h"`
`32`	`32`	`#include "ompi/mpi/fortran/base/fint_2_int.h"`
`33`	`33`
`34`		`-PROTOTYPE ERROR_CLASS win_c2f(WIN win)`
	`34`	`+PROTOTYPE FINT win_c2f(WIN win)`
`35`	`35`	`{`
`36`	`36`	`if ( MPI_PARAM_CHECK) {`
`37`	`37`	`OMPI_ERR_INIT_FINALIZE(FUNC_NAME);`