summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-02-02 11:25:52 +0000
committerMartin Odersky <odersky@gmail.com>2011-02-02 11:25:52 +0000
commit76dfe52fff10dd11dece7345adb23baf1131c704 (patch)
tree28bfc6903c90029126084e888f3b2fd1ad09faed /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parent5caf65d340ff18605c971e9f80d629155f9cf6ff (diff)
downloadscala-76dfe52fff10dd11dece7345adb23baf1131c704.tar.gz
scala-76dfe52fff10dd11dece7345adb23baf1131c704.tar.bz2
scala-76dfe52fff10dd11dece7345adb23baf1131c704.zip
2nd attempt to survive divergent implicits in t...
2nd attempt to survive divergent implicits in the presentation compiler.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 55c24c3b5f..6d36c77b28 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -996,7 +996,6 @@ trait Implicits {
}
}
}
-
- private class DivergentImplicit extends Exception
- private val DivergentImplicit = new DivergentImplicit
}
+class DivergentImplicit extends Exception
+object DivergentImplicit extends DivergentImplicit