From: Jason Merrill <jason@gcc.gnu.org>
Date: Sat, 1 Jul 2006 22:02:56 +0000 (-0400)
Subject: revert accidental checkin
X-Git-Tag: releases/gcc-4.2.0~2222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdc3400fb3ebbce0d9336a255e0466db07a861c5;p=thirdparty%2Fgcc.git

revert accidental checkin

From-SVN: r115119
---

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 2af5e04d3631..21d1b7762465 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -792,12 +792,11 @@ friend_accessible_p (tree scope, tree decl, tree binfo)
     if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
       return 1;
 
-  /* Nested classes have the same access as their enclosing types, as
+  /* Nested classes are implicitly friends of their enclosing types, as
      per core issue 45 (this is a change from the standard).  */
   if (TYPE_P (scope))
     for (t = TYPE_CONTEXT (scope); t && TYPE_P (t); t = TYPE_CONTEXT (t))
-      if (protected_accessible_p (decl, t, binfo)
-	  || friend_accessible_p (t, decl, binfo))
+      if (protected_accessible_p (decl, t, binfo))
 	return 1;
 
   if (TREE_CODE (scope) == FUNCTION_DECL