From 0a0863c6f80e54de15e1878e75309689e4fce657 Mon Sep 17 00:00:00 2001
From: dodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 19 Apr 2010 09:32:16 +0000
Subject: [PATCH] Fix PR c++/43704

gcc/cp/ChangeLog:
	PR c++/43704
	* typeck.c (structural_comptypes): Test dependent typedefs
	incompatibility before testing for their main variant based
	equivalence.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158508 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                          | 7 +++++++
 gcc/testsuite/ChangeLog                   | 5 +++++
 gcc/testsuite/g++.dg/template/typedef32.C | 5 ++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f2b69198a4f..71ffdeac99b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-19  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/43704
+	* typeck.c (structural_comptypes): Test dependent typedefs
+	incompatibility before testing for their main variant based
+	equivalence.
+
 2010-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	* cp-tree.h (SCOPED_ENUM_P, UNSCOPED_ENUM_P, SET_SCOPED_ENUM_P): Use
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b5a7b19e2ab..9c37d61ec5b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-19  Dodji Seketeli  <dodji@redhat.com>
+
+	PR c++/43704
+	* g++.dg/template/typedef32.C: New test.
+
 2010-04-19 Ira Rosen <irar@il.ibm.com>
 
 	PR tree-optimization/37027	
diff --git a/gcc/testsuite/g++.dg/template/typedef32.C b/gcc/testsuite/g++.dg/template/typedef32.C
index b32e66c3f88..b3c4b90228f 100644
--- a/gcc/testsuite/g++.dg/template/typedef32.C
+++ b/gcc/testsuite/g++.dg/template/typedef32.C
@@ -10,13 +10,12 @@ struct if_
 template<class I1>
 struct iterator_restrict_traits
 {
-    struct iterator_category {};
 };
 
 template<class T>
-struct matrix
+class matrix
 {
- struct ci {struct ic {};};
+ class ci {};
  class i {};
 };
 
-- 
2.11.0