1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Dec 12 08:15:32 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Dec 13 11:21:28 2011 -0800
1.3 @@ -48,7 +48,6 @@
1.4 import static com.sun.tools.javac.code.TypeTags.*;
1.5 import static com.sun.tools.javac.code.TypeTags.WILDCARD;
1.6
1.7 -import static com.sun.tools.javac.main.OptionName.*;
1.8 import static com.sun.tools.javac.tree.JCTree.Tag.*;
1.9
1.10 /** Type checking helper class for the attribution phase.
1.11 @@ -110,7 +109,7 @@
1.12 allowAnnotations = source.allowAnnotations();
1.13 allowCovariantReturns = source.allowCovariantReturns();
1.14 allowSimplifiedVarargs = source.allowSimplifiedVarargs();
1.15 - complexInference = options.isSet(COMPLEXINFERENCE);
1.16 + complexInference = options.isSet("complexinference");
1.17 skipAnnotations = options.isSet("skipAnnotations");
1.18 warnOnSyntheticConflicts = options.isSet("warnOnSyntheticConflicts");
1.19 suppressAbortOnBadClassFile = options.isSet("suppressAbortOnBadClassFile");
1.20 @@ -2482,7 +2481,7 @@
1.21 warnDeprecated(pos, s);
1.22 }
1.23 });
1.24 - };
1.25 + }
1.26 }
1.27
1.28 void checkSunAPI(final DiagnosticPosition pos, final Symbol s) {
