summaryrefslogtreecommitdiff
path: root/src/continuations
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-06 04:04:56 +0000
committerPaul Phillips <paulp@improving.org>2010-12-06 04:04:56 +0000
commit8922c4ed092a2fb4c3f6002f7c49d304f299cd02 (patch)
tree7ca9c695328777ad292deac95b4c0347b6c38280 /src/continuations
parentb6db478a9641dd488f00fab0c0a113ef83fec5d3 (diff)
downloadscala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.gz
scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.tar.bz2
scala-8922c4ed092a2fb4c3f6002f7c49d304f299cd02.zip
Moved ClassfileAnnotation/StaticAnnotation/Anno...
Moved ClassfileAnnotation/StaticAnnotation/Annotation/TypeConstraint into scala.annotation and enabled the deprecated type aliases in scala.* to point there. Also enclosed is a new starr to bootstrap. No review.
Diffstat (limited to 'src/continuations')
-rw-r--r--src/continuations/library/scala/util/continuations/ControlContext.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/continuations/library/scala/util/continuations/ControlContext.scala b/src/continuations/library/scala/util/continuations/ControlContext.scala
index a97b8c8279..6d7766f173 100644
--- a/src/continuations/library/scala/util/continuations/ControlContext.scala
+++ b/src/continuations/library/scala/util/continuations/ControlContext.scala
@@ -3,13 +3,13 @@
package scala.util.continuations
-class cpsParam[-B,+C] extends StaticAnnotation with TypeConstraint
+class cpsParam[-B,+C] extends annotation.StaticAnnotation with TypeConstraint
private class cpsSym[B] extends Annotation // implementation detail
private class cpsSynth extends Annotation // implementation detail
-private class cpsPlus extends StaticAnnotation with TypeConstraint // implementation detail
+private class cpsPlus extends annotation.StaticAnnotation with TypeConstraint // implementation detail
private class cpsMinus extends Annotation // implementation detail