azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename platformStatic to jvmStatic

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-21 12:57:54 +02:00
parent 4053c19260
commit 341f09afd3
51 changed files with 145 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
Vendored
+9 -9
View File
@@ -1,5 +1,5 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
abstract class A {
@@ -12,24 +12,24 @@ abstract class A {
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic final override fun c()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic final override fun c()<!> {}
@platformStatic open fun d() {}
@jvmStatic open fun d() {}
}
class C {
companion object: A() {
@platformStatic override fun a() {}
@jvmStatic override fun a() {}
@platformStatic override fun b() {}
@jvmStatic override fun b() {}
@platformStatic final override fun c() {}
@jvmStatic final override fun c() {}
@platformStatic open fun d() {}
@jvmStatic open fun d() {}
}
}