diff --git a/ompi/include/ompi_config.h.in b/ompi/include/ompi_config.h.in index a42177e108..04f91de11e 100644 --- a/ompi/include/ompi_config.h.in +++ b/ompi/include/ompi_config.h.in @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * $COPYRIGHT$ * @@ -38,9 +38,6 @@ /* MPI_Fint is the same as ompi_fortran_INTEGER_t */ #define MPI_Fint ompi_fortran_integer_t -/* MPI_Flogical is the same as the ompi_fortran_logical_t */ -#define MPI_Flogical ompi_fortran_logical_t - #if OMPI_HAVE_FORTRAN_REAL && OMPI_HAVE_FORTRAN_COMPLEX /* * C type for Fortran COMPLEX */ typedef struct { diff --git a/ompi/mpi/f77/attr_get_f.c b/ompi/mpi/f77/attr_get_f.c index 06005d9324..fa10ef31d1 100644 --- a/ompi/mpi/f77/attr_get_f.c +++ b/ompi/mpi/f77/attr_get_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_ATTR_GET, pmpi_attr_get_, pmpi_attr_get__, pmpi_attr_get_f, - (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, keyval, attribute_val, flag, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_GET, mpi_attr_get_, mpi_attr_get__, mpi_attr_get_f, - (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, keyval, attribute_val, flag, ierr) ) #endif @@ -60,7 +60,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_ATTR_GET, #endif void mpi_attr_get_f(MPI_Fint *comm, MPI_Fint *keyval, - MPI_Fint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr) + MPI_Fint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_Comm c_comm = MPI_Comm_f2c(*comm); OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/cart_create_f.c b/ompi/mpi/f77/cart_create_f.c index 7c8ca955d1..3681279710 100644 --- a/ompi/mpi/f77/cart_create_f.c +++ b/ompi/mpi/f77/cart_create_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_CART_CREATE, pmpi_cart_create_, pmpi_cart_create__, pmpi_cart_create_f, - (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Flogical *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr), + (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, ompi_fortran_logical_t *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr), (old_comm, ndims, dims, periods, reorder, comm_cart, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_CREATE, mpi_cart_create_, mpi_cart_create__, mpi_cart_create_f, - (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Flogical *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr), + (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, ompi_fortran_logical_t *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr), (old_comm, ndims, dims, periods, reorder, comm_cart, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_CREATE, #endif void mpi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, - MPI_Flogical *periods, MPI_Flogical *reorder, + ompi_fortran_logical_t *periods, ompi_fortran_logical_t *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr) { MPI_Comm c_comm1, c_comm2; diff --git a/ompi/mpi/f77/cart_get_f.c b/ompi/mpi/f77/cart_get_f.c index edab4ea558..dcf82ea28e 100644 --- a/ompi/mpi/f77/cart_get_f.c +++ b/ompi/mpi/f77/cart_get_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_CART_GET, pmpi_cart_get_, pmpi_cart_get__, pmpi_cart_get_f, - (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *coords, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *coords, MPI_Fint *ierr), (comm, maxdims, dims, periods, coords, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_GET, mpi_cart_get_, mpi_cart_get__, mpi_cart_get_f, - (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *coords, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *coords, MPI_Fint *ierr), (comm, maxdims, dims, periods, coords, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_GET, #endif void mpi_cart_get_f(MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, - MPI_Flogical *periods, MPI_Fint *coords, MPI_Fint *ierr) + ompi_fortran_logical_t *periods, MPI_Fint *coords, MPI_Fint *ierr) { MPI_Comm c_comm; int size; diff --git a/ompi/mpi/f77/cart_map_f.c b/ompi/mpi/f77/cart_map_f.c index ff77009b43..1f538a0517 100644 --- a/ompi/mpi/f77/cart_map_f.c +++ b/ompi/mpi/f77/cart_map_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_CART_MAP, pmpi_cart_map_, pmpi_cart_map__, pmpi_cart_map_f, - (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *newrank, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *newrank, MPI_Fint *ierr), (comm, ndims, dims, periods, newrank, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_MAP, mpi_cart_map_, mpi_cart_map__, mpi_cart_map_f, - (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *newrank, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *newrank, MPI_Fint *ierr), (comm, ndims, dims, periods, newrank, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_MAP, #endif void mpi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, - MPI_Flogical *periods, MPI_Fint *newrank, MPI_Fint *ierr) + ompi_fortran_logical_t *periods, MPI_Fint *newrank, MPI_Fint *ierr) { MPI_Comm c_comm; int size; diff --git a/ompi/mpi/f77/cart_sub_f.c b/ompi/mpi/f77/cart_sub_f.c index d6f8095125..4123d4eb6f 100644 --- a/ompi/mpi/f77/cart_sub_f.c +++ b/ompi/mpi/f77/cart_sub_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_CART_SUB, pmpi_cart_sub_, pmpi_cart_sub__, pmpi_cart_sub_f, - (MPI_Fint *comm, MPI_Flogical *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr), + (MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr), (comm, remain_dims, new_comm, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SUB, mpi_cart_sub_, mpi_cart_sub__, mpi_cart_sub_f, - (MPI_Fint *comm, MPI_Flogical *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr), + (MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr), (comm, remain_dims, new_comm, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_CART_SUB, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_cart_sub_f(MPI_Fint *comm, MPI_Flogical *remain_dims, +void mpi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr) { MPI_Comm c_comm, c_new_comm; diff --git a/ompi/mpi/f77/comm_get_attr_f.c b/ompi/mpi/f77/comm_get_attr_f.c index f6f3778162..df310afbbe 100644 --- a/ompi/mpi/f77/comm_get_attr_f.c +++ b/ompi/mpi/f77/comm_get_attr_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_GET_ATTR, pmpi_comm_get_attr_, pmpi_comm_get_attr__, pmpi_comm_get_attr_f, - (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, comm_keyval, attribute_val, flag, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ATTR, mpi_comm_get_attr_, mpi_comm_get_attr__, mpi_comm_get_attr_f, - (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, comm_keyval, attribute_val, flag, ierr) ) #endif @@ -60,7 +60,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_ATTR, #endif void mpi_comm_get_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, - MPI_Aint *attribute_val, MPI_Flogical *flag, + MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_err; diff --git a/ompi/mpi/f77/comm_test_inter_f.c b/ompi/mpi/f77/comm_test_inter_f.c index b57d41d393..988442c7a0 100644 --- a/ompi/mpi/f77/comm_test_inter_f.c +++ b/ompi/mpi/f77/comm_test_inter_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_TEST_INTER, pmpi_comm_test_inter_, pmpi_comm_test_inter__, pmpi_comm_test_inter_f, - (MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_TEST_INTER, mpi_comm_test_inter_, mpi_comm_test_inter__, mpi_comm_test_inter_f, - (MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (comm, flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_COMM_TEST_INTER, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_comm_test_inter_f(MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_comm_test_inter_f(MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_Comm c_comm = MPI_Comm_f2c (*comm); OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/file_get_atomicity_f.c b/ompi/mpi/f77/file_get_atomicity_f.c index da329cd732..ef1026a5b0 100644 --- a/ompi/mpi/f77/file_get_atomicity_f.c +++ b/ompi/mpi/f77/file_get_atomicity_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_GET_ATOMICITY, pmpi_file_get_atomicity_, pmpi_file_get_atomicity__, pmpi_file_get_atomicity_f, - (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (fh, flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ATOMICITY, mpi_file_get_atomicity_, mpi_file_get_atomicity__, mpi_file_get_atomicity_f, - (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (fh, flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_GET_ATOMICITY, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_file_get_atomicity_f(MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_file_get_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_File c_fh; OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/file_set_atomicity_f.c b/ompi/mpi/f77/file_set_atomicity_f.c index 0ba36b06a0..0f9b63298f 100644 --- a/ompi/mpi/f77/file_set_atomicity_f.c +++ b/ompi/mpi/f77/file_set_atomicity_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FILE_SET_ATOMICITY, pmpi_file_set_atomicity_, pmpi_file_set_atomicity__, pmpi_file_set_atomicity_f, - (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (fh, flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ATOMICITY, mpi_file_set_atomicity_, mpi_file_set_atomicity__, mpi_file_set_atomicity_f, - (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (fh, flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FILE_SET_ATOMICITY, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_file_set_atomicity_f(MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_file_set_atomicity_f(MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_File c_fh = MPI_File_f2c(*fh); diff --git a/ompi/mpi/f77/finalized_f.c b/ompi/mpi/f77/finalized_f.c index 52020d9431..5abff0f584 100644 --- a/ompi/mpi/f77/finalized_f.c +++ b/ompi/mpi/f77/finalized_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_FINALIZED, pmpi_finalized_, pmpi_finalized__, pmpi_finalized_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZED, mpi_finalized_, mpi_finalized__, mpi_finalized_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_FINALIZED, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_finalized_f(MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_finalized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/fint_2_int.h b/ompi/mpi/f77/fint_2_int.h index bb3b9d84ee..ecaad3f0cd 100644 --- a/ompi/mpi/f77/fint_2_int.h +++ b/ompi/mpi/f77/fint_2_int.h @@ -210,7 +210,7 @@ # if OMPI_FORTRAN_VALUE_TRUE == 1 # define OMPI_LOGICAL_2_INT(a) (int)a -# define OMPI_INT_2_LOGICAL(a) (MPI_Flogical)a +# define OMPI_INT_2_LOGICAL(a) (ompi_fortran_logical_t)a # define OMPI_SINGLE_INT_2_LOGICAL(a) *a=(OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(a))) # else # define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1) diff --git a/ompi/mpi/f77/graph_create_f.c b/ompi/mpi/f77/graph_create_f.c index 020808fee9..8ce2bf601d 100644 --- a/ompi/mpi/f77/graph_create_f.c +++ b/ompi/mpi/f77/graph_create_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_GRAPH_CREATE, pmpi_graph_create_, pmpi_graph_create__, pmpi_graph_create_f, - (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, MPI_Flogical *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr), + (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, ompi_fortran_logical_t *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr), (comm_old, nnodes, index, edges, reorder, comm_graph, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_CREATE, mpi_graph_create_, mpi_graph_create__, mpi_graph_create_f, - (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, MPI_Flogical *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr), + (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, ompi_fortran_logical_t *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr), (comm_old, nnodes, index, edges, reorder, comm_graph, ierr) ) #endif @@ -59,7 +59,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_GRAPH_CREATE, void mpi_graph_create_f(MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, - MPI_Flogical *reorder, MPI_Fint *comm_graph, + ompi_fortran_logical_t *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr) { MPI_Comm c_comm_old, c_comm_graph; diff --git a/ompi/mpi/f77/info_get_f.c b/ompi/mpi/f77/info_get_f.c index 198a049025..5046cbf9cb 100644 --- a/ompi/mpi/f77/info_get_f.c +++ b/ompi/mpi/f77/info_get_f.c @@ -35,7 +35,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INFO_GET, pmpi_info_get_, pmpi_info_get__, pmpi_info_get_f, - (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, MPI_Flogical *flag, MPI_Fint *ierr, int key_len, int value_len), + (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len, int value_len), (info, key, valuelen, value, flag, ierr, key_len, value_len) ) #endif @@ -52,7 +52,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET, mpi_info_get_, mpi_info_get__, mpi_info_get_f, - (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, MPI_Flogical *flag, MPI_Fint *ierr, int key_len, int value_len), + (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len, int value_len), (info, key, valuelen, value, flag, ierr, key_len, value_len) ) #endif @@ -69,7 +69,7 @@ static const char FUNC_NAME[] = "MPI_INFO_GET"; length of the string that we can use. */ void mpi_info_get_f(MPI_Fint *info, char *key, MPI_Fint *valuelen, - char *value, MPI_Flogical *flag, MPI_Fint *ierr, + char *value, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len, int value_len) { int c_err, ret; diff --git a/ompi/mpi/f77/info_get_valuelen_f.c b/ompi/mpi/f77/info_get_valuelen_f.c index b5fb81d74c..3d21a4c08e 100644 --- a/ompi/mpi/f77/info_get_valuelen_f.c +++ b/ompi/mpi/f77/info_get_valuelen_f.c @@ -35,7 +35,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INFO_GET_VALUELEN, pmpi_info_get_valuelen_, pmpi_info_get_valuelen__, pmpi_info_get_valuelen_f, - (MPI_Fint *info, char *key, MPI_Fint *valuelen, MPI_Flogical *flag, MPI_Fint *ierr, int key_len), + (MPI_Fint *info, char *key, MPI_Fint *valuelen, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len), (info, key, valuelen, flag, ierr, key_len) ) #endif @@ -52,7 +52,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INFO_GET_VALUELEN, mpi_info_get_valuelen_, mpi_info_get_valuelen__, mpi_info_get_valuelen_f, - (MPI_Fint *info, char *key, MPI_Fint *valuelen, MPI_Flogical *flag, MPI_Fint *ierr, int key_len), + (MPI_Fint *info, char *key, MPI_Fint *valuelen, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len), (info, key, valuelen, flag, ierr, key_len) ) #endif @@ -69,7 +69,7 @@ static const char FUNC_NAME[] = "MPI_INFO_GET_VALUELEN"; string that we can use. */ void mpi_info_get_valuelen_f(MPI_Fint *info, char *key, - MPI_Fint *valuelen, MPI_Flogical *flag, + MPI_Fint *valuelen, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len) { int c_err, ret; diff --git a/ompi/mpi/f77/initialized_f.c b/ompi/mpi/f77/initialized_f.c index 3f79191c3a..c7271f98c0 100644 --- a/ompi/mpi/f77/initialized_f.c +++ b/ompi/mpi/f77/initialized_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INITIALIZED, pmpi_initialized_, pmpi_initialized__, pmpi_initialized_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INITIALIZED, mpi_initialized_, mpi_initialized__, mpi_initialized_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INITIALIZED, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_initialized_f(MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_initialized_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { OMPI_LOGICAL_NAME_DECL(flag); *ierr = OMPI_INT_2_FINT(MPI_Initialized(OMPI_LOGICAL_SINGLE_NAME_CONVERT(flag))); diff --git a/ompi/mpi/f77/intercomm_merge_f.c b/ompi/mpi/f77/intercomm_merge_f.c index d7ef15458f..9127229d15 100644 --- a/ompi/mpi/f77/intercomm_merge_f.c +++ b/ompi/mpi/f77/intercomm_merge_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_INTERCOMM_MERGE, pmpi_intercomm_merge_, pmpi_intercomm_merge__, pmpi_intercomm_merge_f, - (MPI_Fint *intercomm, MPI_Flogical *high, MPI_Fint *newintercomm, MPI_Fint *ierr), + (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr), (intercomm, high, newintercomm, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE, mpi_intercomm_merge_, mpi_intercomm_merge__, mpi_intercomm_merge_f, - (MPI_Fint *intercomm, MPI_Flogical *high, MPI_Fint *newintercomm, MPI_Fint *ierr), + (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr), (intercomm, high, newintercomm, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_INTERCOMM_MERGE, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_intercomm_merge_f(MPI_Fint *intercomm, MPI_Flogical *high, +void mpi_intercomm_merge_f(MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintracomm, MPI_Fint *ierr) { diff --git a/ompi/mpi/f77/iprobe_f.c b/ompi/mpi/f77/iprobe_f.c index 939d259af8..fdf382b8db 100644 --- a/ompi/mpi/f77/iprobe_f.c +++ b/ompi/mpi/f77/iprobe_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_IPROBE, pmpi_iprobe_, pmpi_iprobe__, pmpi_iprobe_f, - (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (source, tag, comm, flag, status, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IPROBE, mpi_iprobe_, mpi_iprobe__, mpi_iprobe_f, - (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (source, tag, comm, flag, status, ierr) ) #endif @@ -60,7 +60,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IPROBE, #endif void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, - MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr) + ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { MPI_Status *c_status; MPI_Comm c_comm; diff --git a/ompi/mpi/f77/is_thread_main_f.c b/ompi/mpi/f77/is_thread_main_f.c index 79e3999046..03a467ccf8 100644 --- a/ompi/mpi/f77/is_thread_main_f.c +++ b/ompi/mpi/f77/is_thread_main_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_IS_THREAD_MAIN, pmpi_is_thread_main_, pmpi_is_thread_main__, pmpi_is_thread_main_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IS_THREAD_MAIN, mpi_is_thread_main_, mpi_is_thread_main__, mpi_is_thread_main_f, - (MPI_Flogical *flag, MPI_Fint *ierr), + (ompi_fortran_logical_t *flag, MPI_Fint *ierr), (flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_IS_THREAD_MAIN, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_is_thread_main_f(MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_is_thread_main_f(ompi_fortran_logical_t *flag, MPI_Fint *ierr) { OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/op_create_f.c b/ompi/mpi/f77/op_create_f.c index 9108c3e1fc..8ba9f5888b 100644 --- a/ompi/mpi/f77/op_create_f.c +++ b/ompi/mpi/f77/op_create_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_OP_CREATE, pmpi_op_create_, pmpi_op_create__, pmpi_op_create_f, - (ompi_op_fortran_handler_fn_t* function, MPI_Flogical *commute, MPI_Fint *op, MPI_Fint *ierr), + (ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *commute, MPI_Fint *op, MPI_Fint *ierr), (function, commute, op, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_CREATE, mpi_op_create_, mpi_op_create__, mpi_op_create_f, - (ompi_op_fortran_handler_fn_t* function, MPI_Flogical *commute, MPI_Fint *op, MPI_Fint *ierr), + (ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *commute, MPI_Fint *op, MPI_Fint *ierr), (function, commute, op, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_OP_CREATE, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_op_create_f(ompi_op_fortran_handler_fn_t* function, MPI_Flogical *commute, +void mpi_op_create_f(ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *commute, MPI_Fint *op, MPI_Fint *ierr) { MPI_Op c_op; diff --git a/ompi/mpi/f77/prototypes_mpi.h b/ompi/mpi/f77/prototypes_mpi.h index 119044c255..13d1226e92 100644 --- a/ompi/mpi/f77/prototypes_mpi.h +++ b/ompi/mpi/f77/prototypes_mpi.h @@ -76,7 +76,7 @@ PN(void, mpi_alltoall, MPI_ALLTOALL, (char *sendbuf, MPI_Fint *sendcount, MPI_Fi 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)); PN(void, mpi_alltoallw, MPI_ALLTOALLW, (char *sendbuf, MPI_Fint *sendcounts, MPI_Fint *sdispls, MPI_Fint *sendtypes, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *rdispls, MPI_Fint *recvtypes, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_attr_delete, MPI_ATTR_DELETE, (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *ierr)); -PN(void, mpi_attr_get, MPI_ATTR_GET, (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_attr_get, MPI_ATTR_GET, (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_attr_put, MPI_ATTR_PUT, (MPI_Fint *comm, MPI_Fint *keyval, MPI_Fint *attribute_val, MPI_Fint *ierr)); PN(void, mpi_barrier, MPI_BARRIER, (MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_bcast, MPI_BCAST, (char *buffer, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)); @@ -86,12 +86,12 @@ PN(void, mpi_buffer_attach, MPI_BUFFER_ATTACH, (char *buffer, MPI_Fint *size, MP PN(void, mpi_buffer_detach, MPI_BUFFER_DETACH, (char *buffer, MPI_Fint *size, MPI_Fint *ierr)); PN(void, mpi_cancel, MPI_CANCEL, (MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_cart_coords, MPI_CART_COORDS, (MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *maxdims, MPI_Fint *coords, MPI_Fint *ierr)); -PN(void, mpi_cart_create, MPI_CART_CREATE, (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Flogical *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr)); -PN(void, mpi_cart_get, MPI_CART_GET, (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *coords, MPI_Fint *ierr)); -PN(void, mpi_cart_map, MPI_CART_MAP, (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, MPI_Flogical *periods, MPI_Fint *newrank, MPI_Fint *ierr)); +PN(void, mpi_cart_create, MPI_CART_CREATE, (MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, ompi_fortran_logical_t *reorder, MPI_Fint *comm_cart, MPI_Fint *ierr)); +PN(void, mpi_cart_get, MPI_CART_GET, (MPI_Fint *comm, MPI_Fint *maxdims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *coords, MPI_Fint *ierr)); +PN(void, mpi_cart_map, MPI_CART_MAP, (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims, ompi_fortran_logical_t *periods, MPI_Fint *newrank, MPI_Fint *ierr)); PN(void, mpi_cart_rank, MPI_CART_RANK, (MPI_Fint *comm, MPI_Fint *coords, MPI_Fint *rank, MPI_Fint *ierr)); PN(void, mpi_cart_shift, MPI_CART_SHIFT, (MPI_Fint *comm, MPI_Fint *direction, MPI_Fint *disp, MPI_Fint *rank_source, MPI_Fint *rank_dest, MPI_Fint *ierr)); -PN(void, mpi_cart_sub, MPI_CART_SUB, (MPI_Fint *comm, MPI_Flogical *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr)); +PN(void, mpi_cart_sub, MPI_CART_SUB, (MPI_Fint *comm, ompi_fortran_logical_t *remain_dims, MPI_Fint *new_comm, MPI_Fint *ierr)); PN(void, mpi_cartdim_get, MPI_CARTDIM_GET, (MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *ierr)); PN(void, mpi_close_port, MPI_CLOSE_PORT, (char *port_name, MPI_Fint *ierr, int port_name_len)); PN(void, mpi_comm_accept, MPI_COMM_ACCEPT, (char *port_name, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr, int port_name_len)); @@ -106,7 +106,7 @@ PN(void, mpi_comm_disconnect, MPI_COMM_DISCONNECT, (MPI_Fint *comm, MPI_Fint *ie PN(void, mpi_comm_dup, MPI_COMM_DUP, (MPI_Fint *comm, MPI_Fint *newcomm, MPI_Fint *ierr)); PN(void, mpi_comm_free_keyval, MPI_COMM_FREE_KEYVAL, (MPI_Fint *comm_keyval, MPI_Fint *ierr)); PN(void, mpi_comm_free, MPI_COMM_FREE, (MPI_Fint *comm, MPI_Fint *ierr)); -PN(void, mpi_comm_get_attr, MPI_COMM_GET_ATTR, (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_comm_get_attr, MPI_COMM_GET_ATTR, (MPI_Fint *comm, MPI_Fint *comm_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_comm_get_errhandler, MPI_COMM_GET_ERRHANDLER, (MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr)); PN(void, mpi_comm_get_name, MPI_COMM_GET_NAME, (MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len)); PN(void, mpi_comm_get_parent, MPI_COMM_GET_PARENT, (MPI_Fint *parent, MPI_Fint *ierr)); @@ -122,7 +122,7 @@ PN(void, mpi_comm_size, MPI_COMM_SIZE, (MPI_Fint *comm, MPI_Fint *size, MPI_Fint PN(void, mpi_comm_spawn, MPI_COMM_SPAWN, (char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int command_len, int argv_len)); PN(void, mpi_comm_spawn_multiple, MPI_COMM_SPAWN_MULTIPLE, (MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len)); PN(void, mpi_comm_split, MPI_COMM_SPLIT, (MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr)); -PN(void, mpi_comm_test_inter, MPI_COMM_TEST_INTER, (MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_comm_test_inter, MPI_COMM_TEST_INTER, (MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_dims_create, MPI_DIMS_CREATE, (MPI_Fint *nnodes, MPI_Fint *ndims, MPI_Fint *dims, MPI_Fint *ierr)); PN(void, mpi_errhandler_create, MPI_ERRHANDLER_CREATE, (ompi_errhandler_fortran_handler_fn_t* function, MPI_Fint *errhandler, MPI_Fint *ierr)); PN(void, mpi_errhandler_free, MPI_ERRHANDLER_FREE, (MPI_Fint *errhandler, MPI_Fint *ierr)); @@ -183,11 +183,11 @@ PN(void, mpi_file_read_ordered_end, MPI_FILE_READ_ORDERED_END, (MPI_Fint *fh, ch PN(void, mpi_file_write_ordered_begin, MPI_FILE_WRITE_ORDERED_BEGIN, (MPI_Fint *fh, char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr)); PN(void, mpi_file_write_ordered_end, MPI_FILE_WRITE_ORDERED_END, (MPI_Fint *fh, char *buf, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_file_get_type_extent, MPI_FILE_GET_TYPE_EXTENT, (MPI_Fint *fh, MPI_Fint *datatype, MPI_Aint *extent, MPI_Fint *ierr)); -PN(void, mpi_file_set_atomicity, MPI_FILE_SET_ATOMICITY, (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr)); -PN(void, mpi_file_get_atomicity, MPI_FILE_GET_ATOMICITY, (MPI_Fint *fh, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_file_set_atomicity, MPI_FILE_SET_ATOMICITY, (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); +PN(void, mpi_file_get_atomicity, MPI_FILE_GET_ATOMICITY, (MPI_Fint *fh, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_file_sync, MPI_FILE_SYNC, (MPI_Fint *fh, MPI_Fint *ierr)); PN(void, mpi_finalize, MPI_FINALIZE, (MPI_Fint *ierr)); -PN(void, mpi_finalized, MPI_FINALIZED, (MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_finalized, MPI_FINALIZED, (ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_free_mem, MPI_FREE_MEM, (char *base, MPI_Fint *ierr)); PN(void, mpi_gather, MPI_GATHER, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcount, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_gatherv, MPI_GATHERV, (char *sendbuf, MPI_Fint *sendcount, MPI_Fint *sendtype, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *displs, MPI_Fint *recvtype, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *ierr)); @@ -197,7 +197,7 @@ PN(void, mpi_get_elements, MPI_GET_ELEMENTS, (MPI_Fint *status, MPI_Fint *dataty 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)); +PN(void, mpi_graph_create, MPI_GRAPH_CREATE, (MPI_Fint *comm_old, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, ompi_fortran_logical_t *reorder, MPI_Fint *comm_graph, MPI_Fint *ierr)); PN(void, mpi_graph_get, MPI_GRAPH_GET, (MPI_Fint *comm, MPI_Fint *maxindex, MPI_Fint *maxedges, MPI_Fint *index, MPI_Fint *edges, MPI_Fint *ierr)); PN(void, mpi_graph_map, MPI_GRAPH_MAP, (MPI_Fint *comm, MPI_Fint *nnodes, MPI_Fint *index, MPI_Fint *edges, MPI_Fint *newrank, MPI_Fint *ierr)); PN(void, mpi_graph_neighbors_count, MPI_GRAPH_NEIGHBORS_COUNT, (MPI_Fint *comm, MPI_Fint *rank, MPI_Fint *nneighbors, MPI_Fint *ierr)); @@ -222,26 +222,26 @@ PN(void, mpi_info_create, MPI_INFO_CREATE, (MPI_Fint *info, MPI_Fint *ierr)); PN(void, mpi_info_delete, MPI_INFO_DELETE, (MPI_Fint *info, char *key, MPI_Fint *ierr, int key_len)); PN(void, mpi_info_dup, MPI_INFO_DUP, (MPI_Fint *info, MPI_Fint *newinfo, MPI_Fint *ierr)); PN(void, mpi_info_free, MPI_INFO_FREE, (MPI_Fint *info, MPI_Fint *ierr)); -PN(void, mpi_info_get, MPI_INFO_GET, (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, MPI_Flogical *flag, MPI_Fint *ierr, int key_len, int value_len)); +PN(void, mpi_info_get, MPI_INFO_GET, (MPI_Fint *info, char *key, MPI_Fint *valuelen, char *value, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len, int value_len)); PN(void, mpi_info_get_nkeys, MPI_INFO_GET_NKEYS, (MPI_Fint *info, MPI_Fint *nkeys, MPI_Fint *ierr)); PN(void, mpi_info_get_nthkey, MPI_INFO_GET_NTHKEY, (MPI_Fint *info, MPI_Fint *n, char *key, MPI_Fint *ierr, int key_len)); -PN(void, mpi_info_get_valuelen, MPI_INFO_GET_VALUELEN, (MPI_Fint *info, char *key, MPI_Fint *valuelen, MPI_Flogical *flag, MPI_Fint *ierr, int key_len)); +PN(void, mpi_info_get_valuelen, MPI_INFO_GET_VALUELEN, (MPI_Fint *info, char *key, MPI_Fint *valuelen, ompi_fortran_logical_t *flag, MPI_Fint *ierr, int key_len)); PN(void, mpi_info_set, MPI_INFO_SET, (MPI_Fint *info, char *key, char *value, MPI_Fint *ierr, int key_len, int value_len)); PN(void, mpi_init, MPI_INIT, (MPI_Fint *ierr)); -PN(void, mpi_initialized, MPI_INITIALIZED, (MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_initialized, MPI_INITIALIZED, (ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_init_thread, MPI_INIT_THREAD, (MPI_Fint *required, MPI_Fint *provided, MPI_Fint *ierr)); PN(void, mpi_intercomm_create, MPI_INTERCOMM_CREATE, (MPI_Fint *local_comm, MPI_Fint *local_leader, MPI_Fint *bridge_comm, MPI_Fint *remote_leader, MPI_Fint *tag, MPI_Fint *newintercomm, MPI_Fint *ierr)); -PN(void, mpi_intercomm_merge, MPI_INTERCOMM_MERGE, (MPI_Fint *intercomm, MPI_Flogical *high, MPI_Fint *newintercomm, MPI_Fint *ierr)); -PN(void, mpi_iprobe, MPI_IPROBE, (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr)); +PN(void, mpi_intercomm_merge, MPI_INTERCOMM_MERGE, (MPI_Fint *intercomm, ompi_fortran_logical_t *high, MPI_Fint *newintercomm, MPI_Fint *ierr)); +PN(void, mpi_iprobe, MPI_IPROBE, (MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_irecv, MPI_IRECV, (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_irsend, MPI_IRSEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_isend, MPI_ISEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_issend, MPI_ISSEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); -PN(void, mpi_is_thread_main, MPI_IS_THREAD_MAIN, (MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_is_thread_main, MPI_IS_THREAD_MAIN, (ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_keyval_create, MPI_KEYVAL_CREATE, (ompi_mpi1_fortran_copy_attr_function* copy_fn, ompi_mpi1_fortran_delete_attr_function* delete_fn, MPI_Fint *keyval, MPI_Fint *extra_state, MPI_Fint *ierr)); PN(void, mpi_keyval_free, MPI_KEYVAL_FREE, (MPI_Fint *keyval, MPI_Fint *ierr)); PN(void, mpi_lookup_name, MPI_LOOKUP_NAME, (char *service_name, MPI_Fint *info, char *port_name, MPI_Fint *ierr, int service_name_len, int port_name_len)); -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_op_create, MPI_OP_CREATE, (ompi_op_fortran_handler_fn_t* function, ompi_fortran_logical_t *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_Aint *outsize, MPI_Aint *position, MPI_Fint *ierr)); @@ -260,7 +260,7 @@ PN(void, mpi_reduce_local, MPI_REDUCE_LOCAL, (char *inbuf, char *inoutbuf, MPI_F PN(void, mpi_reduce_scatter, MPI_REDUCE_SCATTER, (char *sendbuf, char *recvbuf, MPI_Fint *recvcounts, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_register_datarep, MPI_REGISTER_DATAREP, (char *datarep, ompi_mpi2_fortran_datarep_conversion_fn_t *read_conversion_fn, ompi_mpi2_fortran_datarep_conversion_fn_t *write_conversion_fn, ompi_mpi2_fortran_datarep_extent_fn_t *dtype_file_extent_fn, MPI_Aint *extra_state, MPI_Fint *ierr, int datarep_len)); PN(void, mpi_request_free, MPI_REQUEST_FREE, (MPI_Fint *request, MPI_Fint *ierr)); -PN(void, mpi_request_get_status, MPI_REQUEST_GET_STATUS, (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr)); +PN(void, mpi_request_get_status, MPI_REQUEST_GET_STATUS, (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_rsend, MPI_RSEND, (char *ibuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_rsend_init, MPI_RSEND_INIT, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_scan, MPI_SCAN, (char *sendbuf, char *recvbuf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *op, MPI_Fint *comm, MPI_Fint *ierr)); @@ -274,12 +274,12 @@ PN(void, mpi_ssend_init, MPI_SSEND_INIT, (char *buf, MPI_Fint *count, MPI_Fint * PN(void, mpi_ssend, MPI_SSEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)); PN(void, mpi_start, MPI_START, (MPI_Fint *request, MPI_Fint *ierr)); PN(void, mpi_startall, MPI_STARTALL, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *ierr)); -PN(void, mpi_status_set_cancelled, MPI_STATUS_SET_CANCELLED, (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_status_set_cancelled, MPI_STATUS_SET_CANCELLED, (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_status_set_elements, MPI_STATUS_SET_ELEMENTS, (MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)); -PN(void, mpi_testall, MPI_TESTALL, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Flogical *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr)); -PN(void, mpi_testany, MPI_TESTANY, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr)); -PN(void, mpi_test, MPI_TEST, (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr)); -PN(void, mpi_test_cancelled, MPI_TEST_CANCELLED, (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_testall, MPI_TESTALL, (MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_logical_t *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr)); +PN(void, mpi_testany, MPI_TESTANY, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr)); +PN(void, mpi_test, MPI_TEST, (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr)); +PN(void, mpi_test_cancelled, MPI_TEST_CANCELLED, (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_testsome, MPI_TESTSOME, (MPI_Fint *incount, MPI_Fint *array_of_requests, MPI_Fint *outcount, MPI_Fint *array_of_indices, MPI_Fint *array_of_statuses, MPI_Fint *ierr)); PN(void, mpi_topo_test, MPI_TOPO_TEST, (MPI_Fint *comm, MPI_Fint *status, MPI_Fint *ierr)); PN(void, mpi_type_commit, MPI_TYPE_COMMIT, (MPI_Fint *type, MPI_Fint *ierr)); @@ -300,7 +300,7 @@ PN(void, mpi_type_dup, MPI_TYPE_DUP, (MPI_Fint *type, MPI_Fint *newtype, MPI_Fin PN(void, mpi_type_extent, MPI_TYPE_EXTENT, (MPI_Fint *type, MPI_Fint *extent, MPI_Fint *ierr)); PN(void, mpi_type_free, MPI_TYPE_FREE, (MPI_Fint *type, MPI_Fint *ierr)); PN(void, mpi_type_free_keyval, MPI_TYPE_FREE_KEYVAL, (MPI_Fint *type_keyval, MPI_Fint *ierr)); -PN(void, mpi_type_get_attr, MPI_TYPE_GET_ATTR, (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_type_get_attr, MPI_TYPE_GET_ATTR, (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_type_get_contents, MPI_TYPE_GET_CONTENTS, (MPI_Fint *mtype, MPI_Fint *max_integers, MPI_Fint *max_addresses, MPI_Fint *max_datatypes, MPI_Fint *array_of_integers, MPI_Aint *array_of_addresses, MPI_Fint *array_of_datatypes, MPI_Fint *ierr)); PN(void, mpi_type_get_envelope, MPI_TYPE_GET_ENVELOPE, (MPI_Fint *type, MPI_Fint *num_integers, MPI_Fint *num_addresses, MPI_Fint *num_datatypes, MPI_Fint *combiner, MPI_Fint *ierr)); PN(void, mpi_type_get_extent, MPI_TYPE_GET_EXTENT, (MPI_Fint *type, MPI_Aint *lb, MPI_Aint *extent, MPI_Fint *ierr)); @@ -333,7 +333,7 @@ PN(void, mpi_win_delete_attr, MPI_WIN_DELETE_ATTR, (MPI_Fint *win, MPI_Fint *win PN(void, mpi_win_fence, MPI_WIN_FENCE, (MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_win_free, MPI_WIN_FREE, (MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_win_free_keyval, MPI_WIN_FREE_KEYVAL, (MPI_Fint *win_keyval, MPI_Fint *ierr)); -PN(void, mpi_win_get_attr, MPI_WIN_GET_ATTR, (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_win_get_attr, MPI_WIN_GET_ATTR, (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_win_get_errhandler, MPI_WIN_GET_ERRHANDLER, (MPI_Fint *win, MPI_Fint *errhandler, MPI_Fint *ierr)); PN(void, mpi_win_get_group, MPI_WIN_GET_GROUP, (MPI_Fint *win, MPI_Fint *group, MPI_Fint *ierr)); PN(void, mpi_win_get_name, MPI_WIN_GET_NAME, (MPI_Fint *win, char *win_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len)); @@ -343,23 +343,23 @@ PN(void, mpi_win_set_attr, MPI_WIN_SET_ATTR, (MPI_Fint *win, MPI_Fint *win_keyva PN(void, mpi_win_set_errhandler, MPI_WIN_SET_ERRHANDLER, (MPI_Fint *win, MPI_Fint *errhandler, MPI_Fint *ierr)); PN(void, mpi_win_set_name, MPI_WIN_SET_NAME, (MPI_Fint *win, char *win_name, MPI_Fint *ierr, int name_len)); PN(void, mpi_win_start, MPI_WIN_START, (MPI_Fint *group, MPI_Fint *assert, MPI_Fint *win, MPI_Fint *ierr)); -PN(void, mpi_win_test, MPI_WIN_TEST, (MPI_Fint *win, MPI_Flogical *flag, MPI_Fint *ierr)); +PN(void, mpi_win_test, MPI_WIN_TEST, (MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN(void, mpi_win_unlock, MPI_WIN_UNLOCK, (MPI_Fint *rank, MPI_Fint *win, MPI_Fint *ierr)); PN(void, mpi_win_wait, MPI_WIN_WAIT, (MPI_Fint *win, MPI_Fint *ierr)); PN(double, mpi_wtick, MPI_WTICK, (void)); PN(double, mpi_wtime, MPI_WTIME, (void)); PN(void, mpi_type_null_delete_fn, MPI_TYPE_NULL_DELETE_FN, (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* attribute_val_out, MPI_Aint* extra_state, MPI_Fint* ierr)); -PN(void, mpi_type_null_copy_fn, MPI_TYPE_NULL_COPY_FN, (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); -PN(void, mpi_type_dup_fn, MPI_TYPE_DUP_FN, (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); -PN(void, mpi_win_dup_fn, MPI_WIN_DUP_FN, (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); -PN(void, mpi_win_null_copy_fn, MPI_WIN_NULL_COPY_FN, (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); +PN(void, mpi_type_null_copy_fn, MPI_TYPE_NULL_COPY_FN, (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); +PN(void, mpi_type_dup_fn, MPI_TYPE_DUP_FN, (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); +PN(void, mpi_win_dup_fn, MPI_WIN_DUP_FN, (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); +PN(void, mpi_win_null_copy_fn, MPI_WIN_NULL_COPY_FN, (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); PN(void, mpi_win_null_delete_fn, MPI_WIN_NULL_DELETE_FN, (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* attribute_val_out, MPI_Aint* extra_state, MPI_Fint* ierr)); PN(void, mpi_null_delete_fn, MPI_NULL_DELETE_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* attribute_val_out, MPI_Fint* extra_state, MPI_Fint* ierr)); -PN(void, mpi_null_copy_fn, MPI_NULL_COPY_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); -PN(void, mpi_dup_fn, MPI_DUP_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); +PN(void, mpi_null_copy_fn, MPI_NULL_COPY_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); +PN(void, mpi_dup_fn, MPI_DUP_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); PN(void, mpi_comm_null_delete_fn, MPI_COMM_NULL_DELETE_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* attribute_val_out, MPI_Aint* extra_state, MPI_Fint* ierr)); -PN(void, mpi_comm_null_copy_fn, MPI_COMM_NULL_COPY_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); -PN(void, mpi_comm_dup_fn, MPI_COMM_DUP_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical * flag, MPI_Fint* ierr)); +PN(void, mpi_comm_null_copy_fn, MPI_COMM_NULL_COPY_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); +PN(void, mpi_comm_dup_fn, MPI_COMM_DUP_FN, (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t * flag, MPI_Fint* ierr)); #endif diff --git a/ompi/mpi/f77/request_get_status_f.c b/ompi/mpi/f77/request_get_status_f.c index 73619fde85..70ba8309e9 100644 --- a/ompi/mpi/f77/request_get_status_f.c +++ b/ompi/mpi/f77/request_get_status_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_REQUEST_GET_STATUS, pmpi_request_get_status_, pmpi_request_get_status__, pmpi_request_get_status_f, - (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (request, flag, status, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_GET_STATUS, mpi_request_get_status_, mpi_request_get_status__, mpi_request_get_status_f, - (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (request, flag, status, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_REQUEST_GET_STATUS, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_request_get_status_f(MPI_Fint *request, MPI_Flogical *flag, +void mpi_request_get_status_f(MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { MPI_Status c_status; diff --git a/ompi/mpi/f77/status_set_cancelled_f.c b/ompi/mpi/f77/status_set_cancelled_f.c index c24fc5151c..80703d7ff3 100644 --- a/ompi/mpi/f77/status_set_cancelled_f.c +++ b/ompi/mpi/f77/status_set_cancelled_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_STATUS_SET_CANCELLED, pmpi_status_set_cancelled_, pmpi_status_set_cancelled__, pmpi_status_set_cancelled_f, - (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (status, flag, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_CANCELLED, mpi_status_set_cancelled_, mpi_status_set_cancelled__, mpi_status_set_cancelled_f, - (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (status, flag, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_STATUS_SET_CANCELLED, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_status_set_cancelled_f(MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_status_set_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_Status c_status; diff --git a/ompi/mpi/f77/test_cancelled_f.c b/ompi/mpi/f77/test_cancelled_f.c index 4feaf308a6..3c53da8864 100644 --- a/ompi/mpi/f77/test_cancelled_f.c +++ b/ompi/mpi/f77/test_cancelled_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_TEST_CANCELLED, pmpi_test_cancelled_, pmpi_test_cancelled__, pmpi_test_cancelled_f, - (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (status, flag, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST_CANCELLED, mpi_test_cancelled_, mpi_test_cancelled__, mpi_test_cancelled_f, - (MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (status, flag, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST_CANCELLED, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_test_cancelled_f(MPI_Fint *status, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_test_cancelled_f(MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_Status c_status; OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/mpi/f77/test_f.c b/ompi/mpi/f77/test_f.c index e911b2b457..0b65ac4feb 100644 --- a/ompi/mpi/f77/test_f.c +++ b/ompi/mpi/f77/test_f.c @@ -32,7 +32,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_TEST, pmpi_test_, pmpi_test__, pmpi_test_f, - (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (request, flag, status, ierr) ) #endif @@ -49,7 +49,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST, mpi_test_, mpi_test__, mpi_test_f, - (MPI_Fint *request, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (request, flag, status, ierr) ) #endif @@ -58,7 +58,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TEST, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_test_f(MPI_Fint *request, MPI_Flogical *flag, +void mpi_test_f(MPI_Fint *request, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { MPI_Request c_req = MPI_Request_f2c(*request); diff --git a/ompi/mpi/f77/testall_f.c b/ompi/mpi/f77/testall_f.c index 318b7a9b4b..4a3084be7f 100644 --- a/ompi/mpi/f77/testall_f.c +++ b/ompi/mpi/f77/testall_f.c @@ -34,7 +34,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_TESTALL, pmpi_testall_, pmpi_testall__, pmpi_testall_f, - (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Flogical *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr), + (MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_logical_t *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr), (count, array_of_requests, flag, array_of_statuses, ierr) ) #endif @@ -51,7 +51,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTALL, mpi_testall_, mpi_testall__, mpi_testall_f, - (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Flogical *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr), + (MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_logical_t *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr), (count, array_of_requests, flag, array_of_statuses, ierr) ) #endif @@ -62,7 +62,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTALL, static const char FUNC_NAME[] = "MPI_TESTALL"; -void mpi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Flogical *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr) +void mpi_testall_f(MPI_Fint *count, MPI_Fint *array_of_requests, ompi_fortran_logical_t *flag, MPI_Fint *array_of_statuses, MPI_Fint *ierr) { MPI_Request *c_req; MPI_Status *c_status; diff --git a/ompi/mpi/f77/testany_f.c b/ompi/mpi/f77/testany_f.c index 07f9cfe2e3..c671932e7f 100644 --- a/ompi/mpi/f77/testany_f.c +++ b/ompi/mpi/f77/testany_f.c @@ -34,7 +34,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_TESTANY, pmpi_testany_, pmpi_testany__, pmpi_testany_f, - (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (count, array_of_requests, index, flag, status, ierr) ) #endif @@ -51,7 +51,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTANY, mpi_testany_, mpi_testany__, mpi_testany_f, - (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr), + (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr), (count, array_of_requests, index, flag, status, ierr) ) #endif @@ -63,7 +63,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TESTANY, static const char FUNC_NAME[] = "MPI_TESTANY"; -void mpi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, MPI_Flogical *flag, MPI_Fint *status, MPI_Fint *ierr) +void mpi_testany_f(MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *index, ompi_fortran_logical_t *flag, MPI_Fint *status, MPI_Fint *ierr) { MPI_Request *c_req; MPI_Status c_status; diff --git a/ompi/mpi/f77/type_get_attr_f.c b/ompi/mpi/f77/type_get_attr_f.c index 8494699232..5b0f4bd79d 100644 --- a/ompi/mpi/f77/type_get_attr_f.c +++ b/ompi/mpi/f77/type_get_attr_f.c @@ -34,7 +34,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_TYPE_GET_ATTR, pmpi_type_get_attr_, pmpi_type_get_attr__, pmpi_type_get_attr_f, - (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (type, type_keyval, attribute_val, flag, ierr) ) #endif @@ -51,7 +51,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ATTR, mpi_type_get_attr_, mpi_type_get_attr__, mpi_type_get_attr_f, - (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *type, MPI_Fint *type_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (type, type_keyval, attribute_val, flag, ierr) ) #endif @@ -61,7 +61,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_TYPE_GET_ATTR, #endif void mpi_type_get_attr_f(MPI_Fint *type, MPI_Fint *type_keyval, - MPI_Aint *attribute_val, MPI_Flogical *flag, + MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_err; diff --git a/ompi/mpi/f77/win_get_attr_f.c b/ompi/mpi/f77/win_get_attr_f.c index c1a37e5927..e2b3699e59 100644 --- a/ompi/mpi/f77/win_get_attr_f.c +++ b/ompi/mpi/f77/win_get_attr_f.c @@ -33,7 +33,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WIN_GET_ATTR, pmpi_win_get_attr_, pmpi_win_get_attr__, pmpi_win_get_attr_f, - (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (win, win_keyval, attribute_val, flag, ierr) ) #endif @@ -50,7 +50,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ATTR, mpi_win_get_attr_, mpi_win_get_attr__, mpi_win_get_attr_f, - (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *win, MPI_Fint *win_keyval, MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (win, win_keyval, attribute_val, flag, ierr) ) #endif @@ -60,7 +60,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_GET_ATTR, #endif void mpi_win_get_attr_f(MPI_Fint *win, MPI_Fint *win_keyval, - MPI_Aint *attribute_val, MPI_Flogical *flag, MPI_Fint *ierr) + MPI_Aint *attribute_val, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { int c_err; MPI_Win c_win = MPI_Win_f2c(*win); diff --git a/ompi/mpi/f77/win_test_f.c b/ompi/mpi/f77/win_test_f.c index 4c0757a747..d2adb3f839 100644 --- a/ompi/mpi/f77/win_test_f.c +++ b/ompi/mpi/f77/win_test_f.c @@ -31,7 +31,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WIN_TEST, pmpi_win_test_, pmpi_win_test__, pmpi_win_test_f, - (MPI_Fint *win, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (win, flag, ierr) ) #endif @@ -48,7 +48,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_TEST, mpi_win_test_, mpi_win_test__, mpi_win_test_f, - (MPI_Fint *win, MPI_Flogical *flag, MPI_Fint *ierr), + (MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr), (win, flag, ierr) ) #endif @@ -57,7 +57,7 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WIN_TEST, #include "ompi/mpi/f77/profile/defines.h" #endif -void mpi_win_test_f(MPI_Fint *win, MPI_Flogical *flag, MPI_Fint *ierr) +void mpi_win_test_f(MPI_Fint *win, ompi_fortran_logical_t *flag, MPI_Fint *ierr) { MPI_Win c_win = MPI_Win_f2c(*win); OMPI_LOGICAL_NAME_DECL(flag); diff --git a/ompi/request/grequest.c b/ompi/request/grequest.c index 9af6433716..aafbc3ff55 100644 --- a/ompi/request/grequest.c +++ b/ompi/request/grequest.c @@ -45,7 +45,7 @@ static int ompi_grequest_cancel(ompi_request_t* req, int flag) { int rc = OMPI_SUCCESS; MPI_Fint ierr; - MPI_Flogical fflag; + ompi_fortran_logical_t fflag; ompi_grequest_t* greq = (ompi_grequest_t*)req; if (greq->greq_cancel.c_cancel != NULL) { @@ -53,7 +53,7 @@ static int ompi_grequest_cancel(ompi_request_t* req, int flag) rc = greq->greq_cancel.c_cancel(greq->greq_state, greq->greq_base.req_complete); } else { - fflag = (MPI_Flogical) greq->greq_base.req_complete; + fflag = (ompi_fortran_logical_t) greq->greq_base.req_complete; greq->greq_cancel.f_cancel((MPI_Aint*)greq->greq_state, &fflag, &ierr); rc = OMPI_FINT_2_INT(ierr); } diff --git a/ompi/request/grequest.h b/ompi/request/grequest.h index 31b0c57abc..e0072ec3f6 100644 --- a/ompi/request/grequest.h +++ b/ompi/request/grequest.h @@ -43,7 +43,7 @@ typedef void (MPI_F_Grequest_free_function)(MPI_Aint *extra_state, * Fortran type for generalized request cancel function */ typedef void (MPI_F_Grequest_cancel_function)(MPI_Aint *extra_state, - MPI_Flogical *complete, + ompi_fortran_logical_t *complete, MPI_Fint *ierr); /**