diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-18 13:10:35 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-18 13:10:35 +0000 |
| commit | 796bed0987acf145947ac15ce395d691258eebb2 (patch) | |
| tree | f16c65bafa3ae631cab53d9bef411524c77135ea /src | |
| parent | 8d07df2b37ee2d17e705e7e1a934be06d0b925e8 (diff) | |
| download | scala-796bed0987acf145947ac15ce395d691258eebb2.tar.gz scala-796bed0987acf145947ac15ce395d691258eebb2.tar.bz2 scala-796bed0987acf145947ac15ce395d691258eebb2.zip | |
Reverting for now..
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/native.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/remote.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/throws.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/transient.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/volatile.scala | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala index 3f6448300a..bcc47fcaf2 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala @@ -408,7 +408,7 @@ abstract class Pickler extends SubComponent { private def putConstant(c: Constant) = if (putEntry(c)) { if (c.tag == StringTag) putEntry(newTermName(c.stringValue)) - else if (c.tag == ClassTag) putType(c.typeValue) + else if (c.tag == ClassTag) putEntry(c.typeValue) } private def putChildren(sym: Symbol, children: List[Symbol]) { diff --git a/src/library/scala/native.scala b/src/library/scala/native.scala index 01f5d656e3..157834e446 100644 --- a/src/library/scala/native.scala +++ b/src/library/scala/native.scala @@ -21,4 +21,4 @@ package scala * but it is type checked when present. * </p> */ -class native extends StaticAnnotation {} +class native extends Annotation {} diff --git a/src/library/scala/remote.scala b/src/library/scala/remote.scala index b628d8c8a4..441eb45131 100644 --- a/src/library/scala/remote.scala +++ b/src/library/scala/remote.scala @@ -17,4 +17,4 @@ package scala * @see Method <a href="ScalaObject.html#$tag()">$tag</a> in trait * <a href="ScalaObject.html">scala.ScalaObject</a>. */ -class remote extends StaticAnnotation {} +class remote extends Annotation {} diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala index 1715a50a24..463a01b3f9 100644 --- a/src/library/scala/throws.scala +++ b/src/library/scala/throws.scala @@ -27,4 +27,4 @@ import Predef._ * @author Nikolay Mihaylov * @version 1.0, 19/05/2006 */ -class throws(clazz: Class[_]) extends StaticAnnotation +class throws(clazz: Class[_]) extends Annotation diff --git a/src/library/scala/transient.scala b/src/library/scala/transient.scala index 4d68d79d0a..d20b2e8c59 100644 --- a/src/library/scala/transient.scala +++ b/src/library/scala/transient.scala @@ -11,4 +11,4 @@ package scala -class transient extends StaticAnnotation +class transient extends Annotation diff --git a/src/library/scala/volatile.scala b/src/library/scala/volatile.scala index 18b68c4fb0..ef1ca4e8e6 100644 --- a/src/library/scala/volatile.scala +++ b/src/library/scala/volatile.scala @@ -11,4 +11,4 @@ package scala -class volatile extends StaticAnnotation +class volatile extends Annotation |