Support code I need for certain equality strate...

Support code I need for certain equality strategies; it's not called by
anything in the mainline as yet.

2 files changed, 23 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 6131d145f2..33cf985dcd 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -364,6 +364,13 @@ trait Definitions {
     lazy val BoxedNumberClass       = getClass(sn.BoxedNumber)
     lazy val BoxedCharacterClass    = getClass(sn.BoxedCharacter)
     lazy val BoxedBooleanClass      = getClass(sn.BoxedBoolean)
+    lazy val BoxedByteClass         = getClass("java.lang.Byte")
+    lazy val BoxedShortClass        = getClass("java.lang.Short")
+    lazy val BoxedIntClass          = getClass("java.lang.Integer")
+    lazy val BoxedLongClass         = getClass("java.lang.Long")
+    lazy val BoxedFloatClass        = getClass("java.lang.Float")
+    lazy val BoxedDoubleClass       = getClass("java.lang.Double")
+
     lazy val BoxedUnitClass         = getClass("scala.runtime.BoxedUnit")
     lazy val BoxedUnitModule        = getModule("scala.runtime.BoxedUnit")
       def BoxedUnit_UNIT = getMember(BoxedUnitModule, "UNIT")
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index fa7f088ef2..867b13b243 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -448,17 +448,24 @@ trait StdNames {
     final val IOOBException = newTermName("java.lang.IndexOutOfBoundsException")
     final val BoxedNumber   = newTermName("java.lang.Number")
     final val BoxedCharacter = newTermName("java.lang.Character")
-    final val BoxedBoolean = newTermName("java.lang.Boolean")
+    final val BoxedBoolean  = newTermName("java.lang.Boolean")
+    final val BoxedByte     = newTermName("java.lang.Byte")
+    final val BoxedShort    = newTermName("java.lang.Short")
+    final val BoxedInteger  = newTermName("java.lang.Integer")
+    final val BoxedLong     = newTermName("java.lang.Long")
+    final val BoxedFloat    = newTermName("java.lang.Float")
+    final val BoxedDouble   = newTermName("java.lang.Double")
+
     final val MethodAsObject = newTermName("java.lang.reflect.Method")
 
-    Boxed += (nme.Boolean -> newTermName("java.lang.Boolean"))
-    Boxed += (nme.Byte    -> newTermName("java.lang.Byte"))
-    Boxed += (nme.Char    -> newTermName("java.lang.Character"))
-    Boxed += (nme.Short   -> newTermName("java.lang.Short"))
-    Boxed += (nme.Int     -> newTermName("java.lang.Integer"))
-    Boxed += (nme.Long    -> newTermName("java.lang.Long"))
-    Boxed += (nme.Float   -> newTermName("java.lang.Float"))
-    Boxed += (nme.Double  -> newTermName("java.lang.Double"))
+    Boxed += (nme.Boolean -> BoxedBoolean)
+    Boxed += (nme.Byte    -> BoxedByte)
+    Boxed += (nme.Char    -> BoxedCharacter)
+    Boxed += (nme.Short   -> BoxedShort)
+    Boxed += (nme.Int     -> BoxedInteger)
+    Boxed += (nme.Long    -> BoxedLong)
+    Boxed += (nme.Float   -> BoxedFloat)
+    Boxed += (nme.Double  -> BoxedDouble)
   }
 
   private class MSILNames extends SymbolNames {