summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-11 18:25:55 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-11 18:25:55 +0000
commitda82fa7cb78a7833d38f6b122f7b1c871ad45920 (patch)
tree269d35f8e79cb0c4b6e9b8322976743b544fef94 /libgfortran
parentb3096d437157c3ff9b01315e48eeab7e736bbac0 (diff)
downloadgcc-da82fa7cb78a7833d38f6b122f7b1c871ad45920.tar.gz
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
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog7
-rw-r--r--libgfortran/caf/libcaf.h2
-rw-r--r--libgfortran/caf/mpi.c2
-rw-r--r--libgfortran/caf/single.c2
4 files changed, 10 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1b17c28c1c1..709225c3bd1 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 f60eebc7b80..1c01f9f09b3 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 fe2baf4633c..8d8c7de21a9 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 b8833275d62..521c93c34b0 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;
}