re PR c++/19063 (ICE on invalid template parameter)

	* name-lookup.c (pushtag): Remove accidental commit from:
	2004-12-21  Mark Mitchell  <mark@codesourcery.com>
	PR c++/19063
	* decl.c (grokdeclarator): Return error_mark_node, not
	void_type_node, to indicate errors.
	* parser.c (cp_parser_template_parameter_list): Robustify.
	(cp_parser_template_parameter): Likewise.

From-SVN: r102784

gcc/cp/ChangeLog

+2005-08-05  Mark Mitchell  <mark@codesourcery.com>
+
+	* name-lookup.c (pushtag): Remove accidental commit from:
+	2004-12-21  Mark Mitchell  <mark@codesourcery.com>
+	PR c++/19063
+	* decl.c (grokdeclarator): Return error_mark_node, not
+	void_type_node, to indicate errors.
+	* parser.c (cp_parser_template_parameter_list): Robustify.
+	(cp_parser_template_parameter): Likewise.
+
 2005-08-01  Kazu Hirata  <kazu@codesourcery.com>
 
 	* class.c, decl.c, name-lookup.c, pt.c, typeck.c, typeck2.c:

gcc/cp/name-lookup.c

@@ -4713,9 +4713,6 @@ pushtag (tree name, tree type, tag_scope scope)
 	  else if (b->kind != sk_template_parms)
 	    d = pushdecl_with_scope (d, b);
 
-	  if (d == error_mark_node)
-	    POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node);
-
 	  TYPE_CONTEXT (type) = DECL_CONTEXT (d);
 
 	  /* If this is a local class, keep track of it.  We need this