diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-02-09 15:46:45 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-02-09 15:46:45 +0000 |
| commit | 75667b88b379744d4eb33bae49c5120a54fa1f8f (patch) | |
| tree | b642211382341380289aa27a8b311d08a359fbd0 /src/library | |
| parent | dff00da93dd7b5a08162522a992c3ac4373d00a9 (diff) | |
| download | scala-75667b88b379744d4eb33bae49c5120a54fa1f8f.tar.gz scala-75667b88b379744d4eb33bae49c5120a54fa1f8f.tar.bz2 scala-75667b88b379744d4eb33bae49c5120a54fa1f8f.zip | |
Changed the dummy specialization parameter Ref ...
Changed the dummy specialization parameter Ref to AnyRef.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/AnyCompanion.scala | 15 | ||||
| -rw-r--r-- | src/library/scala/AnyValCompanion.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/Predef.scala | 1 | ||||
| -rw-r--r-- | src/library/scala/Ref.scala | 12 |
4 files changed, 12 insertions, 17 deletions
diff --git a/src/library/scala/AnyCompanion.scala b/src/library/scala/AnyCompanion.scala index 0a14ebacdb..d34e7bc461 100644 --- a/src/library/scala/AnyCompanion.scala +++ b/src/library/scala/AnyCompanion.scala @@ -1,6 +1,13 @@ -package scala - - +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ +package scala -private[scala] trait AnyCompanion { } +/** A common supertype for companion classes. + */ +private[scala] trait AnyCompanion diff --git a/src/library/scala/AnyValCompanion.scala b/src/library/scala/AnyValCompanion.scala index 3c3379de38..3ddd66c2d0 100644 --- a/src/library/scala/AnyValCompanion.scala +++ b/src/library/scala/AnyValCompanion.scala @@ -1,4 +1,3 @@ - /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 222d5e4fd4..99953130d3 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -38,6 +38,7 @@ object Predef extends LowPriorityImplicits { type Set[A] = immutable.Set[A] val Map = immutable.Map val Set = immutable.Set + val AnyRef = new AnyCompanion {} // a dummy used by the specialization annotation // Manifest types, companions, and incantations for summoning type ClassManifest[T] = scala.reflect.ClassManifest[T] diff --git a/src/library/scala/Ref.scala b/src/library/scala/Ref.scala deleted file mode 100644 index 327b4a91f1..0000000000 --- a/src/library/scala/Ref.scala +++ /dev/null @@ -1,12 +0,0 @@ -package scala - - - - - - -object Ref extends AnyCompanion - - - - |