aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/parse.y6
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3bb303d..d1eec40 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 6 11:39:05 2000 Tom Tromey <tromey@ferrule.cygnus.com>
+
+ * parse.y (check_modifiers_consistency): Don't subtract out
+ `PUBLIC_TK' from argument to THIS_MODIFIER_ONLY.
+
2000-06-04 Philipp Thomas <pthomas@suse.de>
* Makefile.in (INTLLIBS): New.
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 2e6325e..e6b3537 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -4613,10 +4613,8 @@ check_modifiers_consistency (flags)
acc_count = 0;
cl = NULL_TREE;
- THIS_MODIFIER_ONLY (flags, ACC_FINAL, FINAL_TK - PUBLIC_TK,
- acc_count, cl);
- THIS_MODIFIER_ONLY (flags, ACC_VOLATILE, VOLATILE_TK - PUBLIC_TK,
- acc_count, cl);
+ THIS_MODIFIER_ONLY (flags, ACC_FINAL, FINAL_TK, acc_count, cl);
+ THIS_MODIFIER_ONLY (flags, ACC_VOLATILE, VOLATILE_TK, acc_count, cl);
if (acc_count > 1)
parse_error_context (cl,
"Inconsistent member declaration. At most one of `final' or `volatile' may be specified");