Gentoo Archives: gentoo-commits

From: "Johann Schmitz (ercpe)" <ercpe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/relaxngcc/files: 1.12-fix-jdk-1.7-enum.patch
Date: Sat, 21 Jun 2014 06:51:30
Message-Id: 20140621065125.C6D552004E@flycatcher.gentoo.org
1 ercpe 14/06/21 06:51:25
2
3 Added: 1.12-fix-jdk-1.7-enum.patch
4 Log:
5 Bump to EAPI=5; fixed bug #514072: renamed variable named "enum" which cause compile errors with jdk 1.7
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
8
9 Revision Changes Path
10 1.1 dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch?rev=1.1&content-type=text/plain
14
15 Index: 1.12-fix-jdk-1.7-enum.patch
16 ===================================================================
17 diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
18 index b2f0e5e..bca566f 100644
19 --- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
20 +++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
21 @@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
22 jj_expentry[i] = jj_lasttokens[i];
23 }
24 boolean exists = false;
25 - for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
26 - int[] oldentry = (int[])(enum.nextElement());
27 + for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
28 + int[] oldentry = (int[])(enumx.nextElement());
29 if (oldentry.length == jj_expentry.length) {
30 exists = true;
31 for (int i = 0; i < jj_expentry.length; i++) {