Add MPI_Scan to generated C bindings

Signed-off-by: Jake Tronge <jtronge@lanl.gov>

Author: jtronge

ompi/include/mpi.h.in

@@ -1943,6 +1943,8 @@ OMPI_DECLSPEC  int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datat
                                   MPI_Request *request);
 OMPI_DECLSPEC  int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                             MPI_Op op, MPI_Comm comm);
+OMPI_DECLSPEC  int MPI_Scan_c(const void *sendbuf, void *recvbuf, MPI_Count count, MPI_Datatype datatype,
+                              MPI_Op op, MPI_Comm comm);
 OMPI_DECLSPEC  int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                              MPI_Op op, MPI_Comm comm, MPI_Request *request);
 OMPI_DECLSPEC  int MPI_Scan_init(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
@@ -2723,6 +2725,8 @@ OMPI_DECLSPEC  int PMPI_Rsend_init(const void *buf, int count, MPI_Datatype data
                                    MPI_Request *request);
 OMPI_DECLSPEC  int PMPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                              MPI_Op op, MPI_Comm comm);
+OMPI_DECLSPEC  int PMPI_Scan_c(const void *sendbuf, void *recvbuf, MPI_Count count, MPI_Datatype datatype,
+                               MPI_Op op, MPI_Comm comm);
 OMPI_DECLSPEC  int PMPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                               MPI_Op op, MPI_Comm comm, MPI_Request *request);
 OMPI_DECLSPEC  int PMPI_Scan_init(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,

ompi/mpi/c/Makefile.am

@@ -52,6 +52,7 @@ prototype_sources = \
         alltoallw.c.in \
         send.c.in \
         isend.c.in \
+        scan.c.in \
         recv.c.in \
         irecv.c.in \
         waitsome.c.in \
@@ -393,7 +394,7 @@ interface_profile_sources = \
         rput.c \
         rsend_init.c \
         rsend.c \
-        scan.c \
+        generated_scan.c \
         iscan.c \
         scan_init.c \
         scatter.c \

ompi/mpi/c/scan.c renamed to ompi/mpi/c/scan.c.in

@@ -34,18 +34,8 @@
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"
 
-#if OMPI_BUILD_MPI_PROFILING
-#if OPAL_HAVE_WEAK_SYMBOLS
-#pragma weak MPI_Scan = PMPI_Scan
-#endif
-#define MPI_Scan PMPI_Scan
-#endif
-
-static const char FUNC_NAME[] = "MPI_Scan";
-
-
-int MPI_Scan(const void *sendbuf, void *recvbuf, int count,
-             MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
+PROTOTYPE ERROR_CLASS scan(BUFFER sendbuf, BUFFER_OUT recvbuf, COUNT count,
+                           DATATYPE datatype, OP op, COMM comm)
 {
     int err;