From 32bdc478167a8dc521b27407104dbd11446414a6 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Wed, 17 Jan 2007 06:41:53 +0000 Subject: [PATCH] Fix a number of places where MPI_Fint was used where the standard specifies MPI_Aint. On 64-bit big endian machines, these can have some unpleasent issues. Refs trac:734 This commit was SVN r13140. The following Trac tickets were found above: Ticket 734 --> https://svn.open-mpi.org/trac/ompi/ticket/734 --- ompi/mpi/f77/accumulate_f.c | 8 ++++---- ompi/mpi/f77/alloc_mem_f.c | 8 ++++---- ompi/mpi/f77/get_f.c | 8 ++++---- ompi/mpi/f77/pack_external_f.c | 10 +++++----- ompi/mpi/f77/prototypes_mpi.h | 12 ++++++------ ompi/mpi/f77/put_f.c | 8 ++++---- ompi/mpi/f77/unpack_external_f.c | 12 ++++++------ 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ompi/mpi/f77/accumulate_f.c b/ompi/mpi/f77/accumulate_f.c index ae5ab40910..1fa30b0783 100644 --- a/ompi/mpi/f77/accumulate_f.c +++ b/ompi/mpi/f77/accumulate_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_ACCUMULATE, pmpi_accumulate_, pmpi_accumulate__, pmpi_accumulate_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ACCUMULATE, mpi_accumulate_, mpi_accumulate__, mpi_accumulate_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, ierr) ) #endif @@ -61,7 +61,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ACCUMULATE, void mpi_accumulate_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, - MPI_Fint *target_disp, MPI_Fint *target_count, + MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr) { @@ -74,7 +74,7 @@ void mpi_accumulate_f(char *origin_addr, MPI_Fint *origin_count, OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), - (MPI_Aint) *target_disp, + *target_disp, OMPI_FINT_2_INT(*target_count), c_target_datatype, c_op, c_win)); } diff --git a/ompi/mpi/f77/alloc_mem_f.c b/ompi/mpi/f77/alloc_mem_f.c index 7314589d54..1ff490f103 100644 --- a/ompi/mpi/f77/alloc_mem_f.c +++ b/ompi/mpi/f77/alloc_mem_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_ALLOC_MEM, pmpi_alloc_mem_, pmpi_alloc_mem__, pmpi_alloc_mem_f, - (MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr), + (MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr), (size, info, baseptr, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLOC_MEM, mpi_alloc_mem_, mpi_alloc_mem__, mpi_alloc_mem_f, - (MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr), + (MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr), (size, info, baseptr, ierr) ) #endif @@ -57,9 +57,9 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ALLOC_MEM, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_alloc_mem_f(MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr) +void mpi_alloc_mem_f(MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr) { MPI_Info c_info = MPI_Info_f2c(*info); - *ierr = OMPI_INT_2_FINT(MPI_Alloc_mem((MPI_Aint) *size, c_info, baseptr)); + *ierr = OMPI_INT_2_FINT(MPI_Alloc_mem(*size, c_info, baseptr)); } diff --git a/ompi/mpi/f77/get_f.c b/ompi/mpi/f77/get_f.c index 99e05f6ee2..74f62a1321 100644 --- a/ompi/mpi/f77/get_f.c +++ b/ompi/mpi/f77/get_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_GET, pmpi_get_, pmpi_get__, pmpi_get_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET, mpi_get_, mpi_get__, mpi_get_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win, ierr) ) #endif @@ -61,7 +61,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GET, void mpi_get_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, - MPI_Fint *target_disp, MPI_Fint *target_count, + MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr) { MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); @@ -72,7 +72,7 @@ void mpi_get_f(char *origin_addr, MPI_Fint *origin_count, OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), - (MPI_Aint) *target_disp, + *target_disp, OMPI_FINT_2_INT(*target_count), c_target_datatype, c_win)); } diff --git a/ompi/mpi/f77/pack_external_f.c b/ompi/mpi/f77/pack_external_f.c index 0d187f988c..aa0461239f 100644 --- a/ompi/mpi/f77/pack_external_f.c +++ b/ompi/mpi/f77/pack_external_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_PACK_EXTERNAL, pmpi_pack_external_, pmpi_pack_external__, pmpi_pack_external_f, - (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Fint *outsize, MPI_Fint *position, MPI_Fint *ierr), + (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Aint *outsize, MPI_Aint *position, MPI_Fint *ierr), (datarep, inbuf, incount, datatype, outbuf, outsize, position, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL, mpi_pack_external_, mpi_pack_external__, mpi_pack_external_f, - (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Fint *outsize, MPI_Fint *position, MPI_Fint *ierr), + (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Aint *outsize, MPI_Aint *position, MPI_Fint *ierr), (datarep, inbuf, incount, datatype, outbuf, outsize, position, ierr) ) #endif @@ -60,7 +60,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PACK_EXTERNAL, void mpi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, - MPI_Fint *outsize, MPI_Fint *position, + MPI_Aint *outsize, MPI_Aint *position, MPI_Fint *ierr) { MPI_Datatype type = MPI_Type_f2c(*datatype); @@ -68,6 +68,6 @@ void mpi_pack_external_f(char *datarep, char *inbuf, MPI_Fint *incount, *ierr = OMPI_INT_2_FINT(MPI_Pack_external(datarep, OMPI_ADDR(inbuf), OMPI_FINT_2_INT(*incount), type, outbuf, - (MPI_Aint) *outsize, - (MPI_Aint *)position)); + *outsize, + position)); } diff --git a/ompi/mpi/f77/prototypes_mpi.h b/ompi/mpi/f77/prototypes_mpi.h index a6e92586e8..29ce6849fc 100644 --- a/ompi/mpi/f77/prototypes_mpi.h +++ b/ompi/mpi/f77/prototypes_mpi.h @@ -56,14 +56,14 @@ OMPI_DECLSPEC ret P##upper_name args PN(void, mpi_abort, MPI_ABORT, (MPI_Fint *comm, MPI_Fint *errorcode, MPI_Fint *ierr)); -PN(void, mpi_accumulate, MPI_ACCUMULATE, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr)); +PN(void, mpi_accumulate, MPI_ACCUMULATE, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *op, MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_add_error_class, MPI_ADD_ERROR_CLASS, (MPI_Fint *errorclass, MPI_Fint *ierr)); PN(void, mpi_add_error_code, MPI_ADD_ERROR_CODE, (MPI_Fint *errorclass, MPI_Fint *errorcode, MPI_Fint *ierr)); PN(void, mpi_add_error_string, MPI_ADD_ERROR_STRING, (MPI_Fint *errorcode, char *string, MPI_Fint *ierr, int l)); PN(void, mpi_address, MPI_ADDRESS, (char *location, MPI_Fint *address, MPI_Fint *ierr)); PN(void, mpi_allgather, MPI_ALLGATHER, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_allgatherv, MPI_ALLGATHERV, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)); -PN(void, mpi_alloc_mem, MPI_ALLOC_MEM, (MPI_Fint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr)); +PN(void, mpi_alloc_mem, MPI_ALLOC_MEM, (MPI_Aint *size, MPI_Fint *info, char *baseptr, MPI_Fint *ierr)); PN(void, mpi_allreduce, MPI_ALLREDUCE, (char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_alltoall, MPI_ALLTOALL, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_alltoallv, MPI_ALLTOALLV, (char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *rdispls, MPI_Fint *recvtype, MPI_Fint *comm, MPI_Fint *ierr)); @@ -187,7 +187,7 @@ PN(void, mpi_gatherv, MPI_GATHERV, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint PN(void, mpi_get_address, MPI_GET_ADDRESS, (char *location, MPI_Aint *address, MPI_Fint *ierr)); PN(void, mpi_get_count, MPI_GET_COUNT, (MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)); PN(void, mpi_get_elements, MPI_GET_ELEMENTS, (MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)); -PN(void, mpi_get, MPI_GET, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr)); +PN(void, mpi_get, MPI_GET, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_get_processor_name, MPI_GET_PROCESSOR_NAME, (char *name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len)); PN(void, mpi_get_version, MPI_GET_VERSION, (MPI_Fint *version, MPI_Fint *subversion, MPI_Fint *ierr)); PN(void, mpi_graph_create, MPI_GRAPH_CREATE, (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, MPI_Flogical *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr)); @@ -237,14 +237,14 @@ PN(void, mpi_lookup_name, MPI_LOOKUP_NAME, (char *service_name, MPI_Fint *info, PN(void, mpi_op_create, MPI_OP_CREATE, (ompi_op_fortran_handler_fn_t* function, MPI_Flogical *commute, MPI_Fint *op, MPI_Fint *ierr)); PN(void, mpi_open_port, MPI_OPEN_PORT, (MPI_Fint *info, char *port_name, MPI_Fint *ierr, int port_name_len)); PN(void, mpi_op_free, MPI_OP_FREE, (MPI_Fint *op, MPI_Fint *ierr)); -PN(void, mpi_pack_external, MPI_PACK_EXTERNAL, (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Fint *outsize, MPI_Fint *position, MPI_Fint *ierr)); +PN(void, mpi_pack_external, MPI_PACK_EXTERNAL, (char *datarep, char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Aint *outsize, MPI_Aint *position, MPI_Fint *ierr)); PN(void, mpi_pack_external_size, MPI_PACK_EXTERNAL_SIZE, (char *datarep, MPI_Fint *incount, MPI_Fint *datatype, MPI_Fint *size, MPI_Fint *ierr)); PN(void, mpi_pack, MPI_PACK, (char *inbuf, MPI_Fint *incount, MPI_Fint *datatype, char *outbuf, MPI_Fint *outsize, MPI_Fint *position, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_pack_size, MPI_PACK_SIZE, (MPI_Fint *incount, MPI_Fint *datatype, MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr)); PN(void, mpi_pcontrol, MPI_PCONTROL, (MPI_Fint *level)); PN(void, mpi_probe, MPI_PROBE, (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_publish_name, MPI_PUBLISH_NAME, (char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, int service_name_len, int port_name_len)); -PN(void, mpi_put, MPI_PUT, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr)); +PN(void, mpi_put, MPI_PUT, (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_query_thread, MPI_QUERY_THREAD, (MPI_Fint *provided, MPI_Fint *ierr)); PN(void, mpi_recv_init, MPI_RECV_INIT, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_recv, MPI_RECV, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr)); @@ -311,7 +311,7 @@ PN(void, mpi_type_ub, MPI_TYPE_UB, (MPI_Fint *mtype, MPI_Fint *ub, MPI_Fint *ier PN(void, mpi_type_vector, MPI_TYPE_VECTOR, (MPI_Fint *count, MPI_Fint *blocklength, MPI_Fint *stride, MPI_Fint *oldtype, MPI_Fint *newtype, MPI_Fint *ierr)); PN(void, mpi_unpack, MPI_UNPACK, (char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_unpublish_name, MPI_UNPUBLISH_NAME, (char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, int service_name_len, int port_name_len)); -PN(void, mpi_unpack_external, MPI_UNPACK_EXTERNAL, (char *datarep, char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr)); +PN(void, mpi_unpack_external, MPI_UNPACK_EXTERNAL, (char *datarep, char *inbuf, MPI_Aint *insize, MPI_Aint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr)); PN(void, mpi_waitall, MPI_WAITALL, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *array_of_statuses, MPI_Fint *ierr)); PN(void, mpi_waitany, MPI_WAITANY, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_wait, MPI_WAIT, (MPI_Fint *request, MPI_Fint *status, MPI_Fint *ierr)); diff --git a/ompi/mpi/f77/put_f.c b/ompi/mpi/f77/put_f.c index 7bb1b160f9..6048d44103 100644 --- a/ompi/mpi/f77/put_f.c +++ b/ompi/mpi/f77/put_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_PUT, pmpi_put_, pmpi_put__, pmpi_put_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUT, mpi_put_, mpi_put__, mpi_put_f, - (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Fint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), + (char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr), (origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win, ierr) ) #endif @@ -61,7 +61,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_PUT, void mpi_put_f(char *origin_addr, MPI_Fint *origin_count, MPI_Fint *origin_datatype, MPI_Fint *target_rank, - MPI_Fint *target_disp, MPI_Fint *target_count, + MPI_Aint *target_disp, MPI_Fint *target_count, MPI_Fint *target_datatype, MPI_Fint *win, MPI_Fint *ierr) { MPI_Datatype c_origin_datatype = MPI_Type_f2c(*origin_datatype); @@ -72,7 +72,7 @@ void mpi_put_f(char *origin_addr, MPI_Fint *origin_count, OMPI_FINT_2_INT(*origin_count), c_origin_datatype, OMPI_FINT_2_INT(*target_rank), - (MPI_Aint) *target_disp, + *target_disp, OMPI_FINT_2_INT(*target_count), c_target_datatype, c_win)); } diff --git a/ompi/mpi/f77/unpack_external_f.c b/ompi/mpi/f77/unpack_external_f.c index f5270f1b34..475c59c057 100644 --- a/ompi/mpi/f77/unpack_external_f.c +++ b/ompi/mpi/f77/unpack_external_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_UNPACK_EXTERNAL, pmpi_unpack_external_, pmpi_unpack_external__, pmpi_unpack_external_f, - (char *datarep, char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr), + (char *datarep, char *inbuf, MPI_Aint *insize, MPI_Aint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr), (datarep, inbuf, insize, position, outbuf, outcount, datatype, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK_EXTERNAL, mpi_unpack_external_, mpi_unpack_external__, mpi_unpack_external_f, - (char *datarep, char *inbuf, MPI_Fint *insize, MPI_Fint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr), + (char *datarep, char *inbuf, MPI_Aint *insize, MPI_Aint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr), (datarep, inbuf, insize, position, outbuf, outcount, datatype, ierr) ) #endif @@ -58,8 +58,8 @@ OMPI_GENERATE_F77_BINDINGS (MPI_UNPACK_EXTERNAL, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_unpack_external_f (char *datarep, char *inbuf, MPI_Fint *insize, - MPI_Fint *position, char *outbuf, +void mpi_unpack_external_f (char *datarep, char *inbuf, MPI_Aint *insize, + MPI_Aint *position, char *outbuf, MPI_Fint *outcount, MPI_Fint *datatype, MPI_Fint *ierr) { @@ -67,8 +67,8 @@ void mpi_unpack_external_f (char *datarep, char *inbuf, MPI_Fint *insize, c_type = MPI_Type_f2c(*datatype); *ierr = OMPI_INT_2_FINT(MPI_Unpack_external(datarep, inbuf, - (MPI_Aint)*insize, - (MPI_Aint *)position, + *insize, + position, OMPI_ADDR(outbuf), OMPI_FINT_2_INT(*outcount), c_type));