From d1fefbce9d3fdaff1b5d9db74690fbe221752c18 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 23 Jan 1998 13:33:28 -0500 Subject: [PATCH] revert last change From-SVN: r17460 --- gcc/cp/ChangeLog | 6 +----- gcc/cp/decl2.c | 5 ++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2f3c04a5188..5d5ccf9cfa0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,11 +1,7 @@ -Thu Jan 22 21:30:42 1998 Mark Mitchell - - * decl2.c (grok_x_components): Always call grok_enum_decls. - Wed Jan 21 10:29:57 1998 Kriang Lerdsuwanakij * 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 12a8474655c..8c4efc6fc36 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; } } -- 2.30.2