diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:20:35 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 05:20:35 -0700 |
commit | a5dcbbc54d48610289218ea3b4d85b47f7cf607c (patch) | |
tree | b80ad80d481d722132e6c4541756dfb9be119be7 /src/library | |
parent | ff954063ae75376d284bb09302ea3ccba8cdc268 (diff) | |
parent | 06b373878a044e0a83e5162bca661a6050957d04 (diff) | |
download | scala-a5dcbbc54d48610289218ea3b4d85b47f7cf607c.tar.gz scala-a5dcbbc54d48610289218ea3b4d85b47f7cf607c.tar.bz2 scala-a5dcbbc54d48610289218ea3b4d85b47f7cf607c.zip |
Merge pull request #933 from scalamacros/ticket/5731
SI-5731 a few fixes for value classes
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/reflect/ClassManifest.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/reflect/ClassManifest.scala b/src/library/scala/reflect/ClassManifest.scala index f143bf8712..d226e43e77 100644 --- a/src/library/scala/reflect/ClassManifest.scala +++ b/src/library/scala/reflect/ClassManifest.scala @@ -184,18 +184,18 @@ object ClassManifestFactory { * pass varargs as arrays into this, we get an infinitely recursive call * to boxArray. (Besides, having a separate case is more efficient) */ - def classType[T <: AnyRef](clazz: jClass[_]): ClassManifest[T] = + def classType[T](clazz: jClass[_]): ClassManifest[T] = new ClassTypeManifest[T](None, clazz, Nil) /** ClassManifest for the class type `clazz[args]`, where `clazz` is * a top-level or static class and `args` are its type arguments */ - def classType[T <: AnyRef](clazz: jClass[_], arg1: OptManifest[_], args: OptManifest[_]*): ClassManifest[T] = + def classType[T](clazz: jClass[_], arg1: OptManifest[_], args: OptManifest[_]*): ClassManifest[T] = new ClassTypeManifest[T](None, clazz, arg1 :: args.toList) /** ClassManifest for the class type `clazz[args]`, where `clazz` is * a class with non-package prefix type `prefix` and type arguments `args`. */ - def classType[T <: AnyRef](prefix: OptManifest[_], clazz: jClass[_], args: OptManifest[_]*): ClassManifest[T] = + def classType[T](prefix: OptManifest[_], clazz: jClass[_], args: OptManifest[_]*): ClassManifest[T] = new ClassTypeManifest[T](Some(prefix), clazz, args.toList) def arrayType[T](arg: OptManifest[_]): ClassManifest[Array[T]] = arg match { @@ -228,7 +228,7 @@ object ClassManifestFactory { /** Manifest for the class type `clazz[args]`, where `clazz` is * a top-level or static class */ -private class ClassTypeManifest[T <: AnyRef]( +private class ClassTypeManifest[T]( prefix: Option[OptManifest[_]], val runtimeClass: jClass[_], override val typeArguments: List[OptManifest[_]]) extends ClassManifest[T] |