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

Deprecate JVM platform annotations in favor of capitilized themselves

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-04 14:46:46 +03:00
parent 5471a1d18a
commit 952d45dc8b
107 changed files with 290 additions and 266 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.jvm.jvmStatic
import kotlin.jvm.JvmStatic
abstract class A {
@@ -12,24 +12,24 @@ abstract class A {
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic final override fun c()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic final override fun c()<!> {}
@jvmStatic open fun d() {}
@JvmStatic open fun d() {}
}
class C {
companion object: A() {
@jvmStatic override fun a() {}
@JvmStatic override fun a() {}
@jvmStatic override fun b() {}
@JvmStatic override fun b() {}
@jvmStatic final override fun c() {}
@JvmStatic final override fun c() {}
@jvmStatic open fun d() {}
@JvmStatic open fun d() {}
}
}