diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:51:47 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:51:47 -0700 |
| commit | 35bfa20af51efeec6649386578ddc527fe5f97a6 (patch) | |
| tree | 47291128010ad3eb3d85839018e2d4bc1fbf5d7c /src/reflect | |
| parent | 9c7915715d2a00f62b597b9d4eff1c36c36e14ba (diff) | |
| parent | 1aba3d2038b6b13496163842a94201fe51f85217 (diff) | |
| download | scala-35bfa20af51efeec6649386578ddc527fe5f97a6.tar.gz scala-35bfa20af51efeec6649386578ddc527fe5f97a6.tar.bz2 scala-35bfa20af51efeec6649386578ddc527fe5f97a6.zip | |
Merge pull request #883 from dgruntz/issue/6061
SI-6061 adds weakly conformance for number types to resolveOverloaded
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 04fa01c6f3..fab5c5a2e7 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -100,13 +100,13 @@ trait Symbols extends api.Symbols { self: SymbolTable => case _ => false } - (tp <:< pt) || isCompatibleByName(tp, pt) + (tp weak_<:< pt) || isCompatibleByName(tp, pt) } def signatureAsSpecific(method1: MethodSymbol, method2: MethodSymbol): Boolean = { (substituteTypeParams(method1), substituteTypeParams(method2)) match { case (NullaryMethodType(r1), NullaryMethodType(r2)) => - r1 <:< r2 + r1 weak_<:< r2 case (NullaryMethodType(_), MethodType(_, _)) => true case (MethodType(_, _), NullaryMethodType(_)) => @@ -298,7 +298,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => else { val a = argTypes val p = extend(paramTypes, argTypes.length) - (a corresponds p)(_ <:< _) + (a corresponds p)(_ weak_<:< _) } } } |