[llvm-commits] CVS: llvm-gcc/gcc/cp/search.c

[Chris Lattner]

Changes in directory llvm-gcc/gcc/cp:

search.c updated: 1.2 -> 1.3
---
Log message:

Patch to fix PR516: http://llvm.cs.uiuc.edu/PR516 , thanks to Adam Treat for figuring this one out!!



---
Diffs of the changes:  (+3 -2)

 search.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm-gcc/gcc/cp/search.c
diff -u llvm-gcc/gcc/cp/search.c:1.2 llvm-gcc/gcc/cp/search.c:1.3
--- llvm-gcc/gcc/cp/search.c:1.2	Fri Jan  9 10:54:32 2004
+++ llvm-gcc/gcc/cp/search.c	Fri Feb 18 17:06:58 2005
@@ -855,8 +855,9 @@
     return 0;
 
   for (t = befriending_classes; t; t = TREE_CHAIN (t))
-    if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
-      return 1;
+    if ( TREE_CODE (t) != FUNCTION_DECL )
+      if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
+        return 1;
 
   /* Nested classes are implicitly friends of their enclosing types, as
      per core issue 45 (this is a change from the standard).  */