aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique d'Humieres <dominiq@lps.ens.fr>2015-11-11 11:30:25 +0100
committerDominique d'Humieres <dominiq@gcc.gnu.org>2015-11-11 11:30:25 +0100
commit6eef39f15bb3ca2de1cddc0d9b48b8644b9d5abc (patch)
tree9797f75fddf6dc11eae45bf437ada4b3ef0b5706
parent832ca6ac7252f3dcde1fe4dbe8284a1961449e2b (diff)
downloadgcc-6eef39f15bb3ca2de1cddc0d9b48b8644b9d5abc.zip
gcc-6eef39f15bb3ca2de1cddc0d9b48b8644b9d5abc.tar.gz
gcc-6eef39f15bb3ca2de1cddc0d9b48b8644b9d5abc.tar.bz2
re PR fortran/67826 (gcc/fortran/openmp.c:1808: bad test ?)
2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr> PR fortran/67826 * openmp.c (gfc_omp_udr_find): Fix typo. From-SVN: r230148
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/openmp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cd4c94e..33c541a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr>
+
+ PR fortran/67826
+ * openmp.c (gfc_omp_udr_find): Fix typo.
+
2015-11-08 Steven g. Kargl <kargl@gcc.gnu.org>
PR fortran/68053
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index a7c7a19..4af139a 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -1820,7 +1820,7 @@ gfc_omp_udr_find (gfc_symtree *st, gfc_typespec *ts)
for (omp_udr = st->n.omp_udr; omp_udr; omp_udr = omp_udr->next)
if (omp_udr->ts.type == ts->type
|| ((omp_udr->ts.type == BT_DERIVED || omp_udr->ts.type == BT_CLASS)
- && (ts->type == BT_DERIVED && ts->type == BT_CLASS)))
+ && (ts->type == BT_DERIVED || ts->type == BT_CLASS)))
{
if (omp_udr->ts.type == BT_DERIVED || omp_udr->ts.type == BT_CLASS)
{