From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Wed, 31 Aug 2005 08:56:11 +0000 (+0000)
Subject: re PR c++/23639 (Bad error message: not a member of '<declaration error>')
X-Git-Tag: releases/gcc-3.4.5~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d8810dea559edbbcb290453827ec44e28656ca;p=thirdparty%2Fgcc.git

re PR c++/23639 (Bad error message: not a member of '<declaration error>')

	PR c++/23639
	* semantics.c (qualified_name_lookup_error): Do not complain again
	on invalid scope.

	* g++.dg/template/ttp5.C: Adjust error markers.

From-SVN: r103664
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d10e55cf6238..82431b4a0a76 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-31  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/23639
+	* semantics.c (qualified_name_lookup_error): Do not complain again
+	on invalid scope.
+
 2005-07-28  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	Backport:
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index bb2f3c925ad4..55984b75ade2 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2295,7 +2295,9 @@ check_multiple_declarators (void)
 void
 qualified_name_lookup_error (tree scope, tree name)
 {
-  if (TYPE_P (scope))
+  if (scope == error_mark_node)
+    ; /* We already complained.  */
+  else if (TYPE_P (scope))
     {
       if (!COMPLETE_TYPE_P (scope))
 	error ("incomplete type `%T' used in nested name specifier", scope);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4c3a9a6a22ab..4f18fa1ad3a2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-31  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/23639
+	* g++.dg/template/ttp5.C: Adjust error markers.
+
 2005-08-08  Josh Conner  <jconner@apple.com>
 
 	PR rtl-optimization/23241
diff --git a/gcc/testsuite/g++.dg/template/ttp5.C b/gcc/testsuite/g++.dg/template/ttp5.C
index d26b8164eed8..ee9d1ff7cc95 100644
--- a/gcc/testsuite/g++.dg/template/ttp5.C
+++ b/gcc/testsuite/g++.dg/template/ttp5.C
@@ -16,5 +16,5 @@ template <template <int> class F> struct C {
 };
 
 template <int n> struct D {
-  enum { v = C<A<n>::B>::v }; // { dg-error "mismatch|class template|not a member" }
+  enum { v = C<A<n>::B>::v }; // { dg-error "mismatch|class template" }
 };