From 226350b4ba4f1252af3c0d2d4b2f27bd6d8f2664 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Mon, 18 May 2015 11:53:59 +0300 Subject: [PATCH] Test data fixed: replace trait with interface --- compiler/testData/codegen/box/traits/kt3579.kt | 2 +- compiler/testData/codegen/box/traits/kt3579_2.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/codegen/box/traits/kt3579.kt b/compiler/testData/codegen/box/traits/kt3579.kt index 5f1d151d85e..64514c50d9b 100644 --- a/compiler/testData/codegen/box/traits/kt3579.kt +++ b/compiler/testData/codegen/box/traits/kt3579.kt @@ -1,5 +1,5 @@ open class Persistent(val p: String) -trait Hierarchy where T : Hierarchy +interface Hierarchy where T : Hierarchy class Location(): Persistent("OK"), Hierarchy diff --git a/compiler/testData/codegen/box/traits/kt3579_2.kt b/compiler/testData/codegen/box/traits/kt3579_2.kt index a03d0c46823..10e9a962302 100644 --- a/compiler/testData/codegen/box/traits/kt3579_2.kt +++ b/compiler/testData/codegen/box/traits/kt3579_2.kt @@ -1,9 +1,9 @@ -trait First -trait Some where T : Some +interface First +interface Some where T : Some val a: Some<*>? = null -class MClass(val p: String): First, Some +class MClass(val p: String) : First, Some fun box(): String { return MClass("OK").p