79th Cygnus<->FSF merge

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@11082 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 7 deletions

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index cca35da334d..87dc9c066dd 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4416,7 +4416,7 @@ pushclass (type, modify)
       else if (type != previous_class_type || current_class_depth > 1)
 	{
 	  build_mi_matrix (type);
-	  push_class_decls (type, !modify);
+	  push_class_decls (type);
 	  free_mi_matrix ();
 	  if (current_class_depth == 1)
 	    previous_class_type = type;
@@ -4453,12 +4453,6 @@ pushclass (type, modify)
 
       current_function_decl = this_fndecl;
     }
-  else if (CLASSTYPE_LOCAL_TYPEDECLS (type))
-    {
-      build_mi_matrix (type);
-      push_class_decls (type, !modify);
-      free_mi_matrix ();
-    }
 
   if (flag_cadillac)
     cadillac_push_class (type);