OSDN Git Service

cp:
authornathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 18 May 2001 15:00:29 +0000 (15:00 +0000)
committernathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 18 May 2001 15:00:29 +0000 (15:00 +0000)
commit081531b4928c1bd9c4aa17c6b9ab900b98ff9622
treedc7bbc9a1a18237b1f75c2012559e6a9f93a2cdf
parentc997c1e2fd1eb31c8afce4de57e0ebd1c78b88e0
cp:
PR c++/2526
* decl.c (pushdecl): Adjust error string.
(xref_tag): Adjust friend class injection warning. Remove the
inherited name from the class shadowed scope.
testsuite:
* g++.old-deja/g++.pt/inherit2.C: Remove XFAIL.
* g++.old-deja/g++.pt/crash67.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42265 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/cp/ChangeLog
gcc/cp/decl.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.old-deja/g++.pt/crash67.C [new file with mode: 0644]
gcc/testsuite/g++.old-deja/g++.pt/inherit2.C