Reverted explicitly specifying visibility modifier while override

This commit is contained in:
Svetlana Isakova
2012-04-18 18:55:03 +04:00
parent 8d6d292150
commit b5bf4a626c
31 changed files with 66 additions and 67 deletions
@@ -1,4 +1,3 @@
class X {
val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>x<!> : Int
}
@@ -18,12 +17,12 @@ class Z : Y() {
class MyIterable<T> : Iterable<T>
{
public override fun iterator(): Iterator<T> = MyIterator()
override fun iterator(): Iterator<T> = MyIterator()
class MyIterator : Iterator<T>
{
public override val hasNext: Boolean = false
public override fun next(): T {
override val hasNext: Boolean = false
override fun next(): T {
throw UnsupportedOperationException()
}
}
@@ -1,10 +1,10 @@
import java.util.Enumeration
inline fun <T> java.util.Enumeration<T>.iterator() = object: Iterator<T> {
public override val hasNext: Boolean
override val hasNext: Boolean
get() = hasMoreElements()
public override fun next() = nextElement()
override fun next() = nextElement()
}
fun <T : Any> T?.iterator() = object {
@@ -6,7 +6,7 @@ class Test() : Thread("Test") {
}
}
public override fun run() {
override fun run() {
init2() // unresolved
Test.init2() // ok
}