summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTiark Rompf <tiark.rompf@epfl.ch>2010-03-24 22:43:44 +0000
committerTiark Rompf <tiark.rompf@epfl.ch>2010-03-24 22:43:44 +0000
commit36ca453919ab3303d1e344aec2cb3f82c441af26 (patch)
treef1c9c7d4f1d1c884715b9c991e77324da40c2683 /src
parent824e71d603f55e202a19e09f0fd799cfb17bf431 (diff)
downloadscala-36ca453919ab3303d1e344aec2cb3f82c441af26.tar.gz
scala-36ca453919ab3303d1e344aec2cb3f82c441af26.tar.bz2
scala-36ca453919ab3303d1e344aec2cb3f82c441af26.zip
reverting changes from r21260.
Diffstat (limited to 'src')
-rw-r--r--src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
index a1112fa3c8..6acc685dc2 100644
--- a/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
+++ b/src/continuations/plugin/scala/tools/selectivecps/CPSAnnotationChecker.scala
@@ -380,11 +380,7 @@ abstract class CPSAnnotationChecker extends CPSUtils {
* for a tree. All this should do is add annotations. */
override def addAnnotations(tree: Tree, tpe: Type): Type = {
- if (!cpsEnabled) {
- if (tpe.hasAnnotation(MarkerCPSTypes))
- global.reporter.error(tree.pos, "this code must be compiled with the Scala continuations plugin enabled")
- return tpe
- }
+ if (!cpsEnabled) return tpe
// if (tree.tpe.hasAnnotation(MarkerCPSAdaptPlus))
// println("addAnnotation " + tree + "/" + tpe)