Mercurial > hg > openjdk > jigsaw > langtools

changeset 839:4dd1c0176d81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7005856: avoid name clash for langtools when building on MacOS Reviewed-by: mcimadamore
author jjg
date Thu, 09 Dec 2010 18:33:32 -0800
parents 90914ac50868
children 65820d0d4a97
files src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Dec 09 08:48:08 2010 -0800
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Dec 09 18:33:32 2010 -0800
@@ -877,7 +877,7 @@
 
     protected enum AttributeKind { CLASS, MEMBER };
     protected abstract class AttributeReader {
-        AttributeReader(Name name, Version version, Set<AttributeKind> kinds) {
+        AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
             this.name = name;
             this.version = version;
             this.kinds = kinds;
@@ -905,7 +905,7 @@
         abstract void read(Symbol sym, int attrLen);
 
         final Name name;
-        final Version version;
+        final ClassFile.Version version;
         final Set<AttributeKind> kinds;
     }