summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/library/scala/runtime/RichFloat.scala2
-rw-r--r--test/files/pos/bug1006.scala15
2 files changed, 16 insertions, 1 deletions
diff --git a/src/library/scala/runtime/RichFloat.scala b/src/library/scala/runtime/RichFloat.scala
index 3a65b7443b..65e24c6363 100644
--- a/src/library/scala/runtime/RichFloat.scala
+++ b/src/library/scala/runtime/RichFloat.scala
@@ -24,7 +24,7 @@ final class RichFloat(x: Float) extends Proxy with Ordered[Float] {
def max(y: Float) = Math.max(x, y)
def abs: Float = Math.abs(x)
- def round: int = Math.round(x)
+ def round: Int = Math.round(x)
// isNaN is provided by the implicit conversion to java.lang.Float
// def isNaN: Boolean = java.lang.Float.isNaN(x)
diff --git a/test/files/pos/bug1006.scala b/test/files/pos/bug1006.scala
new file mode 100644
index 0000000000..91eb2d9b7d
--- /dev/null
+++ b/test/files/pos/bug1006.scala
@@ -0,0 +1,15 @@
+object Test extends Application {
+
+def test() {
+
+ abstract class A[T] {
+ def myVal: T
+ }
+
+ class B[T1](value: T1) extends A[T1] {
+ def myVal: T1 = value
+ }
+
+ Console.println(new B[int](23).myVal)
+}
+}