summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-12-17 17:40:21 +0000
committerMartin Odersky <odersky@gmail.com>2009-12-17 17:40:21 +0000
commit88683ede7df66a276835319d4d580f605420fa01 (patch)
tree6df1fa3927c09322598f9802b08ca8d0d462beeb /src/library
parentd8ef68e6a18862ac18cd304274feb0b310dd545c (diff)
downloadscala-88683ede7df66a276835319d4d580f605420fa01.tar.gz
scala-88683ede7df66a276835319d4d580f605420fa01.tar.bz2
scala-88683ede7df66a276835319d4d580f605420fa01.zip
Closed #2795. review by dubochet.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/reflect/ClassManifest.scala4
-rw-r--r--src/library/scala/reflect/Manifest.scala4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/reflect/ClassManifest.scala b/src/library/scala/reflect/ClassManifest.scala
index 81c36fffcb..c8637166ee 100644
--- a/src/library/scala/reflect/ClassManifest.scala
+++ b/src/library/scala/reflect/ClassManifest.scala
@@ -207,9 +207,9 @@ object ClassManifest {
/** ClassManifest for the abstract type `prefix # name'. `upperBound' is not
* strictly necessary as it could be obtained by reflection. It was
* added so that erasure can be calculated without reflection. */
- def abstractType[T](prefix: OptManifest[_], name: String, upperBound: ClassManifest[_], args: OptManifest[_]*): ClassManifest[T] =
+ def abstractType[T](prefix: OptManifest[_], name: String, clazz: Predef.Class[_], args: OptManifest[_]*): ClassManifest[T] =
new (ClassManifest[T] @serializable) {
- def erasure = upperBound.erasure
+ def erasure = clazz
override val typeArguments = args.toList
override def toString = prefix.toString+"#"+name+argString
}
diff --git a/src/library/scala/reflect/Manifest.scala b/src/library/scala/reflect/Manifest.scala
index f425473459..9dba30911d 100644
--- a/src/library/scala/reflect/Manifest.scala
+++ b/src/library/scala/reflect/Manifest.scala
@@ -218,9 +218,9 @@ object Manifest {
/** Manifest for the abstract type `prefix # name'. `upperBound' is not
* strictly necessary as it could be obtained by reflection. It was
* added so that erasure can be calculated without reflection. */
- def abstractType[T](prefix: Manifest[_], name: String, upperBound: Manifest[_], args: Manifest[_]*): Manifest[T] =
+ def abstractType[T](prefix: Manifest[_], name: String, clazz: Predef.Class[_], args: Manifest[_]*): Manifest[T] =
new (Manifest[T] @serializable) {
- def erasure = upperBound.erasure
+ def erasure = clazz
override val typeArguments = args.toList
override def toString = prefix.toString+"#"+name+argString
}