From 4514792104ae5144baa09c0edd160c963eb0271a Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Wed, 23 Jul 2014 18:36:44 +0400
Subject: [PATCH] Unit as object

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

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