decl2.c (do_nonmember_using_decl): Correct handling of simultaneous type/non-type bindings.

	* decl2.c (do_nonmember_using_decl): Correct handling of
	simultaneous type/non-type bindings.


	* g++.dg/parse/namespace9.C: New test.

From-SVN: r64323

gcc/cp/ChangeLog

 2003-03-13  Mark Mitchell  <mark@codesourcery.com>
 
+	* decl2.c (do_nonmember_using_decl): Correct handling of
+	simultaneous type/non-type bindings.
+
 	* call.c (initialize_reference): Remove bogus assertion.
 	* decl.c (build_ptrmemfunc_type): Revert change of 2003-03-09.
 

gcc/cp/decl2.c

@@ -4222,6 +4222,13 @@ do_nonmember_using_decl (tree scope, tree name, tree oldval, tree oldtype,
     {
       tree tmp, tmp1;
 
+      if (oldval && !is_overloaded_fn (oldval))
+	{
+	  if (!DECL_IMPLICIT_TYPEDEF_P (oldval))
+	    error ("`%D' is already declared in this scope", name);
+	  oldval = NULL_TREE;
+	}
+
       *newval = oldval;
       for (tmp = BINDING_VALUE (decls); tmp; tmp = OVL_NEXT (tmp))
 	{

gcc/testsuite/ChangeLog

 2003-03-13  Mark Mitchell  <mark@codesourcery.com>
 
+	* g++.dg/parse/namespace9.C: New test.
+
 	* g++.dg/init/ref5.C: New test.
 	* g++.dg/parse/ptrmem1.C: Likewise.
 

gcc/testsuite/g++.dg/parse/namespace9.C

+namespace A {
+  void f();
+}
+int g()
+{
+  struct f { };
+  using A::f;
+}