name-lookup.c (leave_scope): We only need to update class_binding_level when leaving a class scope.

	* name-lookup.c (leave_scope): We only need to update
	class_binding_level when leaving a class scope.

From-SVN: r91807

gcc/cp/ChangeLog

+2004-12-07  Roger Sayle  <roger@eyesopen.com>
+
+	* name-lookup.c (leave_scope): We only need to update
+	class_binding_level when leaving a class scope.
+
 2004-12-06  Ziemowit Laski  <zlaski@apple.com>
 
 	* cp-tree.h (struct lang_type_class): Add 'objc_protocols' field.

gcc/cp/name-lookup.c

@@ -1329,11 +1329,16 @@ leave_scope (void)
 
   /* Find the innermost enclosing class scope, and reset
      CLASS_BINDING_LEVEL appropriately.  */
-  for (scope = current_binding_level;
-       scope && scope->kind != sk_class;
-       scope = scope->level_chain)
-    ;
-  class_binding_level = scope && scope->kind == sk_class ? scope : NULL;
+  if (scope->kind == sk_class)
+    {
+      class_binding_level = NULL;
+      for (scope = current_binding_level; scope; scope = scope->level_chain)
+	if (scope->kind == sk_class)
+	  {
+	    class_binding_level = scope;
+	    break;
+	  }
+    }
 
   return current_binding_level;
 }