OSDN Git Service

* pt.c (redeclare_class_template): Merge default template
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 20 Aug 1999 06:11:48 +0000 (06:11 +0000)
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 20 Aug 1999 06:11:48 +0000 (06:11 +0000)
commitb7452de5be60e58b24fddce550b15068a5f94623
tree254e30b4c2fc8baa50829dee4b5f3e38c1e77732
parente52eb8901e30bfbb973c4c4eb6d3611e9829e677
* pt.c (redeclare_class_template): Merge default template
arguments in both directions.

* typeck.c (common_type): Undo 1999-08-18 change.  Remove
compiler_error message.

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