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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210311 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 447ed7832491f0126017711701cc671ed9bf4c36..182563cb84851c47fe23691700320e9fbe9df4bc 100644 (file)
--- 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 5dd5d2aa2929dbda074c8ee48bbd98cfc736e531..3972ed36455f3447cc93ccc953d7b453641a5d31 100644 (file)
--- 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 1b17c28c1c14128fdc0aa3d3eb5d6a3a7d0f255d..709225c3bd10d69584bd5b4563628d56b817bb8e 100644 (file)
--- 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 f60eebc7b802c1face62cf3cd60268b4790b5dee..1c01f9f09b3982350b30cbf0767e65698a858a1d 100644 (file)
--- 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 fe2baf4633caa4b981e814dccd9e41acc101298c..8d8c7de21a94d21352b9e243f7a49d38e7016ab7 100644 (file)
--- 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 b8833275d62c3d5ecf870757bc5d652802499720..521c93c34b0f61f67aaef9b21712a2fabada44db 100644 (file)
--- 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;
 }