summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-05-05 08:18:54 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-05-05 08:18:54 +0200
commit8200009ea5dafcdf79488f19175c53e7b571aa75 (patch)
treec06957d9199e507144ddff039edb2c82bae44dd3 /src
parentf635ba91d641d900ffd56ae0f4bbfb8e88bfe2d1 (diff)
parenta18e42bc0773084a3e311646e1e2ffd623db4cfa (diff)
downloadscala-8200009ea5dafcdf79488f19175c53e7b571aa75.tar.gz
scala-8200009ea5dafcdf79488f19175c53e7b571aa75.tar.bz2
scala-8200009ea5dafcdf79488f19175c53e7b571aa75.zip
Merge pull request #4490 from retronym/ticket/9298
SI-9298 Fix erasure of value classes in Java
Diffstat (limited to 'src')
-rw-r--r--src/reflect/scala/reflect/internal/transform/Erasure.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/transform/Erasure.scala b/src/reflect/scala/reflect/internal/transform/Erasure.scala
index d5b5967145..707972242a 100644
--- a/src/reflect/scala/reflect/internal/transform/Erasure.scala
+++ b/src/reflect/scala/reflect/internal/transform/Erasure.scala
@@ -254,6 +254,8 @@ trait Erasure {
def mergeParents(parents: List[Type]): Type =
if (parents.isEmpty) ObjectTpe
else parents.head
+
+ override protected def eraseDerivedValueClassRef(tref: TypeRef): Type = eraseNormalClassRef(tref)
}
object scalaErasure extends ScalaErasureMap