From 29480f30ef5121def214b8cbe64c61a2380d6754 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sun, 9 Nov 2014 00:39:49 +0300
Subject: [PATCH] Minor, fix compilation in module reflection.jvm

---
 .../src/kotlin/reflect/jvm/internal/KClassImpl.kt             | 4 ++--
 .../src/kotlin/reflect/jvm/internal/KPackageImpl.kt           | 2 +-
 core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index 9e8dee8842e..336e95a8d88 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
@@ -26,8 +26,8 @@ enum class KClassOrigin {
     FOREIGN
 }
 
-private val KOTLIN_CLASS_ANNOTATION_CLASS = javaClass<KotlinClass>()
-private val KOTLIN_SYNTHETIC_CLASS_ANNOTATION_CLASS = javaClass<KotlinSyntheticClass>()
+private val KOTLIN_CLASS_ANNOTATION_CLASS = javaClassOf<KotlinClass>()
+private val KOTLIN_SYNTHETIC_CLASS_ANNOTATION_CLASS = javaClassOf<KotlinSyntheticClass>()
 
 class KClassImpl<out T>(val jClass: Class<T>, isKnownToBeKotlin: Boolean) : KClass<T> {
     // TODO: write metadata to local classes
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
index 4a5e182b304..c406c516d60 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
@@ -19,7 +19,7 @@ package kotlin.reflect.jvm.internal
 import kotlin.reflect.KPackage
 import kotlin.jvm.internal.KotlinPackage
 
-private val KOTLIN_PACKAGE_ANNOTATION_CLASS = javaClass<KotlinPackage>()
+private val KOTLIN_PACKAGE_ANNOTATION_CLASS = javaClassOf<KotlinPackage>()
 
 class KPackageImpl(val jClass: Class<*>) : KPackage {
     override fun equals(other: Any?): Boolean =
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
index 0fbf5803908..b92d03a0e6c 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
@@ -37,7 +37,7 @@ private fun setterName(propertyName: String): String = "set" + propertyName.capi
 
 // A local copy of javaClass() from stdlib is needed because there's no dependency on stdlib in runtime.jvm
 [Intrinsic("kotlin.javaClass.function")]
-fun <reified T> javaClass(): Class<T> = throw UnsupportedOperationException()
+fun <reified T> javaClassOf(): Class<T> = throw UnsupportedOperationException()
 
 
 private fun Class<*>.getMaybeDeclaredMethod(name: String, vararg parameterTypes: Class<*>): Method {