Fix PR c++/43800

gcc/cp/ChangeLog:
	PR c++/43800
	PR c++/43704
	* typeck.c (incompatible_dependent_types_p): If one of the
	compared types if not a typedef then honour their main variant
	equivalence.

gcc/testsuite/ChangeLog:
	PR c++/43800
	PR c++/43704
	* g++.dg/template/typedef32.C: Adjust.
	* g++.dg/template/typedef33.C: New test.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d54b21d..656c88f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-20  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/43800
+       PR c++/43704
+       * typeck.c (incompatible_dependent_types_p): If one of the
+       compared types if not a typedef then honour their main variant
+       equivalence.
+
 2010-04-20  Jakub Jelinek  <jakub@redhat.com>
 
        * cp-tree.h (TYPE_REF_IS_RVALUE): Remove.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f1396df..3716d47 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-20  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/43800
+       PR c++/43704
+       * g++.dg/template/typedef32.C: Adjust.
+       * g++.dg/template/typedef33.C: New test.
+
 2010-04-20  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/43227

diff --git a/gcc/testsuite/g++.dg/template/typedef32.C b/gcc/testsuite/g++.dg/template/typedef32.C
index b3c4b90..b32e66c 100644 (file)
--- a/gcc/testsuite/g++.dg/template/typedef32.C
+++ b/gcc/testsuite/g++.dg/template/typedef32.C
@@ -10,12 +10,13 @@ struct if_
 template<class I1>
 struct iterator_restrict_traits
 {
+    struct iterator_category {};
 };
 
 template<class T>
-class matrix
+struct matrix
 {
- class ci {};
+ struct ci {struct ic {};};
  class i {};
 };