# HG changeset patch # User jjg # Date 1291948412 28800 # Node ID 7fa75ac531bbb1f5f2902b9ba933d092c0cc6ce9 # Parent 57bce845dcee45091f83b482efbf2a978fd614c8 7005856: avoid name clash for langtools when building on MacOS Reviewed-by: mcimadamore diff -r 57bce845dcee -r 7fa75ac531bb langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java --- 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 kinds) { + AttributeReader(Name name, ClassFile.Version version, Set 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 kinds; }