summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2002-09-13 21:47:22 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2002-09-13 21:47:22 +0000
commit712467a4c95b97059c09de437fa8cbd046663f6a (patch)
tree5a445ad19242301c5ad05e9d614ae622c3bbd199 /gcc/cp
parent32b4f6f42ab798717813254ce9a2087f6573522c (diff)
downloadgcc-712467a4c95b97059c09de437fa8cbd046663f6a.tar.gz
pt.c (unify, ARRAY_TYPE): Element type can be more qualified.
cp: * pt.c (unify, ARRAY_TYPE): Element type can be more qualified. testsuite: * g++.dg/template/deduce1.C: New test. From-SVN: r57120
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5048f985470..33729f4a7a9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-13 Nathan Sidwell <nathan@codesourcery.com>
+
+ * pt.c (unify, ARRAY_TYPE): Element type can be more qualified.
+
2002-09-13 Kazu Hirata <kazu@cs.umass.edu>
* decl.c: Fix comment formatting.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d4fd2957afa..17e92f32246 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8921,7 +8921,7 @@ unify (tparms, targs, parm, arg, strict)
TYPE_DOMAIN (arg), UNIFY_ALLOW_NONE) != 0)
return 1;
return unify (tparms, targs, TREE_TYPE (parm), TREE_TYPE (arg),
- UNIFY_ALLOW_NONE);
+ strict & UNIFY_ALLOW_MORE_CV_QUAL);
case REAL_TYPE:
case COMPLEX_TYPE: