From c13f0812e3ed466d7792be61fcdb42b10fbd9ad6 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 21 Sep 2015 21:31:01 +0300 Subject: [PATCH] Temporary workaround for strange JvmName behavior --- .../src/org/jetbrains/kotlin/descriptors/ConstUtil.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstUtil.kt index 72ae109fa4c..3efb5b67702 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstUtil.kt @@ -14,12 +14,16 @@ * limitations under the License. */ -@file:JvmName("ConstUtil") +//@file:JvmName("ConstUtil") package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.JetType -public fun JetType.canBeUsedForConstVal() = KotlinBuiltIns.isPrimitiveType(this) || KotlinBuiltIns.isString(this) +object ConstUtil { + @JvmStatic + public fun canBeUsedForConstVal(type: JetType) = type.canBeUsedForConstVal() +} +public fun JetType.canBeUsedForConstVal() = KotlinBuiltIns.isPrimitiveType(this) || KotlinBuiltIns.isString(this)