pt.c (redeclare_class_template): Merge default template arguments in both directions.
authorMark Mitchell <mark@codesourcery.com>
Fri, 20 Aug 1999 06:11:48 +0000 (06:11 +0000)
committerMark Mitchell <mmitchel@gcc.gnu.org>
Fri, 20 Aug 1999 06:11:48 +0000 (06:11 +0000)
commit7ce74c5e5e401108e8b7667e7cc33318947cde41
tree254e30b4c2fc8baa50829dee4b5f3e38c1e77732
parentefe0774e6a86cea1bd68e045eb67ea8c4b90431b
pt.c (redeclare_class_template): Merge default template arguments in both directions.

* 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.

From-SVN: r28774
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]