diff options
| author | François Garillot <francois@garillot.net> | 2013-12-19 15:23:06 +0100 |
|---|---|---|
| committer | François Garillot <francois@garillot.net> | 2014-01-16 11:42:44 +0100 |
| commit | 6dd3653b9c443170492eba63be542440496d0432 (patch) | |
| tree | 4d8c7e647cee15988b84af042755612f4e739078 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | d43618a92cef21f4d4bb921b61d319eb358eae29 (diff) | |
| download | scala-6dd3653b9c443170492eba63be542440496d0432.tar.gz scala-6dd3653b9c443170492eba63be542440496d0432.tar.bz2 scala-6dd3653b9c443170492eba63be542440496d0432.zip | |
SI-8126 Puts SI-6899 fix under a source level flag
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 19fba639e3..06a1e21e8b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -1365,7 +1365,7 @@ trait Implicits { maybeInvalidConversionError("the result type of an implicit conversion must be more specific than AnyRef") result = SearchFailure } - else if (isInvalidConversionSource(pt)) { + else if (settings.isScala211 && isInvalidConversionSource(pt)) { maybeInvalidConversionError("an expression of type Null is ineligible for implicit conversion") result = SearchFailure } |