diff options
| author | Paul Phillips <paulp@improving.org> | 2011-07-18 21:05:23 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-07-18 21:05:23 +0000 |
| commit | 44b9cf0ca9606f531218deefe7792b4476552291 (patch) | |
| tree | 651f2e377985f29aa74748dcbd4b2bd26da71fd3 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 658ba1b4e6898df65119f9cb6488ed8908c399ef (diff) | |
| download | scala-44b9cf0ca9606f531218deefe7792b4476552291.tar.gz scala-44b9cf0ca9606f531218deefe7792b4476552291.tar.bz2 scala-44b9cf0ca9606f531218deefe7792b4476552291.zip | |
Modified erasure so we have enough information ...
Modified erasure so we have enough information to determine whether we
need to use scala or java erasure semantics. This fixes the runtime
failure illustrated here:
% scala29 -e 'java.util.Collections.max(null)'
java.lang.NoSuchMethodError: java.util.Collections.max(Ljava/util/Collection;)Ljava/lang/Comparable;
Review by odersky.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 79a76c7f92..765881ac81 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -1117,7 +1117,7 @@ trait Implicits { // refinement is not generated yet if (hasLength(parents, 1)) findManifest(parents.head) else if (full) manifestFactoryCall("intersectionType", tp, parents map findSubManifest: _*) - else mot(erasure.erasure.intersectionDominator(parents), from, to) + else mot(erasure.intersectionDominator(parents), from, to) case ExistentialType(tparams, result) => mot(tp1.skolemizeExistential, from, to) case _ => |