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

CONFLICTING_PLATFORM_DECLARATIONS moved to a JVM-specific class

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-28 17:59:11 +04:00
parent 22c47c2f82
commit 38333d6cea
43 changed files with 178 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_PLATFORM_DECLARATIONS!>class C<!> {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>class C<!> {
<!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
fun a(x: Int = 1) {}
}