summaryrefslogtreecommitdiff
path: root/test/files/neg/viewtest.scala
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-12 14:39:55 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-12 14:39:55 +0000
commitd27e89c0bc0ee1775eae09238319c44e85a44d5d (patch)
treee2f81270d39cadcbe30949757cddf4e7af8ddb42 /test/files/neg/viewtest.scala
parentfe4591ba0c8d727ee563ba4752a86db5d220ec76 (diff)
downloadscala-d27e89c0bc0ee1775eae09238319c44e85a44d5d.tar.gz
scala-d27e89c0bc0ee1775eae09238319c44e85a44d5d.tar.bz2
scala-d27e89c0bc0ee1775eae09238319c44e85a44d5d.zip
Fixing more deprecation warnings.
Diffstat (limited to 'test/files/neg/viewtest.scala')
-rw-r--r--test/files/neg/viewtest.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/neg/viewtest.scala b/test/files/neg/viewtest.scala
index 6d5f96bd81..4c603b61bc 100644
--- a/test/files/neg/viewtest.scala
+++ b/test/files/neg/viewtest.scala
@@ -10,7 +10,7 @@ trait Ordered[+a] {
* x == 0 iff this == that
* x > 0 iff this > that
*/
- def compareTo [b >: a <% Ordered[b]](that: b): int
+ def compareTo [b >: a <% Ordered[b]](that: b): Int
def < [b >: a <% Ordered[b]](that: b): boolean = (this compareTo that) < 0
@@ -25,13 +25,13 @@ trait Ordered[+a] {
object O {
implicit def view1(x: String): Ordered[String] = new Ordered[String] {
- def compareTo [b >: String <% Ordered[b]](y: b): int = y match {
+ def compareTo [b >: String <% Ordered[b]](y: b): Int = y match {
case y1: String => x compareTo y1
case _ => -(y compareTo x)
}
}
implicit def view2(x: char): Ordered[char] = new Ordered[char] {
- def compareTo [b >: char <% Ordered[b]](y: b): int = y match {
+ def compareTo [b >: char <% Ordered[b]](y: b): Int = y match {
case y1: char => x - y1
case _ => -(y compareTo x)
}
@@ -39,11 +39,11 @@ object O {
implicit def view3[a <% Ordered[a]](x: List[a]): Ordered[List[a]] =
new Ordered[List[a]] {
- def compareTo [b >: List[a] <% Ordered[b]](y: b): int = y match {
+ def compareTo [b >: List[a] <% Ordered[b]](y: b): Int = y match {
case y1: List[a] => compareLists(x, y1)
case _ => -(y compareTo x)
}
- private def compareLists(xs: List[a], ys: List[a]): int = {
+ private def compareLists(xs: List[a], ys: List[a]): Int = {
if (xs.isEmpty && ys.isEmpty) 0
else if (xs.isEmpty) -1
else if (ys.isEmpty) 1
@@ -77,7 +77,7 @@ class Node[a <% Ordered[a]](elem: a, l: Tree[a], r: Tree[a]) extends Tree[a] {
}
case class Str(elem: String) extends Ordered[Str] {
- def compareTo[b >: Str <% Ordered[b]](that: b): int = that match {
+ def compareTo[b >: Str <% Ordered[b]](that: b): Int = that match {
case that1: Str => this.elem compareTo that1.elem
case _ => -(that compareTo this)
}