aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@ferrule.cygnus.com>2000-06-06 18:46:16 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-06-06 18:46:16 +0000
commit14d075d85dccf7e7f56a6fdbf09e2822b5343623 (patch)
tree0162c344cfad66f028b6d19258f3876bdd4080bb /gcc/java
parent5e9e71f0434cb11a0469ae9ae333e66e371f80dc (diff)
downloadgcc-14d075d85dccf7e7f56a6fdbf09e2822b5343623.zip
gcc-14d075d85dccf7e7f56a6fdbf09e2822b5343623.tar.gz
gcc-14d075d85dccf7e7f56a6fdbf09e2822b5343623.tar.bz2
parse.y (check_modifiers_consistency): Don't subtract out `PUBLIC_TK' from argument to THIS_MODIFIER_ONLY.
* parse.y (check_modifiers_consistency): Don't subtract out `PUBLIC_TK' from argument to THIS_MODIFIER_ONLY. From-SVN: r34433
Diffstat (limited to 'gcc/java')
-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");