From 9b363270462b60dd6eb2ee031ccae567272395ca Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Thu, 10 Jul 2014 23:38:25 +0400
Subject: [PATCH] Builtins: make Unit class to avoid binary compatibility
 problems.

---
 core/builtins/src/kotlin/Unit.kt | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/builtins/src/kotlin/Unit.kt b/core/builtins/src/kotlin/Unit.kt
index 75dfb0f52ea..ad6fb5a2665 100644
--- a/core/builtins/src/kotlin/Unit.kt
+++ b/core/builtins/src/kotlin/Unit.kt
@@ -16,16 +16,10 @@
 
 package kotlin
 
-// Temporary class for backward compatibility with Java code
-private open class OldUnit() {
-    class object {
-        public val VALUE: Unit = Unit
+public open class Unit internal () {
+    override fun toString() = "Unit.VALUE"
+
+    public class object : Unit() {
+        public val VALUE: Unit = this: Any as Unit
     }
 }
-
-public object Unit : OldUnit() {
-    public val VALUE: Unit
-        get() = this
-
-    override fun toString() = "Unit.VALUE"
-}