diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/Members.scala | 1 | ||||
-rw-r--r-- | src/library/scala/Iterator.scala | 2 |
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 = |