From 3ef624f12171189e9cc8af4470e7622d72971b08 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Sat, 26 Apr 2014 15:28:44 +0400
Subject: [PATCH] Builtins: made Unit object.

---
 core/builtins/src/kotlin/Unit.kt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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