parser.c (cp_parser_using_declaration): Skip name-lookup on invalid scope.

	* parser.c (cp_parser_using_declaration): Skip name-lookup on
	invalid scope.

	* g++.dg/lookup/using12.C: Tighten error marker.

From-SVN: r109237

gcc/cp/ChangeLog

+2006-01-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	* parser.c (cp_parser_using_declaration): Skip name-lookup on
+	invalid scope.
+
 2005-12-30  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* cxx-pretty-print.c (pp_cxx_constant): New.  Print

gcc/cp/parser.c

@@ -10486,7 +10486,7 @@ cp_parser_using_declaration (cp_parser* parser)
 
   /* The function we call to handle a using-declaration is different
      depending on what scope we are in.  */
-  if (identifier == error_mark_node)
+  if (qscope == error_mark_node || identifier == error_mark_node)
     ;
   else if (TREE_CODE (identifier) != IDENTIFIER_NODE
 	   && TREE_CODE (identifier) != BIT_NOT_EXPR)

gcc/testsuite/ChangeLog

+2006-01-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	* g++.dg/lookup/using12.C: Tighten error marker.
+
 2006-01-01  Andreas Tobler  <a.tobler@schweiz.ch>
 	    Andrew Pinski <pinskia@physics.uc.edu>
 

gcc/testsuite/g++.dg/lookup/using12.C

 // PR c++/16707
 
 int i;
-using N::i; // { dg-error "declared|expected" }
+using N::i; // { dg-error "'N' has not been declared" }