OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

search.c (lookup_base_r): Don't clear is_non_public just because we found a friendly scope. 

* search.c (lookup_base_r): Don't clear is_non_public just because
        we found a friendly scope.

From-SVN: r50141
This commit is contained in:
Jason Merrill 2002-02-28 10:34:27 -05:00 committed by Jason Merrill
parent e43cae6719
commit 8fdc55170e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2002-02-28 Jason Merrill <jason@redhat.com>
* search.c (lookup_base_r): Don't clear is_non_public just because
we found a friendly scope.
* decl.c (finish_function): Only warn about missing return
statement with -Wreturn-type.

3
gcc/cp/search.c
View File

@ -201,8 +201,9 @@ lookup_base_r (binfo, base, access, within_current_scope,
&& !within_current_scope
&& is_friend (BINFO_TYPE (binfo), current_scope ()))
{
/* Do not clear is_non_public here. If A is a private base of B, A
is not allowed to convert a B* to an A*. */
within_current_scope = 1;
is_non_public = 0;
}
if (same_type_p (BINFO_TYPE (binfo), base))