From 1be55db681e450747483efde76b3d9bc391ee664 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jan 2018 09:03:02 +0300 Subject: [PATCH] stdlib-common: remove common migration typealias for Volatile annotation Otherwise it gets to jvm stdlib as new API. --- libraries/stdlib/common/src/kotlin/KotlinH.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/stdlib/common/src/kotlin/KotlinH.kt b/libraries/stdlib/common/src/kotlin/KotlinH.kt index c9170c921e3..4d4fe66e71c 100644 --- a/libraries/stdlib/common/src/kotlin/KotlinH.kt +++ b/libraries/stdlib/common/src/kotlin/KotlinH.kt @@ -87,8 +87,9 @@ public expect fun Float.Companion.fromBits(bits: Int): Float // From concurrent.kt -@Deprecated("Use Volatile annotation from kotlin.jvm package", ReplaceWith("kotlin.jvm.Volatile"), level = DeprecationLevel.WARNING) -public typealias Volatile = kotlin.jvm.Volatile +// TODO: promote to error? Otherwise it gets to JVM part +//@Deprecated("Use Volatile annotation from kotlin.jvm package", ReplaceWith("kotlin.jvm.Volatile"), level = DeprecationLevel.WARNING) +//public typealias Volatile = kotlin.jvm.Volatile public expect inline fun synchronized(lock: Any, block: () -> R): R