Skip to content

Commit a9a8836

Browse files
committed
SQUASHME: Suggestions and fixes:
Make the C and Fortran types agree in effective size, even if some of the Fortran types are multi-dimension, they always are actually a single element in size. Signed-off-by: Jeff Squyres <[email protected]>
1 parent f5da714 commit a9a8836

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ompi/mpi/fortran/base/gen-mpi-mangling.pl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2015 Research Organization for Information Science
44
# and Technology (RIST). All rights reserved.
5-
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
5+
# Copyright (c) 2015-2020 Cisco Systems, Inc. All rights reserved.
66
# $COPYRIGHT$
77
#
88
# Subroutine to generate a bunch of Fortran declarations and symbols
@@ -62,35 +62,35 @@
6262
f_name => "MPI_IN_PLACE",
6363
};
6464
$fortran->{unweighted} = {
65-
c_type => "int *",
65+
c_type => "int",
6666
c_name => "mpi_fortran_unweighted",
67-
f_type => "integer, dimension(2)",
67+
f_type => "integer, dimension(1)",
6868
f_name => "MPI_UNWEIGHTED",
6969
};
7070
$fortran->{weights_empty} = {
71-
c_type => "int *",
71+
c_type => "int",
7272
c_name => "mpi_fortran_weights_empty",
73-
f_type => "integer, dimension(2)",
73+
f_type => "integer, dimension(1)",
7474
f_name => "MPI_WEIGHTS_EMPTY",
7575
};
7676

7777
$fortran->{argv_null} = {
78-
c_type => "char *",
78+
c_type => "char",
7979
c_name => "mpi_fortran_argv_null",
80-
f_type => "character, dimension(8)",
80+
f_type => "character, dimension(1)",
8181
f_name => "MPI_ARGV_NULL",
8282
};
8383
$fortran->{argvs_null} = {
84-
c_type => "char *",
84+
c_type => "char",
8585
c_name => "mpi_fortran_argvs_null",
86-
f_type => "character, dimension(1, 8)",
86+
f_type => "character, dimension(1, 1)",
8787
f_name => "MPI_ARGVS_NULL",
8888
};
8989

9090
$fortran->{errcodes_ignore} = {
91-
c_type => "int *",
91+
c_type => "int",
9292
c_name => "mpi_fortran_errcodes_ignore",
93-
f_type => "integer, dimension(2)",
93+
f_type => "integer, dimension(1)",
9494
f_name => "MPI_ERRCODES_IGNORE",
9595
};
9696
$fortran->{status_ignore} = {

0 commit comments

Comments
 (0)