PR c++/6256:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 23 Apr 2002 08:37:23 +0000 (08:37 +0000)
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 23 Apr 2002 08:37:23 +0000 (08:37 +0000)
commit13ddc993df61ba66cd0e0b44d088bb68db01e8e9
tree8aea9d9d97169d2716e25282e4a96b9738fd5d84
parent24ff0b025e497dc9d10dacc234773bdf2e05ce36
PR c++/6256:
* pt.c (tsubst_friend_class): Handle templates with explicit
nested names.

PR c++/6331:
* typeck.c (merge_types): Remember the cv-qualification of pointer
types when merging them.

PR c++/6256:
* g++.dg/template/friend5.C: New test.

PR c++/6331:
* g++.dg/template/qual1.C: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52661 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/cp/ChangeLog
gcc/cp/pt.c
gcc/cp/typeck.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/template/friend5.C [new file with mode: 0644]
gcc/testsuite/g++.dg/template/qual1.C [new file with mode: 0644]