diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1998-01-23 13:33:28 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-01-23 13:33:28 -0500 |
| commit | d1fefbce9d3fdaff1b5d9db74690fbe221752c18 (patch) | |
| tree | 109f5615c428610bb6ccf9fa5106e5544f6006f3 | |
| parent | 03566575a9ba0e7a40f4e2e24686aca147448e74 (diff) | |
| download | gcc-d1fefbce9d3fdaff1b5d9db74690fbe221752c18.zip gcc-d1fefbce9d3fdaff1b5d9db74690fbe221752c18.tar.gz gcc-d1fefbce9d3fdaff1b5d9db74690fbe221752c18.tar.bz2 | |
revert last change
From-SVN: r17460
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2f3c04a..5d5ccf9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,11 +1,7 @@ -Thu Jan 22 21:30:42 1998 Mark Mitchell <mmitchell@usa.net> - - * decl2.c (grok_x_components): Always call grok_enum_decls. - Wed Jan 21 10:29:57 1998 Kriang Lerdsuwanakij <lerdsuwa@scf.usc.edu> * pt.c (coerce_template_parms): Don't access elements of ARGLIST - that is not really present. Substitute default arguments in + that are not really present. Substitute default arguments in template template arguments. Correctly convert TEMPLATE_DECL to TEMPLATE_TEMPLATE_PARM. (comp_template_args): TEMPLATE_DECL and TEMPLATE_TEMPLATE_PARM diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 12a8474..8c4efc6 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -931,7 +931,10 @@ grok_x_components (specs, components) else { t = TREE_TYPE (components); - return grok_enum_decls (t, components); + if (TREE_CODE (t) == ENUMERAL_TYPE && TREE_NONLOCAL_FLAG (t)) + return grok_enum_decls (t, components); + else + return components; } } |