summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2008-05-13 15:30:15 +0000
committerIulian Dragos <jaguarul@gmail.com>2008-05-13 15:30:15 +0000
commit1f8b79f1b3db85eb3a8098c702e6a68b6881379e (patch)
tree4a2790e8047de34a5a667eff1ac9442c051124aa /src
parent7a1fba63c23f5cc17ac6c47d11347e9c1e945914 (diff)
downloadscala-1f8b79f1b3db85eb3a8098c702e6a68b6881379e.tar.gz
scala-1f8b79f1b3db85eb3a8098c702e6a68b6881379e.tar.bz2
scala-1f8b79f1b3db85eb3a8098c702e6a68b6881379e.zip
Added explicit return type in take (see #879)
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/Members.scala1
-rw-r--r--src/library/scala/Iterator.scala2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
index 5dcebe7ecf..7302a641d5 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Members.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
@@ -168,6 +168,7 @@ trait Members { self: ICodes =>
var returnType: TypeKind = _
var recursive: Boolean = false
+ var callsInlineMethods: Boolean = false
/** local variables and method parameters */
var locals: List[Local] = Nil
diff --git a/src/library/scala/Iterator.scala b/src/library/scala/Iterator.scala
index 638f837478..84c17b9953 100644
--- a/src/library/scala/Iterator.scala
+++ b/src/library/scala/Iterator.scala
@@ -219,7 +219,7 @@ trait Iterator[+A] {
* @return the new iterator
*/
@throws(classOf[NoSuchElementException])
- def take(n: Int) = new Iterator[A] {
+ def take(n: Int): Iterator[A] = new Iterator[A] {
var remaining = n
def hasNext = remaining > 0 && Iterator.this.hasNext
def next(): A =