OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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


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

From-SVN: r64323
This commit is contained in:
Mark Mitchell 2003-03-13 20:54:36 +00:00 committed by Mark Mitchell
parent 6d7b8b3509
commit 45707d3120
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
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.

7
gcc/cp/decl2.c
View File

@ -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))
{

2
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,7 @@
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.

8
gcc/testsuite/g++.dg/parse/namespace9.C Normal file
View File

@ -0,0 +1,8 @@
namespace A {
void f();
}
int g()
{
struct f { };
using A::f;
}