diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-05-11 20:25:55 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-05-11 20:25:55 +0200 |
| commit | a9fe68774e1d00071bb528d40f1bc2caf61c2e39 (patch) | |
| tree | 269d35f8e79cb0c4b6e9b8322976743b544fef94 | |
| parent | 3af89f8bdff9b012a3737c6b6dd5d7cd2de1a1b8 (diff) | |
| download | gcc-a9fe68774e1d00071bb528d40f1bc2caf61c2e39.zip gcc-a9fe68774e1d00071bb528d40f1bc2caf61c2e39.tar.gz gcc-a9fe68774e1d00071bb528d40f1bc2caf61c2e39.tar.bz2 | |
trans-intrinsic.c (gfc_build_builtin_function_decls): Change type of second argument to int.
2014-05-11 Tobias Burnus <burnus@net-b.de>
* trans-intrinsic.c (gfc_build_builtin_function_decls):
Change type of second argument to int.
2014-05-11 Tobias Burnus <burnus@net-b.de>
* caf/libcaf.h (_gfortran_caf_num_images): Change type of
second argument to int.
* caf/mpi.c (_gfortran_caf_num_images): Ditto.
* caf/single.c (_gfortran_caf_num_images): Ditto.
From-SVN: r210311
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 2 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 7 | ||||
| -rw-r--r-- | libgfortran/caf/libcaf.h | 2 | ||||
| -rw-r--r-- | libgfortran/caf/mpi.c | 2 | ||||
| -rw-r--r-- | libgfortran/caf/single.c | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 447ed78..182563c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-05-11 Tobias Burnus <burnus@net-b.de> + + * trans-intrinsic.c (gfc_build_builtin_function_decls): + Change type of second argument to int. + 2014-05-09 Mike Stump <mikestump@comcast.net> PR fortran/61109 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 5dd5d2a..3972ed3 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -3264,7 +3264,7 @@ gfc_build_builtin_function_decls (void) gfor_fndecl_caf_num_images = gfc_build_library_function_decl ( get_identifier (PREFIX("caf_num_images")), integer_type_node, - 2, integer_type_node, boolean_type_node); + 2, integer_type_node, integer_type_node); gfor_fndecl_caf_register = gfc_build_library_function_decl_with_spec ( get_identifier (PREFIX("caf_register")), "...WWW", pvoid_type_node, 6, diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 1b17c28..709225c 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2014-05-11 Tobias Burnus <burnus@net-b.de> + + * caf/libcaf.h (_gfortran_caf_num_images): Change type of + second argument to int. + * caf/mpi.c (_gfortran_caf_num_images): Ditto. + * caf/single.c (_gfortran_caf_num_images): Ditto. + 2014-05-08 Tobias Burnus <burnus@net-b.de> * caf/libcaf.h (caf_vector_t, _gfortran_caf_co_sum, diff --git a/libgfortran/caf/libcaf.h b/libgfortran/caf/libcaf.h index f60eebc..1c01f9f 100644 --- a/libgfortran/caf/libcaf.h +++ b/libgfortran/caf/libcaf.h @@ -81,7 +81,7 @@ void _gfortran_caf_init (int *, char ***); void _gfortran_caf_finalize (void); int _gfortran_caf_this_image (int); -int _gfortran_caf_num_images (int, bool); +int _gfortran_caf_num_images (int, int); void *_gfortran_caf_register (size_t, caf_register_t, caf_token_t *, int *, char *, int); diff --git a/libgfortran/caf/mpi.c b/libgfortran/caf/mpi.c index fe2baf4..8d8c7de 100644 --- a/libgfortran/caf/mpi.c +++ b/libgfortran/caf/mpi.c @@ -123,7 +123,7 @@ _gfortran_caf_this_image (int distance __attribute__ ((unused))) int _gfortran_caf_num_images (int distance __attribute__ ((unused)), - bool failed __attribute__ ((unused))) + int failed __attribute__ ((unused))) { return caf_num_images; } diff --git a/libgfortran/caf/single.c b/libgfortran/caf/single.c index b883327..521c93c 100644 --- a/libgfortran/caf/single.c +++ b/libgfortran/caf/single.c @@ -87,7 +87,7 @@ _gfortran_caf_this_image (int distance __attribute__ ((unused))) int _gfortran_caf_num_images (int distance __attribute__ ((unused)), - bool failed __attribute__ ((unused))) + int failed __attribute__ ((unused))) { return 1; } |