CONFLICTING_PLATFORM_DECLARATIONS moved to a JVM-specific class

2014-05-28 17:59:11 +04:00
parent 22c47c2f82
commit 38333d6cea
43 changed files with 178 additions and 71 deletions
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int)<!> {}
+    <!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}

-    <!CONFLICTING_PLATFORM_DECLARATIONS!>var x: Int<!> = 1
+    <!CONFLICTING_JVM_DECLARATIONS!>var x: Int<!> = 1
 }