summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2008-08-19 14:29:45 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2008-08-19 14:29:45 +0000
commit56eb012d9f0fb00aa4cec06df32adca5d4cd8d71 (patch)
treef344d0a65e8e806fa3361f3dcbe13647f4f061b1 /src/library
parent54065c579e343b401c42f126440d1542356b37a1 (diff)
downloadscala-56eb012d9f0fb00aa4cec06df32adca5d4cd8d71.tar.gz
scala-56eb012d9f0fb00aa4cec06df32adca5d4cd8d71.tar.bz2
scala-56eb012d9f0fb00aa4cec06df32adca5d4cd8d71.zip
Added "scalacfork" ant task and enabled it to b...
Added "scalacfork" ant task and enabled it to build locker and quick. Removed sabbus.jar (sabbus ant tasks are included in scala-compiler.jar for some time now) Made serializable, cloneable, SerialVersionUID, BeanProperty static annotations Fixed the Pickler not to crash on repeated annotations
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/SerialVersionUID.scala2
-rw-r--r--src/library/scala/cloneable.scala2
-rw-r--r--src/library/scala/reflect/BeanProperty.scala2
-rw-r--r--src/library/scala/serializable.scala2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/SerialVersionUID.scala b/src/library/scala/SerialVersionUID.scala
index d75a65a065..34e94a5bb0 100644
--- a/src/library/scala/SerialVersionUID.scala
+++ b/src/library/scala/SerialVersionUID.scala
@@ -16,4 +16,4 @@ package scala
* Annotation for specifying the static SerialVersionUID field
* of a serializable class
*/
-class SerialVersionUID(uid: Long) extends Annotation
+class SerialVersionUID(uid: Long) extends StaticAnnotation
diff --git a/src/library/scala/cloneable.scala b/src/library/scala/cloneable.scala
index 7853f604be..1fd88e4765 100644
--- a/src/library/scala/cloneable.scala
+++ b/src/library/scala/cloneable.scala
@@ -14,4 +14,4 @@ package scala
/**
* An annotation that designates the class to which it is applied as cloneable
*/
-class cloneable extends Annotation
+class cloneable extends StaticAnnotation
diff --git a/src/library/scala/reflect/BeanProperty.scala b/src/library/scala/reflect/BeanProperty.scala
index 4a09578df9..88d17208a5 100644
--- a/src/library/scala/reflect/BeanProperty.scala
+++ b/src/library/scala/reflect/BeanProperty.scala
@@ -30,4 +30,4 @@ package scala.reflect
* you should use the normal Scala access and assignment.
* </p>
*/
-class BeanProperty extends Annotation
+class BeanProperty extends StaticAnnotation
diff --git a/src/library/scala/serializable.scala b/src/library/scala/serializable.scala
index f96c36a155..50f59928f6 100644
--- a/src/library/scala/serializable.scala
+++ b/src/library/scala/serializable.scala
@@ -15,4 +15,4 @@ package scala
/**
* An annotation that designates the class to which it is applied as serializable
*/
-class serializable extends Annotation {}
+class serializable extends StaticAnnotation {}