From 4334d8c9915c976ff083621e0df44bb7d2321064 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 6 Sep 2008 09:19:32 +0000 Subject: fixed build problems --- src/library/scala/NotNull.scala | 3 ++- src/library/scala/Predef.scala | 3 ++- src/library/scala/UncheckedStable.scala | 12 ++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 src/library/scala/UncheckedStable.scala (limited to 'src/library') diff --git a/src/library/scala/NotNull.scala b/src/library/scala/NotNull.scala index b6c80b662f..8fdda2196d 100644 --- a/src/library/scala/NotNull.scala +++ b/src/library/scala/NotNull.scala @@ -7,5 +7,6 @@ \* */ package scala -/** A marker thread for things that are not allowed to be null */ +/** A marker trait for things that are not allowed to be null + */ trait NotNull {} diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index d40369e740..ce3b05771c 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -114,7 +114,8 @@ object Predef { // tupling ------------------------------------------------------------ - def uncheckedStable[A](x: A): A with _$Stable = x.asInstanceOf[A with $Stable$] + def uncheckedStable[A](x: A): A with UncheckedStable = + x.asInstanceOf[A with UncheckedStable] type Pair[+A, +B] = Tuple2[A, B] object Pair { diff --git a/src/library/scala/UncheckedStable.scala b/src/library/scala/UncheckedStable.scala new file mode 100755 index 0000000000..fab43b48a7 --- /dev/null +++ b/src/library/scala/UncheckedStable.scala @@ -0,0 +1,12 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ +package scala + +/** A marker class for types that are assumed to be stable + */ +abstract final class UncheckedStable {} -- cgit v1.2.3