aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/parse.y4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a33758f..e172f97 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-23 Tom Tromey <tromey@redhat.com>
+
+ PR java/17380:
+ * parse.y (not_accessible_p): Allow access to protected members
+ even when class is not static.
+
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in: Revert the gcc-none.o change.
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index b221a4c..a66ebd3 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -10065,7 +10065,7 @@ not_accessible_p (tree reference, tree member, tree where, int from_super)
{
if (inherits_from_p (where, reference))
return 0;
- if (PURE_INNER_CLASS_TYPE_P (reference))
+ if (INNER_CLASS_TYPE_P (reference))
reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
else
break;
@@ -10079,7 +10079,7 @@ not_accessible_p (tree reference, tree member, tree where, int from_super)
{
if (inherits_from_p (reference, DECL_CONTEXT (member)))
return 0;
- if (PURE_INNER_CLASS_TYPE_P (reference))
+ if (INNER_CLASS_TYPE_P (reference))
reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
else
break;