[multiple changes]

2004-10-13  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/16301
        * name-lookup.c (parse_using_directive): If we have a
        error_mark_node, do not set the decl namespace associations
        on it.

2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/16301
        * g++.dg/lookup/strong-using-4.C: New test.

From-SVN: r89093

gcc/cp/ChangeLog

+2004-10-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c++/16301
+	* name-lookup.c (parse_using_directive): If we have a
+	error_mark_node, do not set the decl namespace associations
+	on it.
+
 2004-10-14  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/17976

gcc/cp/name-lookup.c

@@ -3422,7 +3422,7 @@ parse_using_directive (tree namespace, tree attribs)
 	{
 	  if (!toplevel_bindings_p ())
 	    error ("strong using only meaningful at namespace scope");
-	  else
+	  else if (namespace != error_mark_node)
 	    DECL_NAMESPACE_ASSOCIATIONS (namespace)
 	      = tree_cons (current_namespace, 0,
 			   DECL_NAMESPACE_ASSOCIATIONS (namespace));

gcc/testsuite/ChangeLog

 2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>
 
+	PR c++/16301
+	* g++.dg/lookup/strong-using-4.C: New test.
+
+2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>
+
 	PR middle-end/16567
         * gcc.c-torture/compile/nested-1.c: New test.
 

gcc/testsuite/g++.dg/lookup/strong-using-4.C

+// PR c++/16301
+
+// { dg-do compile }
+
+namespace NS2 
+{ 
+  using namespace NS1 __attribute__ ((strong));  // { dg-error "" }
+}