revert last change

From-SVN: r17460

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2f3c04a518889dd97bde4e0e1804aa79ff48195b..5d5ccf9cfa0ca8f518afb87d457ba1deba1c915d 100644 (file)
--- 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 12a8474655cdd65c594f469a29ca10800b3852e8..8c4efc6fc367ee743254d543bf5cd6fad20f33c5 100644 (file)
--- 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;
     }
 }