7005856: avoid name clash for langtools when building on MacOS

Thu, 09 Dec 2010 18:33:32 -0800

author
jjg
date
Thu, 09 Dec 2010 18:33:32 -0800
changeset 784
4dd1c0176d81
parent 783
90914ac50868
child 785
65820d0d4a97

7005856: avoid name clash for langtools when building on MacOS
Reviewed-by: mcimadamore

src/share/classes/com/sun/tools/javac/jvm/ClassReader.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Dec 09 08:48:08 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Dec 09 18:33:32 2010 -0800
     1.3 @@ -877,7 +877,7 @@
     1.4  
     1.5      protected enum AttributeKind { CLASS, MEMBER };
     1.6      protected abstract class AttributeReader {
     1.7 -        AttributeReader(Name name, Version version, Set<AttributeKind> kinds) {
     1.8 +        AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
     1.9              this.name = name;
    1.10              this.version = version;
    1.11              this.kinds = kinds;
    1.12 @@ -905,7 +905,7 @@
    1.13          abstract void read(Symbol sym, int attrLen);
    1.14  
    1.15          final Name name;
    1.16 -        final Version version;
    1.17 +        final ClassFile.Version version;
    1.18          final Set<AttributeKind> kinds;
    1.19      }
    1.20  

mercurial