diff options
author | Jason Merrill <jason@gcc.gnu.org> | 2006-07-01 18:02:56 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2006-07-01 18:02:56 -0400 |
commit | bdc3400fb3ebbce0d9336a255e0466db07a861c5 (patch) | |
tree | 878fe52d7f9fdbc8a81fbe2e1143a13ba48a6a9d | |
parent | cf5131b464422f1f34195dbcd91f5a0a05abc09b (diff) | |
download | gcc-bdc3400fb3ebbce0d9336a255e0466db07a861c5.zip gcc-bdc3400fb3ebbce0d9336a255e0466db07a861c5.tar.gz gcc-bdc3400fb3ebbce0d9336a255e0466db07a861c5.tar.bz2 |
revert accidental checkin
From-SVN: r115119
-rw-r--r-- | gcc/cp/search.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 2af5e04..21d1b77 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 |