diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@scf.usc.edu> | 2000-06-23 06:49:45 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-06-23 02:49:45 -0400 |
| commit | 1899c3a49ed1f0516e56c41070951c9e0e4d9e4f (patch) | |
| tree | 1031c3579a6b908c1508fb505a7aab1f459c9611 /gcc/cp/decl.c | |
| parent | 691125710d580d96e6c94f04fe0e1205507ee899 (diff) | |
| download | gcc-1899c3a49ed1f0516e56c41070951c9e0e4d9e4f.zip gcc-1899c3a49ed1f0516e56c41070951c9e0e4d9e4f.tar.gz gcc-1899c3a49ed1f0516e56c41070951c9e0e4d9e4f.tar.bz2 | |
parse.y (template_arg): Convert TEMPLATE_DECL that is a template template paramter to...
* parse.y (template_arg): Convert TEMPLATE_DECL
that is a template template paramter to
TEMPLATE_TEMPLATE_PARM here.
* cp-tree.def (TEMPLATE_TEMPLATE_PARM): Adjust comment.
* cp-tree.h (TEMPLATE_TEMPLATE_PARM_TEMPLATE_DECL): New macro.
(copy_template_template_parm): Adjust prototype.
* decl.c (grokdeclarator): Remove dead code.
* pt.c (process_template_parm): Tidy.
(lookup_template_class): Construct nodes in
copy_template_template_parm.
(tsubst): Pass TEMPLATE_DECL rather than IDENTIFIER_NODE to
lookup_template_class. Use TYPE_TI_TEMPLATE.
* tree.c (copy_template_template_parm): Add NEWARGS
parameter.
(mapcar): Adjust call to copy_template_template_parm.
* typeck.c (comptypes): Use TEMPLATE_TEMPLATE_PARM_TEMPLATE_DECL.
* method.c (build_template_template_parm_names): Change error
code to avoid compilation warning.
* gxxint.texi: Document template template parameter
name mangling.
From-SVN: r34659
Diffstat (limited to 'gcc/cp/decl.c')
| -rw-r--r-- | gcc/cp/decl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 10d9d08..80e69fa 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10111,7 +10111,7 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist) } } /* C++ aggregate types. */ - else if (TREE_CODE (id) == TYPE_DECL || TREE_CODE (id) == TEMPLATE_DECL) + else if (TREE_CODE (id) == TYPE_DECL) { if (type) cp_error ("multiple declarations `%T' and `%T'", type, |