summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-04 11:23:16 -0800
committerPaul Phillips <paulp@improving.org>2012-02-04 11:30:31 -0800
commit6b8aed72e4f7a7135a434533399a772bf7078101 (patch)
treee5042a572ccdbdf85da2ef7b86bb2a79b2379d1b /src/library
parent2b7fb460dd1e666ed37ccba49a82aab959413c22 (diff)
downloadscala-6b8aed72e4f7a7135a434533399a772bf7078101.tar.gz
scala-6b8aed72e4f7a7135a434533399a772bf7078101.tar.bz2
scala-6b8aed72e4f7a7135a434533399a772bf7078101.zip
Made Any parents work more.
Working on type printing logic.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/AnyVal.scala8
-rw-r--r--src/library/scala/NotNull.scala2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/library/scala/AnyVal.scala b/src/library/scala/AnyVal.scala
index ed32fb7302..daad6f6f5e 100644
--- a/src/library/scala/AnyVal.scala
+++ b/src/library/scala/AnyVal.scala
@@ -25,8 +25,8 @@ package scala
* The ''integer types'' include the subrange types as well as [[scala.Int]] and [[scala.Long]].
* The ''floating point types'' are [[scala.Float]] and [[scala.Double]].
*/
-trait AnyVal extends NotNull {
-// disabled for now to make the standard build go through.
-// Once we have a new strap we can uncomment this and delete the AnyVal_getClass entry in Definitions.
-// def getClass(): Class[_ <: AnyVal] = ???
+trait AnyVal extends Any with NotNull {
+ // disabled for now to make the standard build go through.
+ // Once we have a new strap we can uncomment this and delete the AnyVal_getClass entry in Definitions.
+ def getClass(): Class[_ <: AnyVal] = ???
}
diff --git a/src/library/scala/NotNull.scala b/src/library/scala/NotNull.scala
index f90b95c789..64f999a932 100644
--- a/src/library/scala/NotNull.scala
+++ b/src/library/scala/NotNull.scala
@@ -12,4 +12,4 @@ package scala
* A marker trait for things that are not allowed to be null
* @since 2.5
*/
-trait NotNull {}
+trait NotNull extends Any {}