Changed AnyCompanion to SpecializableCompanion.

Fixed a couple of term specialization bugs.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/library/scala/AnyValCompanion.scala b/src/library/scala/AnyValCompanion.scala
index 3ddd66c2d0..d6cb498185 100644
--- a/src/library/scala/AnyValCompanion.scala
+++ b/src/library/scala/AnyValCompanion.scala
@@ -18,4 +18,4 @@ package scala
  *  }}}
  *
  */
-private[scala] trait AnyValCompanion extends AnyCompanion { }
+private[scala] trait AnyValCompanion extends SpecializableCompanion { }
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 99953130d3..06ad659c68 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -38,7 +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
+  val AnyRef      = new SpecializableCompanion {}   // 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/AnyCompanion.scala b/src/library/scala/SpecializableCompanion.scala
index d34e7bc461..fbdf42fd0b 100644
--- a/src/library/scala/AnyCompanion.scala
+++ b/src/library/scala/SpecializableCompanion.scala
@@ -8,6 +8,6 @@
 
 package scala
 
-/** A common supertype for companion classes.
+/** A common supertype for companion classes which specialization takes into account.
  */
-private[scala] trait AnyCompanion
+private[scala] trait SpecializableCompanion
diff --git a/src/library/scala/specialized.scala b/src/library/scala/specialized.scala
index 38ad8c4c9a..3254a0c967 100644
--- a/src/library/scala/specialized.scala
+++ b/src/library/scala/specialized.scala
@@ -25,7 +25,7 @@ package scala
  *
  *  @since 2.8
  */
-class specialized(types: AnyCompanion*) extends annotation.StaticAnnotation {
+class specialized(types: SpecializableCompanion*) extends annotation.StaticAnnotation {
   def this() {
     this(Unit, Boolean, Byte, Short, Char, Int, Long, Float, Double)
   }