Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authorjjg
Thu, 09 Dec 2010 18:33:32 -0800
changeset 7632 7fa75ac531bb
parent 7631 57bce845dcee
child 7633 52b637b3b246
7005856: avoid name clash for langtools when building on MacOS Reviewed-by: mcimadamore
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java file | annotate | diff | comparison | revisions 
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Dec 09 08:48:08 2010 -0800
+++ b/langtools/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;
     }
jdk-sandbox