From 69d28b4f42a1226adb8507083314915dd4a69192 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 26 Sep 2011 22:12:51 -0400 Subject: re PR c++/46105 (Ordering failure among partial specializations with non-deduced context) PR c++/46105 * typeck.c (structural_comptypes): Ignore cv-quals on typename scope. From-SVN: r179229 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/typeck.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0efa0d6..abde58c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-09-26 Jason Merrill + PR c++/46105 + * typeck.c (structural_comptypes): Ignore cv-quals on typename scope. + PR c++/50508 * semantics.c (cxx_eval_logical_expression): Use tree_int_cst_equal rather than ==. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 955e37a..10f17bf 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1300,7 +1300,9 @@ structural_comptypes (tree t1, tree t2, int strict) if (!cp_tree_equal (TYPENAME_TYPE_FULLNAME (t1), TYPENAME_TYPE_FULLNAME (t2))) return false; - if (!same_type_p (TYPE_CONTEXT (t1), TYPE_CONTEXT (t2))) + /* Qualifiers don't matter on scopes. */ + if (!same_type_ignoring_top_level_qualifiers_p (TYPE_CONTEXT (t1), + TYPE_CONTEXT (t2))) return false; break; -- cgit v1.1